ARM: at91: remove CONFIG_MACH_SAMA5_DT

CONFIG_MACH_SAMA5_DT is useless as the only way to boot on sama5 based boards is
to use device tree.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
[nicolas.ferre@atmel.com: adapt on top of cleanup branch]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
index c9089c9..299ca18 100644 (file)
--- a/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
@@ -20,7 +20,6 @@ CONFIG_ARCH_AT91=y
 CONFIG_SOC_SAM_V7=y
 CONFIG_SOC_SAMA5D3=y
 CONFIG_SOC_SAMA5D4=y
-CONFIG_MACH_SAMA5_DT=y
 CONFIG_AEABI=y
 CONFIG_UACCESS_WITH_MEMCPY=y
 CONFIG_ZBOOT_ROM_TEXT=0x0

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index a82ee4e..162a889 100644 (file)
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -54,6 +54,7 @@ config SOC_SAMA5
        select USE_OF
        select MEMORY
        select ATMEL_SDRAMC
+       select PHYLIB if NETDEVICES
 
 menu "Atmel AT91 System-on-Chip"
 
@@ -207,15 +208,6 @@ config MACH_AT91SAM9_DT
          Select this if you want to experiment device-tree with
          an Atmel Evaluation Kit.
 
-config MACH_SAMA5_DT
-       bool "Atmel SAMA5 Evaluation Kits with device-tree support"
-       depends on SOC_SAMA5
-       select USE_OF
-       select PHYLIB if NETDEVICES
-       help
-         Select this if you want to experiment device-tree with
-         an Atmel Evaluation Kit.
-
 # ----------------------------------------------------------
 
 comment "AT91 Feature Selections"

diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index df48363..ae8aa1a 100644 (file)
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -71,7 +71,7 @@ obj-$(CONFIG_MACH_AT91RM9200_DT) += board-dt-rm9200.o
 obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o
 
 # SAMA5 board with device-tree
-obj-$(CONFIG_MACH_SAMA5_DT) += board-dt-sama5.o
+obj-$(CONFIG_SOC_SAMA5)                += board-dt-sama5.o
 
 # Drivers
 obj-y                          += leds.o