diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2015-01-12 13:42:12 -0500 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-01-15 09:24:04 -0500 |
commit | c46317b7748af5bbbf914c8903c514500d7c8c18 (patch) | |
tree | 441a0e292fd5ebbacccd3b577357236d219245c4 /arch/arm/mach-at91 | |
parent | 30edcdcc0529370264e87cf5a9185991a0fed70f (diff) |
ARM: at91: remove useless config MACH_AT91SAM9_DT
Now that at91sam9 SoCs are only supported through DT, remove
CONFIG_MACH_AT91SAM9_DT and use CONFIG_SOC_AT91SAM9 instead.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r-- | arch/arm/mach-at91/Kconfig | 5 | ||||
-rw-r--r-- | arch/arm/mach-at91/Makefile | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 34725b296e4d..cec0fb5d621a 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
@@ -174,11 +174,6 @@ config SOC_AT91SAM9N12 | |||
174 | # ---------------------------------------------------------- | 174 | # ---------------------------------------------------------- |
175 | endif # SOC_SAM_V4_V5 | 175 | endif # SOC_SAM_V4_V5 |
176 | 176 | ||
177 | config MACH_AT91SAM9_DT | ||
178 | def_bool SOC_AT91SAM9 | ||
179 | |||
180 | # ---------------------------------------------------------- | ||
181 | |||
182 | comment "AT91 Feature Selections" | 177 | comment "AT91 Feature Selections" |
183 | 178 | ||
184 | config AT91_SLOW_CLOCK | 179 | config AT91_SLOW_CLOCK |
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 55fc93f5638b..9165a4aa7f0d 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile | |||
@@ -20,7 +20,7 @@ obj-$(CONFIG_SOC_SAMA5D4) += sama5d4.o | |||
20 | 20 | ||
21 | # AT91SAM board with device-tree | 21 | # AT91SAM board with device-tree |
22 | obj-$(CONFIG_SOC_AT91RM9200) += board-dt-rm9200.o | 22 | obj-$(CONFIG_SOC_AT91RM9200) += board-dt-rm9200.o |
23 | obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o | 23 | obj-$(CONFIG_SOC_AT91SAM9) += board-dt-sam9.o |
24 | 24 | ||
25 | # SAMA5 board with device-tree | 25 | # SAMA5 board with device-tree |
26 | obj-$(CONFIG_SOC_SAMA5) += board-dt-sama5.o | 26 | obj-$(CONFIG_SOC_SAMA5) += board-dt-sama5.o |