Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[u-boot] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4b5cd57f71539c1182b5559451211009d87290c0..72b0aa78a56a7b779e38dd5328c62b0c9841dd91 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -7,6 +7,10 @@ config SYS_ARCH
 config ARM64
        bool
 
 config ARM64
        bool
 

+config DMA_ADDR_T_64BIT
+       bool
+       default y if ARM64
+

 config HAS_VBAR
         bool
 
 config HAS_VBAR
         bool
 


@@ -60,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


@@ -111,7 +129,7 @@ config KIRKWOOD
        select CPU_ARM926EJS
 
 config ARCH_MVEBU
        select CPU_ARM926EJS
 
 config ARCH_MVEBU

-       bool "Marvell MVEBU family (Armada XP/38x)"
+       bool "Marvell MVEBU family (Armada XP/375/38x)"

        select CPU_V7
        select SUPPORT_SPL
        select OF_CONTROL
        select CPU_V7
        select SUPPORT_SPL
        select OF_CONTROL


@@ -122,6 +140,7 @@ config ARCH_MVEBU
        select DM_SPI
        select DM_SPI_FLASH
        select SPL_DM
        select DM_SPI
        select DM_SPI_FLASH
        select SPL_DM

+       select SPL_DM_SEQ_ALIAS

        select SPL_OF_CONTROL
        select SPL_SIMPLE_BUS
 
        select SPL_OF_CONTROL
        select SPL_SIMPLE_BUS
 


@@ -367,6 +386,7 @@ config TARGET_AM335X_EVM
        select DM
        select DM_SERIAL
        select DM_GPIO
        select DM
        select DM_SERIAL
        select DM_GPIO

+       select TI_I2C_BOARD_DETECT

 
 config TARGET_AM335X_SL50
        bool "Support am335x_sl50"
 
 config TARGET_AM335X_SL50
        bool "Support am335x_sl50"


@@ -375,11 +395,6 @@ config TARGET_AM335X_SL50
        select DM
        select DM_SERIAL
 
        select DM
        select DM_SERIAL
 

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

 config TARGET_BAV335X
        bool "Support bav335x"
        select CPU_V7
 config TARGET_BAV335X
        bool "Support bav335x"
        select CPU_V7


@@ -447,6 +462,14 @@ config ARCH_KEYSTONE
        bool "TI Keystone"
        select CPU_V7
        select SUPPORT_SPL
        bool "TI Keystone"
        select CPU_V7
        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"
 
 config ARCH_MX7
        bool "Freescale MX7"


@@ -499,10 +522,31 @@ 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 ARCH_SNAPDRAGON
+       bool "Qualcomm Snapdragon SoCs"
+       select ARM64
+       select DM
+       select DM_GPIO
+       select DM_SERIAL
+       select SPMI
+       select OF_CONTROL
+       select OF_SEPARATE
+

 config ARCH_SOCFPGA
        bool "Altera SOCFPGA family"
        select CPU_V7
 config ARCH_SOCFPGA
        bool "Altera SOCFPGA family"
        select CPU_V7


@@ -520,6 +564,16 @@ config TARGET_CM_T43
 
 config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
 
 config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"

+       select CMD_BOOTZ
+       select CMD_DHCP
+       select CMD_EXT2
+       select CMD_EXT4
+       select CMD_FAT
+       select CMD_FS_GENERIC
+       select CMD_GPIO
+       select CMD_MII
+       select CMD_MMC if MMC
+       select CMD_PING

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


@@ -527,10 +581,12 @@ config ARCH_SUNXI
        select DM_KEYBOARD
        select DM_SERIAL
        select DM_USB
        select DM_KEYBOARD
        select DM_SERIAL
        select DM_USB

+       select HUSH_PARSER
+       select OF_BOARD_SETUP

        select OF_CONTROL
        select OF_SEPARATE
        select OF_CONTROL
        select OF_SEPARATE

-       select SPL_STACK_R if !MACH_SUN9I
-       select SPL_SYS_MALLOC_SIMPLE if !MACH_SUN9I
+       select SPL_STACK_R if SUPPORT_SPL
+       select SPL_SYS_MALLOC_SIMPLE if SUPPORT_SPL

        select SYS_NS16550
        select USB
        select USB_STORAGE
        select SYS_NS16550
        select USB
        select USB_STORAGE


@@ -557,24 +613,24 @@ config ARCH_ZYNQ
        select CPU_V7
        select SUPPORT_SPL
        select OF_CONTROL
        select CPU_V7
        select SUPPORT_SPL
        select OF_CONTROL

-       select SPL_OF_CONTROL
+       select SPL_OF_CONTROL if SPL

        select DM
        select DM_ETH
        select DM
        select DM_ETH

-       select SPL_DM
+       select DM_GPIO
+       select SPL_DM if SPL

        select DM_MMC
        select DM_SPI
        select DM_SERIAL
        select DM_SPI_FLASH
        select DM_MMC
        select DM_SPI
        select DM_SERIAL
        select DM_SPI_FLASH

-       select SPL_SEPARATE_BSS
+       select SPL_SEPARATE_BSS if SPL

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

-       select DM_ETH
-       select DM_MMC

        select DM_SERIAL
        select DM_SERIAL

+       select SUPPORT_SPL

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


@@ -649,10 +705,38 @@ config TARGET_HIKEY
        select DM
        select DM_GPIO
        select DM_SERIAL
        select DM
        select DM_GPIO
        select DM_SERIAL

+       select OF_CONTROL

          help
          Support for HiKey 96boards platform. It features a HI6220
          SoC, with 8xA53 CPU, mali450 gpu, and 1GB RAM.
 
          help
          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


@@ -682,27 +766,33 @@ config TARGET_H2200
        bool "Support h2200"
        select CPU_PXA
 
        bool "Support h2200"
        select CPU_PXA
 

+config TARGET_ZIPITZ2
+       bool "Support zipitz2"
+       select CPU_PXA
+

 config TARGET_COLIBRI_PXA270
        bool "Support colibri_pxa270"
        select CPU_PXA
 
 config ARCH_UNIPHIER
        bool "Socionext UniPhier SoCs"
 config TARGET_COLIBRI_PXA270
        bool "Support colibri_pxa270"
        select CPU_PXA
 
 config ARCH_UNIPHIER
        bool "Socionext UniPhier SoCs"

-       select CPU_V7
+       select CLK_UNIPHIER

        select SUPPORT_SPL
        select SPL
        select OF_CONTROL
        select SPL_OF_CONTROL
        select DM
        select SPL_DM
        select SUPPORT_SPL
        select SPL
        select OF_CONTROL
        select SPL_OF_CONTROL
        select DM
        select SPL_DM

+       select DM_GPIO

        select DM_SERIAL
        select DM_I2C
        select DM_SERIAL
        select DM_I2C

+       select DM_MMC

        help
          Support for UniPhier SoC family developed by Socionext Inc.
          (formerly, System LSI Business Division of Panasonic Corporation)
 
        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"
+config STM32
+       bool "Support STM32"

        select CPU_V7M
        select DM
        select DM_SERIAL
        select CPU_V7M
        select DM
        select DM_SERIAL


@@ -715,6 +805,11 @@ config ARCH_ROCKCHIP
        select CPU_V7
        select DM
 
        select CPU_V7
        select DM
 

+config TARGET_THUNDERX_88XX
+       bool "Support ThunderX 88xx"
+       select ARM64
+       select OF_CONTROL
+

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


@@ -741,22 +836,24 @@ 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"
 

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

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

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

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


@@ -775,8 +872,6 @@ source "board/BuR/kwb/Kconfig"
 source "board/BuR/tseries/Kconfig"
 source "board/CarMediaLab/flea3/Kconfig"
 source "board/Marvell/aspenite/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/gplugd/Kconfig"
 source "board/armadeus/apf27/Kconfig"
 source "board/armltd/vexpress/Kconfig"
 source "board/Marvell/gplugd/Kconfig"
 source "board/armadeus/apf27/Kconfig"
 source "board/armltd/vexpress/Kconfig"


@@ -785,6 +880,7 @@ source "board/bluegiga/apx4devkit/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"

+source "board/cavium/thunderx/Kconfig"

 source "board/cirrus/edb93xx/Kconfig"
 source "board/compulab/cm_t335/Kconfig"
 source "board/compulab/cm_t43/Kconfig"
 source "board/cirrus/edb93xx/Kconfig"
 source "board/compulab/cm_t335/Kconfig"
 source "board/compulab/cm_t43/Kconfig"


@@ -798,6 +894,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"


@@ -815,7 +914,6 @@ source "board/h2200/Kconfig"
 source "board/hisilicon/hikey/Kconfig"
 source "board/imx31_phycore/Kconfig"
 source "board/isee/igep0033/Kconfig"
 source "board/hisilicon/hikey/Kconfig"
 source "board/imx31_phycore/Kconfig"
 source "board/isee/igep0033/Kconfig"

-source "board/maxbcm/Kconfig"

 source "board/mpl/vcma9/Kconfig"
 source "board/olimex/mx23_olinuxino/Kconfig"
 source "board/phytec/pcm051/Kconfig"
 source "board/mpl/vcma9/Kconfig"
 source "board/olimex/mx23_olinuxino/Kconfig"
 source "board/phytec/pcm051/Kconfig"


@@ -828,13 +926,11 @@ 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/clearfog/Kconfig"

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

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

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


@@ -851,6 +947,7 @@ source "board/technologic/ts4800/Kconfig"
 source "board/vscom/baltos/Kconfig"
 source "board/woodburn/Kconfig"
 source "board/work-microwave/work_92105/Kconfig"
 source "board/vscom/baltos/Kconfig"
 source "board/woodburn/Kconfig"
 source "board/work-microwave/work_92105/Kconfig"

+source "board/zipitz2/Kconfig"

 
 source "arch/arm/Kconfig.debug"
 
 
 source "arch/arm/Kconfig.debug"