tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Alexandre Belloni and committed by
Nicolas Ferre 93d2cf46 4386e1fb

+2 -11
-1
arch/arm/configs/sama5_defconfig
··· 20 20 CONFIG_SOC_SAM_V7=y 21 21 CONFIG_SOC_SAMA5D3=y 22 22 CONFIG_SOC_SAMA5D4=y 23 - CONFIG_MACH_SAMA5_DT=y 24 23 CONFIG_AEABI=y 25 24 CONFIG_UACCESS_WITH_MEMCPY=y 26 25 CONFIG_ZBOOT_ROM_TEXT=0x0
+1 -9
arch/arm/mach-at91/Kconfig
··· 54 54 select USE_OF 55 55 select MEMORY 56 56 select ATMEL_SDRAMC 57 + select PHYLIB if NETDEVICES 57 58 58 59 menu "Atmel AT91 System-on-Chip" 59 60 ··· 204 203 bool "Atmel AT91SAM Evaluation Kits with device-tree support" 205 204 depends on SOC_AT91SAM9 206 205 select USE_OF 207 - help 208 - Select this if you want to experiment device-tree with 209 - an Atmel Evaluation Kit. 210 - 211 - config MACH_SAMA5_DT 212 - bool "Atmel SAMA5 Evaluation Kits with device-tree support" 213 - depends on SOC_SAMA5 214 - select USE_OF 215 - select PHYLIB if NETDEVICES 216 206 help 217 207 Select this if you want to experiment device-tree with 218 208 an Atmel Evaluation Kit.
+1 -1
arch/arm/mach-at91/Makefile
··· 71 71 obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o 72 72 73 73 # SAMA5 board with device-tree 74 - obj-$(CONFIG_MACH_SAMA5_DT) += board-dt-sama5.o 74 + obj-$(CONFIG_SOC_SAMA5) += board-dt-sama5.o 75 75 76 76 # Drivers 77 77 obj-y += leds.o