diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2015-01-12 13:42:11 -0500 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-01-15 09:24:04 -0500 |
commit | 30edcdcc0529370264e87cf5a9185991a0fed70f (patch) | |
tree | 38e1ba1563e1f66dd3b54eb17d11398533de4215 | |
parent | e822aaef0c74b787d12c7bb3266c306a080e4790 (diff) |
ARM: at91: remove useless config MACH_AT91RM9200_DT
Now that rm9200 is only supported through DT, remove CONFIG_MACH_AT91RM9200_DT
and use CONFIG_SOC_AT91RM9200 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>
-rw-r--r-- | arch/arm/mach-at91/Kconfig | 3 | ||||
-rw-r--r-- | arch/arm/mach-at91/Makefile | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 2395c68b3e32..34725b296e4d 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
@@ -174,9 +174,6 @@ config SOC_AT91SAM9N12 | |||
174 | # ---------------------------------------------------------- | 174 | # ---------------------------------------------------------- |
175 | endif # SOC_SAM_V4_V5 | 175 | endif # SOC_SAM_V4_V5 |
176 | 176 | ||
177 | config MACH_AT91RM9200_DT | ||
178 | def_bool SOC_AT91RM9200 | ||
179 | |||
180 | config MACH_AT91SAM9_DT | 177 | config MACH_AT91SAM9_DT |
181 | def_bool SOC_AT91SAM9 | 178 | def_bool SOC_AT91SAM9 |
182 | 179 | ||
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 7b6424d40764..55fc93f5638b 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile | |||
@@ -19,7 +19,7 @@ obj-$(CONFIG_SOC_SAMA5D3) += sama5d3.o | |||
19 | obj-$(CONFIG_SOC_SAMA5D4) += sama5d4.o | 19 | obj-$(CONFIG_SOC_SAMA5D4) += sama5d4.o |
20 | 20 | ||
21 | # AT91SAM board with device-tree | 21 | # AT91SAM board with device-tree |
22 | obj-$(CONFIG_MACH_AT91RM9200_DT) += 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_MACH_AT91SAM9_DT) += board-dt-sam9.o |
24 | 24 | ||
25 | # SAMA5 board with device-tree | 25 | # SAMA5 board with device-tree |