ARM: versatile: switch to DT only booting and remove legacy code

[deliverable/linux.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0365cbbc917989853d87b8a84c8409ae268d6e33..34e2162213cb31a085d92831f8918471fe2be456 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -76,6 +76,8 @@ config ARM
        select IRQ_FORCED_THREADING
        select MODULES_USE_ELF_REL
        select NO_BOOTMEM
+       select OF_EARLY_FLATTREE if OF
+       select OF_RESERVED_MEM if OF
        select OLD_SIGACTION
        select OLD_SIGSUSPEND3
        select PERF_USE_VMALLOC
@@ -366,13 +368,16 @@ config ARCH_VERSATILE
        select ARM_AMBA
        select ARM_TIMER_SP804
        select ARM_VIC
-       select CLKDEV_LOOKUP
+       select CLKSRC_VERSATILE
+       select COMMON_CLK
+       select COMMON_CLK_VERSATILE
+       select CPU_ARM926T
        select GENERIC_CLOCKEVENTS
-       select HAVE_MACH_CLKDEV
        select ICST
        select PLAT_VERSATILE
-       select PLAT_VERSATILE_CLOCK
-       select PLAT_VERSATILE_SCHED_CLOCK
+       select MIGHT_HAVE_PCI
+       select SPARSE_IRQ
+       select USE_OF
        select VERSATILE_FPGA_IRQ
        help
          This enables support for ARM Ltd Versatile board.
@@ -924,8 +929,6 @@ source "arch/arm/mach-uniphier/Kconfig"
 
 source "arch/arm/mach-ux500/Kconfig"
 
-source "arch/arm/mach-versatile/Kconfig"
-
 source "arch/arm/mach-vexpress/Kconfig"
 source "arch/arm/plat-versatile/Kconfig"
 
@@ -1822,8 +1825,6 @@ config USE_OF
        bool "Flattened Device Tree support"
        select IRQ_DOMAIN
        select OF
-       select OF_EARLY_FLATTREE
-       select OF_RESERVED_MEM
        help
          Include support for flattened device tree machine descriptions.