Merge git://git.denx.de/u-boot-dm

[u-boot] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6b65d8e76a46fcf259c13bfe5fec77b0219816bd..6de734f8f20f04b604294d45bc3f68bfbc89e513 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -64,6 +64,20 @@ config SYS_CPU
         default "sa1100" if CPU_SA1100
        default "armv8" if ARM64
 
         default "sa1100" if CPU_SA1100
        default "armv8" if ARM64
 

+config SYS_ARM_ARCH
+       int
+       default 4 if CPU_ARM720T
+       default 4 if CPU_ARM920T
+       default 5 if CPU_ARM926EJS
+       default 5 if CPU_ARM946ES
+       default 6 if CPU_ARM1136
+       default 6 if CPU_ARM1176
+       default 7 if CPU_V7
+       default 7 if CPU_V7M
+       default 5 if CPU_PXA
+       default 4 if CPU_SA1100
+       default 8 if ARM64
+

 config SEMIHOSTING
        bool "support boot from semihosting"
        help
 config SEMIHOSTING
        bool "support boot from semihosting"
        help


@@ -77,6 +91,14 @@ config SYS_L2CACHE_OFF
          If SoC does not support L2CACHE or one do not want to enable
          L2CACHE, choose this option.
 
          If SoC does not support L2CACHE or one do not want to enable
          L2CACHE, choose this option.
 

+config ENABLE_ARM_SOC_BOOT0_HOOK
+       bool "prepare BOOT0 header"
+       help
+         If the SoC's BOOT0 requires a header area filled with (magic)
+         values, then choose this option, and create a define called
+         ARM_SOC_BOOT0_HOOK which contains the required assembler
+         preprocessor code.
+

 choice
        prompt "Target select"
        default TARGET_HIKEY
 choice
        prompt "Target select"
        default TARGET_HIKEY


@@ -282,13 +304,13 @@ config TARGET_VEXPRESS_CA9X4
        bool "Support vexpress_ca9x4"
        select CPU_V7
 
        bool "Support vexpress_ca9x4"
        select CPU_V7
 

-config TARGET_KWB
-       bool "Support kwb"
+config TARGET_BRXRE1
+       bool "Support BRXRE1"

        select CPU_V7
        select SUPPORT_SPL
 
        select CPU_V7
        select SUPPORT_SPL
 

-config TARGET_TSERIES
-       bool "Support tseries"
+config TARGET_BRPPT1
+       bool "Support BRPPT1"

        select CPU_V7
        select SUPPORT_SPL
 
        select CPU_V7
        select SUPPORT_SPL
 


@@ -328,26 +350,49 @@ config TARGET_DRACO
        bool "Support draco"
        select CPU_V7
        select SUPPORT_SPL
        bool "Support draco"
        select CPU_V7
        select SUPPORT_SPL

+       select DM
+       select DM_SERIAL
+       select DM_GPIO

 
 config TARGET_THUBAN
        bool "Support thuban"
        select CPU_V7
        select SUPPORT_SPL
 
 config TARGET_THUBAN
        bool "Support thuban"
        select CPU_V7
        select SUPPORT_SPL

+       select DM
+       select DM_SERIAL
+       select DM_GPIO

 
 config TARGET_RASTABAN
        bool "Support rastaban"
        select CPU_V7
        select SUPPORT_SPL
 
 config TARGET_RASTABAN
        bool "Support rastaban"
        select CPU_V7
        select SUPPORT_SPL

+       select DM
+       select DM_SERIAL
+       select DM_GPIO
+
+config TARGET_ETAMIN
+        bool "Support etamin"
+        select CPU_V7
+        select SUPPORT_SPL
+       select DM
+       select DM_SERIAL
+       select DM_GPIO

 
 config TARGET_PXM2
        bool "Support pxm2"
        select CPU_V7
        select SUPPORT_SPL
 
 config TARGET_PXM2
        bool "Support pxm2"
        select CPU_V7
        select SUPPORT_SPL

+       select DM
+       select DM_SERIAL
+       select DM_GPIO

 
 config TARGET_RUT
        bool "Support rut"
        select CPU_V7
        select SUPPORT_SPL
 
 config TARGET_RUT
        bool "Support rut"
        select CPU_V7
        select SUPPORT_SPL

+       select DM
+       select DM_SERIAL
+       select DM_GPIO

 
 config TARGET_PENGWYN
        bool "Support pengwyn"
 
 config TARGET_PENGWYN
        bool "Support pengwyn"


@@ -374,18 +419,20 @@ config TARGET_AM335X_EVM
        select DM_GPIO
        select TI_I2C_BOARD_DETECT
 
        select DM_GPIO
        select TI_I2C_BOARD_DETECT
 

-config TARGET_AM335X_SL50
-       bool "Support am335x_sl50"
+config TARGET_AM335X_SHC
+       bool "Support am335x based shc board from bosch"

        select CPU_V7
        select SUPPORT_SPL
        select DM
        select DM_SERIAL
        select CPU_V7
        select SUPPORT_SPL
        select DM
        select DM_SERIAL

+       select DM_GPIO

 
 

-config TARGET_AM43XX_EVM
-       bool "Support am43xx_evm"
+config TARGET_AM335X_SL50
+       bool "Support am335x_sl50"

        select CPU_V7
        select SUPPORT_SPL
        select CPU_V7
        select SUPPORT_SPL

-       select TI_I2C_BOARD_DETECT
+       select DM
+       select DM_SERIAL

 
 config TARGET_BAV335X
        bool "Support bav335x"
 
 config TARGET_BAV335X
        bool "Support bav335x"


@@ -412,6 +459,10 @@ config TARGET_TI816X_EVM
        select CPU_V7
        select SUPPORT_SPL
 
        select CPU_V7
        select SUPPORT_SPL
 

+config TARGET_BCM23550_W1D
+       bool "Support bcm23550_w1d"
+       select CPU_V7
+

 config TARGET_BCM28155_AP
        bool "Support bcm28155_ap"
        select CPU_V7
 config TARGET_BCM28155_AP
        bool "Support bcm28155_ap"
        select CPU_V7


@@ -426,7 +477,6 @@ config TARGET_BCMNSP
 
 config ARCH_EXYNOS
        bool "Samsung EXYNOS"
 
 config ARCH_EXYNOS
        bool "Samsung EXYNOS"

-       select CPU_V7

        select DM
        select DM_SPI_FLASH
        select DM_SERIAL
        select DM
        select DM_SPI_FLASH
        select DM_SERIAL


@@ -456,6 +506,13 @@ config ARCH_KEYSTONE
        select SUPPORT_SPL
        select CMD_POWEROFF
 
        select SUPPORT_SPL
        select CMD_POWEROFF
 

+config ARCH_MESON
+       bool "Amlogic Meson"
+       help
+         Support for the Meson SoC family developed by Amlogic Inc.,
+         targeted at media players and tablet computers. We currently
+         support the S905 (GXBaby) 64-bit SoC.
+

 config ARCH_MX7
        bool "Freescale MX7"
        select CPU_V7
 config ARCH_MX7
        bool "Freescale MX7"
        select CPU_V7


@@ -507,10 +564,25 @@ config OMAP54XX
        select CPU_V7
        select SUPPORT_SPL
 
        select CPU_V7
        select SUPPORT_SPL
 

+config AM43XX
+       bool "AM43XX SoC"
+       select CPU_V7
+       select SUPPORT_SPL
+       help
+         Support for AM43xx SOC from Texas Instruments.
+         The AM43xx high performance SOC features a Cortex-A9
+         ARM core, a quad core PRU-ICSS for industrial Ethernet
+         protocols, dual camera support, optional 3D graphics
+         and an optional customer programmable secure boot.
+

 config RMOBILE
        bool "Renesas ARM SoCs"
        select CPU_V7
 
 config RMOBILE
        bool "Renesas ARM SoCs"
        select CPU_V7
 

+config TARGET_S32V234EVB
+       bool "Support s32v234evb"
+       select ARM64
+

 config ARCH_SNAPDRAGON
        bool "Qualcomm Snapdragon SoCs"
        select ARM64
 config ARCH_SNAPDRAGON
        bool "Qualcomm Snapdragon SoCs"
        select ARM64


@@ -539,6 +611,7 @@ config TARGET_CM_T43
 config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
        select CMD_GPIO
 config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
        select CMD_GPIO

+       select CMD_MMC if MMC

        select CMD_USB
        select DM
        select DM_ETH
        select CMD_USB
        select DM
        select DM_ETH


@@ -555,6 +628,7 @@ config ARCH_SUNXI
        select USB
        select USB_STORAGE
        select USB_KEYBOARD
        select USB
        select USB_STORAGE
        select USB_KEYBOARD

+       select USE_TINY_PRINTF

 
 config TARGET_TS4800
        bool "Support TS4800"
 
 config TARGET_TS4800
        bool "Support TS4800"


@@ -583,10 +657,13 @@ config ARCH_ZYNQ
        select DM_GPIO
        select SPL_DM if SPL
        select DM_MMC
        select DM_GPIO
        select SPL_DM if SPL
        select DM_MMC

+       select DM_MMC_OPS

        select DM_SPI
        select DM_SERIAL
        select DM_SPI_FLASH
        select SPL_SEPARATE_BSS if SPL
        select DM_SPI
        select DM_SERIAL
        select DM_SPI_FLASH
        select SPL_SEPARATE_BSS if SPL

+       select DM_USB if USB
+       select BLK

 
 config ARCH_ZYNQMP
        bool "Support Xilinx ZynqMP Platform"
 
 config ARCH_ZYNQMP
        bool "Support Xilinx ZynqMP Platform"


@@ -594,6 +671,13 @@ config ARCH_ZYNQMP
        select DM
        select OF_CONTROL
        select DM_SERIAL
        select DM
        select OF_CONTROL
        select DM_SERIAL

+       select SUPPORT_SPL
+       select CLK
+       select SPL_CLK
+       select DM_USB if USB
+       select DM_MMC
+       select DM_MMC_OPS
+       select BLK

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


@@ -673,6 +757,33 @@ config TARGET_HIKEY
          Support for HiKey 96boards platform. It features a HI6220
          SoC, with 8xA53 CPU, mali450 gpu, and 1GB RAM.
 
          Support for HiKey 96boards platform. It features a HI6220
          SoC, with 8xA53 CPU, mali450 gpu, and 1GB RAM.
 

+config TARGET_LS1012AQDS
+       bool "Support ls1012aqds"
+       select ARM64
+       help
+         Support for Freescale LS1012AQDS platform.
+         The LS1012A Development System (QDS) is a high-performance
+         development platform that supports the QorIQ LS1012A
+         Layerscape Architecture processor.
+
+config TARGET_LS1012ARDB
+       bool "Support ls1012ardb"
+       select ARM64
+       help
+         Support for Freescale LS1012ARDB platform.
+         The LS1012A Reference design board (RDB) is a high-performance
+         development platform that supports the QorIQ LS1012A
+         Layerscape Architecture processor.
+
+config TARGET_LS1012AFRDM
+       bool "Support ls1012afrdm"
+       select ARM64
+       help
+         Support for Freescale LS1012AFRDM platform.
+         The LS1012A Freedom  board (FRDM) is a high-performance
+         development platform that supports the QorIQ LS1012A
+         Layerscape Architecture processor.
+

 config TARGET_LS1021AQDS
        bool "Support ls1021aqds"
        select CPU_V7
 config TARGET_LS1021AQDS
        bool "Support ls1021aqds"
        select CPU_V7


@@ -717,6 +828,7 @@ config ARCH_UNIPHIER
        select SPL
        select OF_CONTROL
        select SPL_OF_CONTROL
        select SPL
        select OF_CONTROL
        select SPL_OF_CONTROL

+       select OF_LIBFDT

        select DM
        select SPL_DM
        select DM_GPIO
        select DM
        select SPL_DM
        select DM_GPIO


@@ -735,14 +847,23 @@ config STM32
 
 config ARCH_ROCKCHIP
        bool "Support Rockchip SoCs"
 
 config ARCH_ROCKCHIP
        bool "Support Rockchip SoCs"

-       select SUPPORT_SPL
-       select SPL

        select OF_CONTROL
        select OF_CONTROL

-       select CPU_V7
+       select BLK

        select DM
        select DM

+       select SPL_DM if SPL
+       select SYS_MALLOC_F
+       select SPL_SYS_MALLOC_SIMPLE if SPL
+       select DM_GPIO
+       select DM_I2C
+       select DM_MMC
+       select DM_MMC_OPS
+       select DM_SERIAL
+       select DM_SPI
+       select DM_SPI_FLASH

 
 config TARGET_THUNDERX_88XX
        bool "Support ThunderX 88xx"
 
 config TARGET_THUNDERX_88XX
        bool "Support ThunderX 88xx"

+       select ARM64

        select OF_CONTROL
 
 endchoice
        select OF_CONTROL
 
 endchoice


@@ -771,16 +892,14 @@ 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/omap3/Kconfig"
-
-source "arch/arm/cpu/armv7/omap4/Kconfig"
-
-source "arch/arm/cpu/armv7/omap5/Kconfig"
+source "arch/arm/cpu/armv7/omap-common/Kconfig"

 
 source "arch/arm/mach-orion5x/Kconfig"
 
 source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
 
 source "arch/arm/mach-orion5x/Kconfig"
 
 source "arch/arm/cpu/armv7/rmobile/Kconfig"
 

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

 source "arch/arm/mach-rockchip/Kconfig"
 
 source "arch/arm/mach-s5pc1xx/Kconfig"
 source "arch/arm/mach-rockchip/Kconfig"
 
 source "arch/arm/mach-s5pc1xx/Kconfig"


@@ -805,8 +924,9 @@ source "arch/arm/cpu/armv8/Kconfig"
 
 source "arch/arm/imx-common/Kconfig"
 
 
 source "arch/arm/imx-common/Kconfig"
 

-source "board/BuR/kwb/Kconfig"
-source "board/BuR/tseries/Kconfig"
+source "board/bosch/shc/Kconfig"
+source "board/BuR/brxre1/Kconfig"
+source "board/BuR/brppt1/Kconfig"

 source "board/CarMediaLab/flea3/Kconfig"
 source "board/Marvell/aspenite/Kconfig"
 source "board/Marvell/gplugd/Kconfig"
 source "board/CarMediaLab/flea3/Kconfig"
 source "board/Marvell/aspenite/Kconfig"
 source "board/Marvell/gplugd/Kconfig"


@@ -814,6 +934,7 @@ source "board/armadeus/apf27/Kconfig"
 source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
 source "board/bluegiga/apx4devkit/Kconfig"
 source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
 source "board/bluegiga/apx4devkit/Kconfig"

+source "board/broadcom/bcm23550_w1d/Kconfig"

 source "board/broadcom/bcm28155_ap/Kconfig"
 source "board/broadcom/bcmcygnus/Kconfig"
 source "board/broadcom/bcmnsp/Kconfig"
 source "board/broadcom/bcm28155_ap/Kconfig"
 source "board/broadcom/bcmcygnus/Kconfig"
 source "board/broadcom/bcmnsp/Kconfig"


@@ -831,6 +952,9 @@ source "board/freescale/ls1021aqds/Kconfig"
 source "board/freescale/ls1043aqds/Kconfig"
 source "board/freescale/ls1021atwr/Kconfig"
 source "board/freescale/ls1043ardb/Kconfig"
 source "board/freescale/ls1043aqds/Kconfig"
 source "board/freescale/ls1021atwr/Kconfig"
 source "board/freescale/ls1043ardb/Kconfig"

+source "board/freescale/ls1012aqds/Kconfig"
+source "board/freescale/ls1012ardb/Kconfig"
+source "board/freescale/ls1012afrdm/Kconfig"

 source "board/freescale/mx23evk/Kconfig"
 source "board/freescale/mx25pdk/Kconfig"
 source "board/freescale/mx28evk/Kconfig"
 source "board/freescale/mx23evk/Kconfig"
 source "board/freescale/mx25pdk/Kconfig"
 source "board/freescale/mx28evk/Kconfig"


@@ -842,6 +966,7 @@ source "board/freescale/mx53ard/Kconfig"
 source "board/freescale/mx53evk/Kconfig"
 source "board/freescale/mx53loco/Kconfig"
 source "board/freescale/mx53smd/Kconfig"
 source "board/freescale/mx53evk/Kconfig"
 source "board/freescale/mx53loco/Kconfig"
 source "board/freescale/mx53smd/Kconfig"

+source "board/freescale/s32v234evb/Kconfig"

 source "board/freescale/vf610twr/Kconfig"
 source "board/gumstix/pepper/Kconfig"
 source "board/h2200/Kconfig"
 source "board/freescale/vf610twr/Kconfig"
 source "board/gumstix/pepper/Kconfig"
 source "board/h2200/Kconfig"