kconfig: arm: remove duplicate definitions of SOC_MX*

[karo-tx-uboot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2ac4c4a410dc696d1ffc6461d62b1c0b887e656a..2c000f502bdc303f2acf438888dbc514a92d8320 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -33,12 +33,18 @@ config CPU_V7
         bool
         select HAS_VBAR
 
         bool
         select HAS_VBAR
 

+config CPU_V7M
+       bool
+

 config CPU_PXA
         bool
 
 config CPU_SA1100
         bool
 
 config CPU_PXA
         bool
 
 config CPU_SA1100
         bool
 

+config OMAP_COMMON
+       bool
+

 config SYS_CPU
         default "arm720t" if CPU_ARM720T
         default "arm920t" if CPU_ARM920T
 config SYS_CPU
         default "arm720t" if CPU_ARM720T
         default "arm920t" if CPU_ARM920T


@@ -47,6 +53,7 @@ config SYS_CPU
         default "arm1136" if CPU_ARM1136
         default "arm1176" if CPU_ARM1176
         default "armv7" if CPU_V7
         default "arm1136" if CPU_ARM1136
         default "arm1176" if CPU_ARM1176
         default "armv7" if CPU_V7

+        default "armv7m" if CPU_V7M

         default "pxa" if CPU_PXA
         default "sa1100" if CPU_SA1100
        default "armv8" if ARM64
         default "pxa" if CPU_PXA
         default "sa1100" if CPU_SA1100
        default "armv8" if ARM64


@@ -58,58 +65,31 @@ config SEMIHOSTING
          the hosted environment to call out to the emulator to
          retrieve files from the host machine.
 
          the hosted environment to call out to the emulator to
          retrieve files from the host machine.
 

-config SOC_AM335X
-       bool
-       select CPU_V7
-       select OMAP_COMMON
+config SYS_ICACHE_OFF
+       bool "Do not use Instruction Cache"

 
 

-config SOC_MXS
-       bool
-       select CPU_ARM926EJS
+config SYS_DCACHE_OFF
+       bool "Do not use Data Cache"

 
 

-config SOC_MX23
-       bool
-       select SOC_MXS
+config SYS_L2CACHE_OFF
+       bool "Do not use L2 cache"

 
 

-config SOC_MX28
-       bool
-       select SOC_MXS
+config ARCH_MXS
+       bool "Freescale i.MX23 & i.MX28"
+       select CPU_ARM926EJS

 
 

-config SOC_MX5
-       bool
+config ARCH_MX6
+       bool "Freescale MX6"

        select CPU_V7
 
        select CPU_V7
 

-config SOC_MX53
-       bool
-       select SOC_MX5
-
-config SOC_MX51
-       bool
-       select SOC_MX5
-
-config SOC_MX53
-       bool
-       select SOC_MX5
-
-config SOC_MX6
-       bool
+config ARCH_MX5
+       bool "Freescale MX5"

        select CPU_V7
 
        select CPU_V7
 

-config SOC_MX6Q
-       bool
-       select SOC_MX6
-
-config SOC_MX6DL
-       bool
-       select SOC_MX6
-
-config SOC_MX6S
-       bool
-       select SOC_MX6
-
-config SOC_MX6SX
+config SOC_AM335X

        bool
        bool

-       select SOC_MX6
+       select CPU_V7
+       select OMAP_COMMON

 
 config SOC_SAMA5D4
        bool
 
 config SOC_SAMA5D4
        bool


@@ -117,22 +97,7 @@ config SOC_SAMA5D4
 
 choice
        prompt "Target select"
 
 choice
        prompt "Target select"

-
-config TARGET_INTEGRATORAP_CM720T
-       bool "Support integratorap_cm720t"
-       select CPU_ARM720T
-
-config TARGET_INTEGRATORAP_CM920T
-       bool "Support integratorap_cm920t"
-       select CPU_ARM920T
-
-config TARGET_INTEGRATORCP_CM920T
-       bool "Support integratorcp_cm920t"
-       select CPU_ARM920T
-
-config TARGET_A320EVB
-       bool "Support a320evb"
-       select CPU_ARM920T
+       default ARCH_VERSATILE

 
 config ARCH_AT91
        bool "Atmel AT91"
 
 config ARCH_AT91
        bool "Atmel AT91"


@@ -145,14 +110,6 @@ config TARGET_SCB9328
        bool "Support scb9328"
        select CPU_ARM920T
 
        bool "Support scb9328"
        select CPU_ARM920T
 

-config TARGET_CM4008
-       bool "Support cm4008"
-       select CPU_ARM920T
-
-config TARGET_CM41XX
-       bool "Support cm41xx"
-       select CPU_ARM920T
-

 config TARGET_VCMA9
        bool "Support VCMA9"
        select CPU_ARM920T
 config TARGET_VCMA9
        bool "Support VCMA9"
        select CPU_ARM920T


@@ -161,14 +118,6 @@ config TARGET_SMDK2410
        bool "Support smdk2410"
        select CPU_ARM920T
 
        bool "Support smdk2410"
        select CPU_ARM920T
 

-config TARGET_INTEGRATORAP_CM926EJS
-       bool "Support integratorap_cm926ejs"
-       select CPU_ARM926EJS
-
-config TARGET_INTEGRATORCP_CM926EJS
-       bool "Support integratorcp_cm926ejs"
-       select CPU_ARM926EJS
-

 config TARGET_ASPENITE
        bool "Support aspenite"
        select CPU_ARM926EJS
 config TARGET_ASPENITE
        bool "Support aspenite"
        select CPU_ARM926EJS


@@ -187,6 +136,11 @@ config KIRKWOOD
        bool "Marvell Kirkwood"
        select CPU_ARM926EJS
 
        bool "Marvell Kirkwood"
        select CPU_ARM926EJS
 

+config TARGET_DB_88F6820_GP
+       bool "Support DB-88F6820-GP"
+       select CPU_V7
+       select SUPPORT_SPL
+

 config TARGET_DB_MV784MP_GP
        bool "Support db-mv784mp-gp"
        select CPU_V7
 config TARGET_DB_MV784MP_GP
        bool "Support db-mv784mp-gp"
        select CPU_V7


@@ -200,10 +154,12 @@ config TARGET_MAXBCM
 config TARGET_DEVKIT3250
        bool "Support devkit3250"
        select CPU_ARM926EJS
 config TARGET_DEVKIT3250
        bool "Support devkit3250"
        select CPU_ARM926EJS

+       select SUPPORT_SPL

 
 

-config TARGET_JADECPU
-       bool "Support jadecpu"
+config TARGET_WORK_92105
+       bool "Support work_92105"

        select CPU_ARM926EJS
        select CPU_ARM926EJS

+       select SUPPORT_SPL

 
 config TARGET_MX25PDK
        bool "Support mx25pdk"
 
 config TARGET_MX25PDK
        bool "Support mx25pdk"


@@ -234,11 +190,6 @@ config TARGET_TX53
 
 config TARGET_TX6
        bool "Support tx6"
 
 config TARGET_TX6
        bool "Support tx6"

-       select SOC_MX6
-
-config TARGET_TXA5
-       bool "Support txA5"
-       select SOC_SAMA5D4

 
 config TARGET_ZMX25
        bool "Support zmx25"
 
 config TARGET_ZMX25
        bool "Support zmx25"


@@ -310,10 +261,6 @@ config ORION5X
        bool "Marvell Orion"
        select CPU_ARM926EJS
 
        bool "Marvell Orion"
        select CPU_ARM926EJS
 

-config TARGET_DKB
-       bool "Support dkb"
-       select CPU_ARM926EJS
-

 config TARGET_SPEAR300
        bool "Support spear300"
        select CPU_ARM926EJS
 config TARGET_SPEAR300
        bool "Support spear300"
        select CPU_ARM926EJS


@@ -333,6 +280,11 @@ config TARGET_SPEAR600
 config TARGET_STV0991
        bool "Support stv0991"
        select CPU_V7
 config TARGET_STV0991
        bool "Support stv0991"
        select CPU_V7

+       select DM
+       select DM_SERIAL
+       select DM_SPI
+       select DM_SPI_FLASH
+       select SPI_FLASH

 
 config TARGET_X600
        bool "Support x600"
 
 config TARGET_X600
        bool "Support x600"


@@ -343,10 +295,6 @@ config ARCH_VERSATILE
        bool "ARM Ltd. Versatile family"
        select CPU_ARM926EJS
 
        bool "ARM Ltd. Versatile family"
        select CPU_ARM926EJS
 

-config TARGET_INTEGRATORCP_CM1136
-       bool "Support integratorcp_cm1136"
-       select CPU_ARM1136
-

 config TARGET_IMX31_PHYCORE
        bool "Support imx31_phycore"
        select CPU_ARM1136
 config TARGET_IMX31_PHYCORE
        bool "Support imx31_phycore"
        select CPU_ARM1136


@@ -389,21 +337,11 @@ config TARGET_MX35PDK
        bool "Support mx35pdk"
        select CPU_ARM1136
 
        bool "Support mx35pdk"
        select CPU_ARM1136
 

-config TARGET_RPI
-       bool "Support rpi"
-       select CPU_ARM1176
-
-config TARGET_TNETV107X_EVM
-       bool "Support tnetv107x_evm"
-       select CPU_ARM1176
-
-config TARGET_INTEGRATORAP_CM946ES
-       bool "Support integratorap_cm946es"
-       select CPU_ARM946ES
-
-config TARGET_INTEGRATORCP_CM946ES
-       bool "Support integratorcp_cm946es"
-       select CPU_ARM946ES
+config ARCH_BCM283X
+       bool "Broadcom BCM283X family"
+       select DM
+       select DM_SERIAL
+       select DM_GPIO

 
 config TARGET_VEXPRESS_CA15_TC2
        bool "Support vexpress_ca15_tc2"
 
 config TARGET_VEXPRESS_CA15_TC2
        bool "Support vexpress_ca15_tc2"


@@ -433,29 +371,46 @@ config TARGET_CM_T335
        bool "Support cm_t335"
        select CPU_V7
        select SUPPORT_SPL
        bool "Support cm_t335"
        select CPU_V7
        select SUPPORT_SPL

+       select DM
+       select DM_SERIAL
+       select DM_GPIO

 
 config TARGET_PEPPER
        bool "Support pepper"
        select CPU_V7
        select SUPPORT_SPL
 
 config TARGET_PEPPER
        bool "Support pepper"
        select CPU_V7
        select SUPPORT_SPL

+       select DM
+       select DM_SERIAL
+       select DM_GPIO

 
 config TARGET_AM335X_IGEP0033
        bool "Support am335x_igep0033"
        select CPU_V7
        select SUPPORT_SPL
 
 config TARGET_AM335X_IGEP0033
        bool "Support am335x_igep0033"
        select CPU_V7
        select SUPPORT_SPL

+       select DM
+       select DM_SERIAL
+       select DM_GPIO

 
 config TARGET_PCM051
        bool "Support pcm051"
        select CPU_V7
        select SUPPORT_SPL
 
 config TARGET_PCM051
        bool "Support pcm051"
        select CPU_V7
        select SUPPORT_SPL

+       select DM
+       select DM_SERIAL
+       select DM_GPIO

 
 config TARGET_DRACO
        bool "Support draco"
        select CPU_V7
        select SUPPORT_SPL
 
 
 config TARGET_DRACO
        bool "Support draco"
        select CPU_V7
        select SUPPORT_SPL
 

-config TARGET_DXR2
-       bool "Support dxr2"
+config TARGET_THUBAN
+       bool "Support thuban"
+       select CPU_V7
+       select SUPPORT_SPL
+
+config TARGET_RASTABAN
+       bool "Support rastaban"

        select CPU_V7
        select SUPPORT_SPL
 
        select CPU_V7
        select SUPPORT_SPL
 


@@ -473,17 +428,46 @@ config TARGET_PENGWYN
        bool "Support pengwyn"
        select CPU_V7
        select SUPPORT_SPL
        bool "Support pengwyn"
        select CPU_V7
        select SUPPORT_SPL

+       select DM
+       select DM_SERIAL
+       select DM_GPIO
+
+config TARGET_AM335X_BALTOS
+       bool "Support am335x_baltos"
+       select CPU_V7
+       select SUPPORT_SPL
+       select DM
+       select DM_SERIAL
+       select DM_GPIO

 
 config TARGET_AM335X_EVM
        bool "Support am335x_evm"
        select CPU_V7
        select SUPPORT_SPL
 
 config TARGET_AM335X_EVM
        bool "Support am335x_evm"
        select CPU_V7
        select SUPPORT_SPL

+       select DM
+       select DM_SERIAL
+       select DM_GPIO

 
 config TARGET_AM43XX_EVM
        bool "Support am43xx_evm"
        select CPU_V7
        select SUPPORT_SPL
 
 
 config TARGET_AM43XX_EVM
        bool "Support am43xx_evm"
        select CPU_V7
        select SUPPORT_SPL
 

+config TARGET_BAV335X
+       bool "Support bav335x"
+       select CPU_V7
+       select SUPPORT_SPL
+       select DM
+       select DM_SERIAL
+       help
+         The BAV335x OEM Network Processor integrates all the functions of an
+         embedded network computer in a small, easy to use SODIMM module which
+         incorporates the popular Texas Instruments Sitara 32bit ARM Coretex-A8
+         processor, with fast DDR3 512MB SDRAM, 4GB of embedded MMC and a Gigabit
+         ethernet with simple connection to external connectors.
+
+         For more information, visit: http://birdland.com/oem
+

 config TARGET_TI814X_EVM
        bool "Support ti814x_evm"
        select CPU_V7
 config TARGET_TI814X_EVM
        bool "Support ti814x_evm"
        select CPU_V7


@@ -509,28 +493,33 @@ config TARGET_BCMNSP
 config ARCH_EXYNOS
        bool "Samsung EXYNOS"
        select CPU_V7
 config ARCH_EXYNOS
        bool "Samsung EXYNOS"
        select CPU_V7

+       select DM
+       select DM_SPI_FLASH
+       select DM_SERIAL
+       select DM_SPI
+       select DM_GPIO

 
 config ARCH_S5PC1XX
        bool "Samsung S5PC1XX"
        select CPU_V7
 
 config ARCH_S5PC1XX
        bool "Samsung S5PC1XX"
        select CPU_V7

+       select DM
+       select DM_SERIAL
+       select DM_GPIO

 
 config ARCH_HIGHBANK
        bool "Calxeda Highbank"
        select CPU_V7
 
 
 config ARCH_HIGHBANK
        bool "Calxeda Highbank"
        select CPU_V7
 

+config ARCH_INTEGRATOR
+       bool "ARM Ltd. Integrator family"
+       select DM
+       select DM_SERIAL
+

 config ARCH_KEYSTONE
        bool "TI Keystone"
        select CPU_V7
        select SUPPORT_SPL
 
 config ARCH_KEYSTONE
        bool "TI Keystone"
        select CPU_V7
        select SUPPORT_SPL
 

-config ARCH_MX6
-       bool "Freescale MX6"
-       select CPU_V7
-
-config ARCH_MX5
-       bool "Freescale MX5"
-       select CPU_V7
-

 config TARGET_M53EVK
        bool "Support m53evk"
        select CPU_V7
 config TARGET_M53EVK
        bool "Support m53evk"
        select CPU_V7


@@ -575,6 +564,11 @@ config TARGET_UDOO
 config TARGET_WANDBOARD
        bool "Support wandboard"
        select CPU_V7
 config TARGET_WANDBOARD
        bool "Support wandboard"
        select CPU_V7

+       select SUPPORT_SPL
+
+config TARGET_WARP
+       bool "Support WaRP"
+       select CPU_V7

 
 config TARGET_TITANIUM
        bool "Support titanium"
 
 config TARGET_TITANIUM
        bool "Support titanium"


@@ -596,6 +590,10 @@ config TARGET_ARISTAINETOS
        bool "Support aristainetos"
        select CPU_V7
 
        bool "Support aristainetos"
        select CPU_V7
 

+config TARGET_ARISTAINETOS2
+       bool "Support aristainetos2"
+       select CPU_V7
+

 config TARGET_MX6QARM2
        bool "Support mx6qarm2"
        select CPU_V7
 config TARGET_MX6QARM2
        bool "Support mx6qarm2"
        select CPU_V7


@@ -603,11 +601,20 @@ config TARGET_MX6QARM2
 config TARGET_MX6QSABREAUTO
        bool "Support mx6qsabreauto"
        select CPU_V7
 config TARGET_MX6QSABREAUTO
        bool "Support mx6qsabreauto"
        select CPU_V7

+       select DM
+       select DM_THERMAL

 
 config TARGET_MX6SABRESD
        bool "Support mx6sabresd"
        select CPU_V7
        select SUPPORT_SPL
 
 config TARGET_MX6SABRESD
        bool "Support mx6sabresd"
        select CPU_V7
        select SUPPORT_SPL

+       select DM
+       select DM_THERMAL
+
+config TARGET_MX6CUBOXI
+       bool "Support Solid-run mx6 boards"
+       select CPU_V7
+       select SUPPORT_SPL

 
 config TARGET_MX6SLEVK
        bool "Support mx6slevk"
 
 config TARGET_MX6SLEVK
        bool "Support mx6slevk"


@@ -617,16 +624,21 @@ config TARGET_MX6SXSABRESD
        bool "Support mx6sxsabresd"
        select CPU_V7
        select SUPPORT_SPL
        bool "Support mx6sxsabresd"
        select CPU_V7
        select SUPPORT_SPL

+       select DM
+       select DM_THERMAL
+
+config TARGET_MX6UL_14X14_EVK
+       bool "Support mx6ul_14x14_evk"
+       select SOC_MX6UL
+       select DM
+       select DM_THERMAL
+       select SUPPORT_SPL

 
 config TARGET_GW_VENTANA
        bool "Support gw_ventana"
        select CPU_V7
        select SUPPORT_SPL
 
 
 config TARGET_GW_VENTANA
        bool "Support gw_ventana"
        select CPU_V7
        select SUPPORT_SPL
 

-config TARGET_HUMMINGBOARD
-       bool "Support hummingboard"
-       select CPU_V7
-

 config TARGET_KOSAGI_NOVENA
        bool "Support Kosagi Novena"
        select CPU_V7
 config TARGET_KOSAGI_NOVENA
        bool "Support Kosagi Novena"
        select CPU_V7


@@ -636,10 +648,6 @@ config TARGET_TBS2910
        bool "Support tbs2910"
        select CPU_V7
 
        bool "Support tbs2910"
        select CPU_V7
 

-config TARGET_TQMA6
-       bool "TQ Systems TQMa6 board"
-       select CPU_V7
-

 config TARGET_OT1200
        bool "Bachmann OT1200"
        select CPU_V7
 config TARGET_OT1200
        bool "Bachmann OT1200"
        select CPU_V7


@@ -673,18 +681,32 @@ config RMOBILE
        bool "Renesas ARM SoCs"
        select CPU_V7
 
        bool "Renesas ARM SoCs"
        select CPU_V7
 

-config TARGET_CM_FX6
-       bool "Support cm_fx6"
+config ARCH_SOCFPGA
+       bool "Altera SOCFPGA family"

        select CPU_V7
        select SUPPORT_SPL
        select CPU_V7
        select SUPPORT_SPL

+       select DM
+       select DM_SPI_FLASH
+       select DM_SPI

 
 

-config TARGET_SOCFPGA_CYCLONE5
-       bool "Support socfpga_cyclone5"
+config TARGET_CM_T43
+       bool "Support cm_t43"

        select CPU_V7
        select SUPPORT_SPL
 
 config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
        select CPU_V7
        select SUPPORT_SPL
 
 config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"

+       select CMD_USB
+       select DM
+       select DM_GPIO
+       select DM_ETH
+       select DM_SERIAL
+       select DM_USB
+       select OF_CONTROL
+       select OF_SEPARATE
+       select USB
+       select USB_STORAGE
+       select USB_KEYBOARD

 
 config TARGET_SNOWBALL
        bool "Support snowball"
 
 config TARGET_SNOWBALL
        bool "Support snowball"


@@ -698,18 +720,25 @@ config TARGET_VF610TWR
        bool "Support vf610twr"
        select CPU_V7
 
        bool "Support vf610twr"
        select CPU_V7
 

-config ZYNQ
+config TARGET_COLIBRI_VF
+       bool "Support Colibri VF50/61"
+       select CPU_V7
+
+config ARCH_ZYNQ

        bool "Xilinx Zynq Platform"
        select CPU_V7
        select SUPPORT_SPL
        bool "Xilinx Zynq Platform"
        select CPU_V7
        select SUPPORT_SPL

+       select OF_CONTROL
+       select DM
+       select DM_SPI
+       select DM_SPI_FLASH
+
+config ARCH_ZYNQMP
+       bool "Support Xilinx ZynqMP Platform"
+       select ARM64

 
 config TEGRA
        bool "NVIDIA Tegra"
 
 config TEGRA
        bool "NVIDIA Tegra"

-       select SUPPORT_SPL
-       select SPL
-       select OF_CONTROL if !SPL_BUILD
-       select CPU_ARM720T if SPL_BUILD
-       select CPU_V7 if !SPL_BUILD

 
 config TARGET_VEXPRESS64_AEMV8A
        bool "Support vexpress_aemv8a"
 
 config TARGET_VEXPRESS64_AEMV8A
        bool "Support vexpress_aemv8a"


@@ -727,10 +756,41 @@ config TARGET_VEXPRESS64_JUNO
 config TARGET_LS2085A_EMU
        bool "Support ls2085a_emu"
        select ARM64
 config TARGET_LS2085A_EMU
        bool "Support ls2085a_emu"
        select ARM64

+       select ARMV8_MULTIENTRY

 
 config TARGET_LS2085A_SIMU
        bool "Support ls2085a_simu"
        select ARM64
 
 config TARGET_LS2085A_SIMU
        bool "Support ls2085a_simu"
        select ARM64

+       select ARMV8_MULTIENTRY
+
+config TARGET_LS2085AQDS
+       bool "Support ls2085aqds"
+       select ARM64
+       select ARMV8_MULTIENTRY
+       select SUPPORT_SPL
+       help
+         Support for Freescale LS2085AQDS platform
+         The LS2085A Development System (QDS) is a high-performance
+         development platform that supports the QorIQ LS2085A
+         Layerscape Architecture processor.
+
+config TARGET_LS2085ARDB
+       bool "Support ls2085ardb"
+       select ARM64
+       select ARMV8_MULTIENTRY
+       select SUPPORT_SPL
+       help
+         Support for Freescale LS2085ARDB platform.
+         The LS2085A Reference design board (RDB) is a high-performance
+         development platform that supports the QorIQ LS2085A
+         Layerscape Architecture processor.
+
+config TARGET_HIKEY
+       bool "Support HiKey 96boards Consumer Edition Platform"
+       select ARM64
+         help
+         Support for HiKey 96boards platform. It features a HI6220
+         SoC, with 8xA53 CPU, mali450 gpu, and 1GB RAM.

 
 config TARGET_LS1021AQDS
        bool "Support ls1021aqds"
 
 config TARGET_LS1021AQDS
        bool "Support ls1021aqds"


@@ -797,33 +857,49 @@ config TARGET_JORNADA
        select CPU_SA1100
 
 config ARCH_UNIPHIER
        select CPU_SA1100
 
 config ARCH_UNIPHIER

-       bool "Panasonic UniPhier platform"
+       bool "Socionext UniPhier SoCs"

        select CPU_V7
        select SUPPORT_SPL
        select SPL
        select CPU_V7
        select SUPPORT_SPL
        select SPL

-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
+       select SPL_OF_CONTROL
+       select DM
+       select SPL_DM
+       select DM_SERIAL
+       select DM_I2C
+       help
+         Support for UniPhier SoC family developed by Socionext Inc.
+         (formerly, System LSI Business Division of Panasonic Corporation)
+
+config TARGET_STM32F429_DISCOVERY
+       bool "Support STM32F429 Discovery"
+       select CPU_V7M

 
 endchoice
 
 source "arch/arm/mach-at91/Kconfig"
 
 
 endchoice
 
 source "arch/arm/mach-at91/Kconfig"
 

+source "arch/arm/mach-bcm283x/Kconfig"
+

 source "arch/arm/mach-davinci/Kconfig"
 
 source "arch/arm/mach-davinci/Kconfig"
 

-source "arch/arm/cpu/arm1176/bcm2835/Kconfig"
+source "arch/arm/mach-exynos/Kconfig"

 
 

-source "arch/arm/cpu/armv7/exynos/Kconfig"
+source "arch/arm/mach-highbank/Kconfig"

 
 

-source "arch/arm/cpu/armv7/highbank/Kconfig"
+source "arch/arm/mach-integrator/Kconfig"

 
 source "arch/arm/mach-keystone/Kconfig"
 
 source "arch/arm/mach-kirkwood/Kconfig"
 
 
 source "arch/arm/mach-keystone/Kconfig"
 
 source "arch/arm/mach-kirkwood/Kconfig"
 

-source "arch/arm/mach-nomadik/Kconfig"
+source "arch/arm/cpu/arm926ejs/mxs/Kconfig"
+
+source "arch/arm/cpu/armv7/mx6/Kconfig"

 
 source "arch/arm/cpu/armv7/mx5/Kconfig"
 
 
 source "arch/arm/cpu/armv7/mx5/Kconfig"
 

-source "arch/arm/cpu/armv7/mx6/Kconfig"
+source "arch/arm/mach-nomadik/Kconfig"

 
 source "arch/arm/cpu/armv7/omap3/Kconfig"
 
 
 source "arch/arm/cpu/armv7/omap3/Kconfig"
 


@@ -837,29 +913,36 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
 source "arch/arm/cpu/armv7/s5pc1xx/Kconfig"
 
 
 source "arch/arm/cpu/armv7/s5pc1xx/Kconfig"
 

+source "arch/arm/mach-socfpga/Kconfig"
+

 source "arch/arm/mach-tegra/Kconfig"
 
 source "arch/arm/mach-tegra/Kconfig"
 

-source "arch/arm/cpu/armv7/uniphier/Kconfig"
+source "arch/arm/mach-uniphier/Kconfig"

 
 

-source "arch/arm/cpu/arm926ejs/versatile/Kconfig"
+source "arch/arm/mach-versatile/Kconfig"

 
 

-source "arch/arm/cpu/armv7/zynq/Kconfig"
+source "arch/arm/mach-zynq/Kconfig"

 
 source "arch/arm/cpu/armv7/Kconfig"
 
 
 source "arch/arm/cpu/armv7/Kconfig"
 

+source "arch/arm/cpu/armv8/zynqmp/Kconfig"
+
+source "arch/arm/cpu/armv8/Kconfig"
+
+source "arch/arm/imx-common/Kconfig"
+

 source "board/aristainetos/Kconfig"
 source "board/BuR/kwb/Kconfig"
 source "board/BuR/tseries/Kconfig"
 source "board/CarMediaLab/flea3/Kconfig"
 source "board/Marvell/aspenite/Kconfig"
 source "board/aristainetos/Kconfig"
 source "board/BuR/kwb/Kconfig"
 source "board/BuR/tseries/Kconfig"
 source "board/CarMediaLab/flea3/Kconfig"
 source "board/Marvell/aspenite/Kconfig"

+source "board/Marvell/db-88f6820-gp/Kconfig"

 source "board/Marvell/db-mv784mp-gp/Kconfig"
 source "board/Marvell/db-mv784mp-gp/Kconfig"

-source "board/Marvell/dkb/Kconfig"

 source "board/Marvell/gplugd/Kconfig"
 source "board/Marvell/gplugd/Kconfig"

-source "board/altera/socfpga/Kconfig"

 source "board/armadeus/apf27/Kconfig"
 source "board/armadeus/apf27/Kconfig"

-source "board/armltd/integrator/Kconfig"

 source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
 source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"

+source "board/hisilicon/hikey/Kconfig"

 source "board/bachmann/ot1200/Kconfig"
 source "board/balloon3/Kconfig"
 source "board/barco/platinum/Kconfig"
 source "board/bachmann/ot1200/Kconfig"
 source "board/balloon3/Kconfig"
 source "board/barco/platinum/Kconfig"


@@ -870,9 +953,8 @@ source "board/broadcom/bcm28155_ap/Kconfig"
 source "board/broadcom/bcmcygnus/Kconfig"
 source "board/broadcom/bcmnsp/Kconfig"
 source "board/cirrus/edb93xx/Kconfig"
 source "board/broadcom/bcmcygnus/Kconfig"
 source "board/broadcom/bcmnsp/Kconfig"
 source "board/cirrus/edb93xx/Kconfig"

-source "board/cm4008/Kconfig"
-source "board/cm41xx/Kconfig"

 source "board/compulab/cm_t335/Kconfig"
 source "board/compulab/cm_t335/Kconfig"

+source "board/compulab/cm_t43/Kconfig"

 source "board/compulab/cm_fx6/Kconfig"
 source "board/congatec/cgtqmx6eval/Kconfig"
 source "board/creative/xfi3/Kconfig"
 source "board/compulab/cm_fx6/Kconfig"
 source "board/congatec/cgtqmx6eval/Kconfig"
 source "board/creative/xfi3/Kconfig"


@@ -881,8 +963,9 @@ source "board/denx/m28evk/Kconfig"
 source "board/denx/m53evk/Kconfig"
 source "board/embest/mx6boards/Kconfig"
 source "board/esg/ima3-mx53/Kconfig"
 source "board/denx/m53evk/Kconfig"
 source "board/embest/mx6boards/Kconfig"
 source "board/esg/ima3-mx53/Kconfig"

-source "board/faraday/a320evb/Kconfig"

 source "board/freescale/ls2085a/Kconfig"
 source "board/freescale/ls2085a/Kconfig"

+source "board/freescale/ls2085aqds/Kconfig"
+source "board/freescale/ls2085ardb/Kconfig"

 source "board/freescale/ls1021aqds/Kconfig"
 source "board/freescale/ls1021atwr/Kconfig"
 source "board/freescale/mx23evk/Kconfig"
 source "board/freescale/ls1021aqds/Kconfig"
 source "board/freescale/ls1021atwr/Kconfig"
 source "board/freescale/mx23evk/Kconfig"


@@ -901,6 +984,7 @@ source "board/freescale/mx6qsabreauto/Kconfig"
 source "board/freescale/mx6sabresd/Kconfig"
 source "board/freescale/mx6slevk/Kconfig"
 source "board/freescale/mx6sxsabresd/Kconfig"
 source "board/freescale/mx6sabresd/Kconfig"
 source "board/freescale/mx6slevk/Kconfig"
 source "board/freescale/mx6sxsabresd/Kconfig"

+source "board/freescale/mx6ul_14x14_evk/Kconfig"

 source "board/freescale/vf610twr/Kconfig"
 source "board/gateworks/gw_ventana/Kconfig"
 source "board/genesi/mx51_efikamx/Kconfig"
 source "board/freescale/vf610twr/Kconfig"
 source "board/gateworks/gw_ventana/Kconfig"
 source "board/genesi/mx51_efikamx/Kconfig"


@@ -930,7 +1014,6 @@ source "board/palmtreo680/Kconfig"
 source "board/phytec/pcm051/Kconfig"
 source "board/ppcag/bg0900/Kconfig"
 source "board/pxa255_idp/Kconfig"
 source "board/phytec/pcm051/Kconfig"
 source "board/ppcag/bg0900/Kconfig"
 source "board/pxa255_idp/Kconfig"

-source "board/raspberrypi/rpi/Kconfig"

 source "board/samsung/smdk2410/Kconfig"
 source "board/sandisk/sansa_fuze_plus/Kconfig"
 source "board/scb9328/Kconfig"
 source "board/samsung/smdk2410/Kconfig"
 source "board/sandisk/sansa_fuze_plus/Kconfig"
 source "board/scb9328/Kconfig"


@@ -939,7 +1022,7 @@ source "board/siemens/draco/Kconfig"
 source "board/siemens/pxm2/Kconfig"
 source "board/siemens/rut/Kconfig"
 source "board/silica/pengwyn/Kconfig"
 source "board/siemens/pxm2/Kconfig"
 source "board/siemens/rut/Kconfig"
 source "board/silica/pengwyn/Kconfig"

-source "board/solidrun/hummingboard/Kconfig"
+source "board/solidrun/mx6cuboxi/Kconfig"

 source "board/spear/spear300/Kconfig"
 source "board/spear/spear310/Kconfig"
 source "board/spear/spear320/Kconfig"
 source "board/spear/spear300/Kconfig"
 source "board/spear/spear310/Kconfig"
 source "board/spear/spear320/Kconfig"


@@ -947,25 +1030,28 @@ source "board/spear/spear600/Kconfig"
 source "board/spear/x600/Kconfig"
 source "board/st-ericsson/snowball/Kconfig"
 source "board/st-ericsson/u8500/Kconfig"
 source "board/spear/x600/Kconfig"
 source "board/st-ericsson/snowball/Kconfig"
 source "board/st-ericsson/u8500/Kconfig"

+source "board/st/stm32f429-discovery/Kconfig"

 source "board/st/stv0991/Kconfig"
 source "board/sunxi/Kconfig"
 source "board/st/stv0991/Kconfig"
 source "board/sunxi/Kconfig"

-source "board/syteco/jadecpu/Kconfig"

 source "board/syteco/zmx25/Kconfig"
 source "board/tbs/tbs2910/Kconfig"
 source "board/ti/am335x/Kconfig"
 source "board/ti/am43xx/Kconfig"
 source "board/syteco/zmx25/Kconfig"
 source "board/tbs/tbs2910/Kconfig"
 source "board/ti/am335x/Kconfig"
 source "board/ti/am43xx/Kconfig"

+source "board/birdland/bav335x/Kconfig"

 source "board/ti/ti814x/Kconfig"
 source "board/ti/ti816x/Kconfig"
 source "board/ti/ti814x/Kconfig"
 source "board/ti/ti816x/Kconfig"

-source "board/ti/tnetv107xevm/Kconfig"

 source "board/timll/devkit3250/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
 source "board/timll/devkit3250/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"

-source "board/tqc/tqma6/Kconfig"
+source "board/toradex/colibri_vf/Kconfig"

 source "board/trizepsiv/Kconfig"
 source "board/ttcontrol/vision2/Kconfig"
 source "board/udoo/Kconfig"
 source "board/vpac270/Kconfig"
 source "board/trizepsiv/Kconfig"
 source "board/ttcontrol/vision2/Kconfig"
 source "board/udoo/Kconfig"
 source "board/vpac270/Kconfig"

+source "board/vscom/baltos/Kconfig"

 source "board/wandboard/Kconfig"
 source "board/wandboard/Kconfig"

+source "board/warp/Kconfig"

 source "board/woodburn/Kconfig"
 source "board/woodburn/Kconfig"

+source "board/work-microwave/work_92105/Kconfig"

 source "board/xaeniax/Kconfig"
 source "board/zipitz2/Kconfig"
 
 source "board/xaeniax/Kconfig"
 source "board/zipitz2/Kconfig"