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

[u-boot] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0a05662e7cec6b9f212cd1e2b4a7435d4668495d..42f93b4670d2f29f99635d82c14f26da92bc0095 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -43,6 +43,9 @@ config ARM_ERRATA_621766
 config ARM_ERRATA_716044
        bool
 
+config ARM_ERRATA_725233
+       bool
+
 config ARM_ERRATA_742230
        bool
 
@@ -178,6 +181,25 @@ config SEMIHOSTING
          the hosted environment to call out to the emulator to
          retrieve files from the host machine.
 
+config SYS_THUMB_BUILD
+       bool "Build U-Boot using the Thumb instruction set"
+       depends on !ARM64
+       help
+          Use this flag to build U-Boot using the Thumb instruction set for
+          ARM architectures. Thumb instruction set provides better code
+          density. For ARM architectures that support Thumb2 this flag will
+          result in Thumb2 code generated by GCC.
+
+config SPL_SYS_THUMB_BUILD
+       bool "Build SPL using the Thumb instruction set"
+       default y if SYS_THUMB_BUILD
+       depends on !ARM64
+       help
+          Use this flag to build SPL using the Thumb instruction set for
+          ARM architectures. Thumb instruction set provides better code
+          density. For ARM architectures that support Thumb2 this flag will
+          result in Thumb2 code generated by GCC.
+
 config SYS_L2CACHE_OFF
        bool "L2cache off"
        help
@@ -192,6 +214,10 @@ config ENABLE_ARM_SOC_BOOT0_HOOK
          ARM_SOC_BOOT0_HOOK which contains the required assembler
          preprocessor code.
 
+config ARM_CORTEX_CPU_IS_UP
+       bool
+       default n
+
 config USE_ARCH_MEMCPY
        bool "Use an assembly optimized implementation of memcpy"
        default y
@@ -537,6 +563,14 @@ config TARGET_BCMNSP
        bool "Support bcmnsp"
        select CPU_V7
 
+config TARGET_BCMNS2
+       bool "Support Broadcom Northstar2"
+       select ARM64
+       help
+         Support for Broadcom Northstar 2 SoCs.  NS2 is a quad-core 64-bit
+         ARMv8 Cortex-A57 processors targeting a broad range of networking
+         applications
+
 config ARCH_EXYNOS
        bool "Samsung EXYNOS"
        select DM
@@ -568,6 +602,7 @@ config ARCH_KEYSTONE
        bool "TI Keystone"
        select CPU_V7
        select SUPPORT_SPL
+       select SYS_THUMB_BUILD
        select CMD_POWEROFF
 
 config ARCH_MESON
@@ -577,6 +612,11 @@ config ARCH_MESON
          targeted at media players and tablet computers. We currently
          support the S905 (GXBaby) 64-bit SoC.
 
+config ARCH_MX7ULP
+        bool "NXP MX7ULP"
+        select CPU_V7
+       select ROM_UNIFIED_SECTIONS
+
 config ARCH_MX7
        bool "Freescale MX7"
        select CPU_V7
@@ -592,6 +632,7 @@ config ARCH_MX6
        select SYS_FSL_HAS_SEC if SECURE_BOOT
        select SYS_FSL_SEC_COMPAT_4
        select SYS_FSL_SEC_LE
+       select SYS_THUMB_BUILD if SPL
 
 config ARCH_MX5
        bool "Freescale MX5"
@@ -638,6 +679,7 @@ config OMAP34XX
        select ARM_ERRATA_430973
        select ARM_ERRATA_454179
        select ARM_ERRATA_621766
+       select ARM_ERRATA_725233
        select USE_TINY_PRINTF
        imply SPL_EXT_SUPPORT
        imply SPL_FAT_SUPPORT
@@ -650,6 +692,7 @@ config OMAP34XX
        imply SPL_NAND_SUPPORT
        imply SPL_POWER_SUPPORT
        imply SPL_SERIAL_SUPPORT
+       imply SYS_THUMB_BUILD
 
 config OMAP44XX
        bool "OMAP44XX SoC"
@@ -667,11 +710,13 @@ config OMAP44XX
        imply SPL_NAND_SUPPORT
        imply SPL_POWER_SUPPORT
        imply SPL_SERIAL_SUPPORT
+       imply SYS_THUMB_BUILD
 
 config OMAP54XX
        bool "OMAP54XX SoC"
        select ARCH_OMAP2
        select ARM_ERRATA_798870
+       select SYS_THUMB_BUILD
        imply SPL_DISPLAY_PRINT
        imply SPL_ENV_SUPPORT
        imply SPL_EXT_SUPPORT
@@ -689,6 +734,13 @@ config OMAP54XX
 config AM43XX
        bool "AM43XX SoC"
        select ARCH_OMAP2
+       imply SPL_DM
+       imply SPL_DM_SEQ_ALIAS
+       imply SPL_OF_CONTROL
+       imply SPL_OF_TRANSLATE
+       imply SPL_SEPARATE_BSS
+       imply SPL_SYS_MALLOC_SIMPLE
+       imply SYS_THUMB_BUILD
        help
          Support for AM43xx SOC from Texas Instruments.
          The AM43xx high performance SOC features a Cortex-A9
@@ -699,6 +751,7 @@ config AM43XX
 config AM33XX
        bool "AM33XX SoC"
        select ARCH_OMAP2
+       imply SYS_THUMB_BUILD
        help
          Support for AM335x SOC from Texas Instruments.
          The AM335x high performance SOC features a Cortex-A8
@@ -711,6 +764,7 @@ config ARCH_RMOBILE
        select DM
        select DM_SERIAL
        select BOARD_EARLY_INIT_F
+       imply SYS_THUMB_BUILD
 
 config TARGET_S32V234EVB
        bool "Support s32v234evb"
@@ -740,6 +794,7 @@ config ARCH_SOCFPGA
        select ARCH_EARLY_INIT_R
        select ARCH_MISC_INIT
        select SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
+       select SYS_THUMB_BUILD
 
 config TARGET_CM_T43
        bool "Support cm_t43"
@@ -762,6 +817,7 @@ config ARCH_SUNXI
        select SPL_STACK_R if SUPPORT_SPL
        select SPL_SYS_MALLOC_SIMPLE if SUPPORT_SPL
        select SYS_NS16550
+       select SPL_SYS_THUMB_BUILD if !ARM64
        select USB if DISTRO_DEFAULTS
        select USB_STORAGE if DISTRO_DEFAULTS
        select USB_KEYBOARD if DISTRO_DEFAULTS
@@ -777,30 +833,10 @@ config TARGET_TS4800
        select CPU_V7
        select SYS_FSL_ERRATUM_ESDHC_A001
 
-config TARGET_VF610TWR
-       bool "Support vf610twr"
-       select CPU_V7
-       select SYS_FSL_ERRATUM_ESDHC111
-
-config TARGET_COLIBRI_VF
-       bool "Support Colibri VF50/61"
-       select BOARD_LATE_INIT
-       select CPU_V7
-       select SYS_FSL_ERRATUM_ESDHC111
-
-config TARGET_PCM052
-       bool "Support pcm-052"
-       select CPU_V7
-       select SYS_FSL_ERRATUM_ESDHC111
-       select SYS_FSL_ERRATUM_ESDHC135
-       select SYS_FSL_ERRATUM_ESDHC_A001
-
-config TARGET_BK4R1
-       bool "Support BK4r1"
+config ARCH_VF610
+       bool "Freescale Vybrid"
        select CPU_V7
        select SYS_FSL_ERRATUM_ESDHC111
-       select SYS_FSL_ERRATUM_ESDHC135
-       select SYS_FSL_ERRATUM_ESDHC_A001
 
 config ARCH_ZYNQ
        bool "Xilinx Zynq Platform"
@@ -821,6 +857,9 @@ config ARCH_ZYNQ
        select SPL_SEPARATE_BSS if SPL
        select DM_USB if USB
        select BLK
+       select CLK
+       select SPL_CLK
+       select CLK_ZYNQ
 
 config ARCH_ZYNQMP
        bool "Support Xilinx ZynqMP Platform"
@@ -1088,6 +1127,19 @@ config STM32
        select CPU_V7M
        select DM
        select DM_SERIAL
+       select SYS_THUMB_BUILD
+
+config ARCH_STI
+       bool "Support STMicrolectronics SoCs"
+       select CPU_V7
+       select DM
+       select DM_SERIAL
+       select BLK
+       select DM_MMC
+       select DM_RESET
+       help
+         Support for STMicroelectronics STiH407/10 SoC family.
+         This SoC is used on Linaro 96Board STiH410-B2260
 
 config ARCH_ROCKCHIP
        bool "Support Rockchip SoCs"
@@ -1096,6 +1148,7 @@ config ARCH_ROCKCHIP
        select DM
        select SPL_DM if SPL
        select SYS_MALLOC_F
+       select SYS_THUMB_BUILD if !ARM64
        select SPL_SYS_MALLOC_SIMPLE if SPL
        select DM_GPIO
        select DM_I2C
@@ -1143,6 +1196,8 @@ source "arch/arm/mach-mvebu/Kconfig"
 
 source "arch/arm/cpu/armv7/ls102xa/Kconfig"
 
+source "arch/arm/cpu/armv7/mx7ulp/Kconfig"
+
 source "arch/arm/cpu/armv7/mx7/Kconfig"
 
 source "arch/arm/cpu/armv7/mx6/Kconfig"
@@ -1167,12 +1222,16 @@ source "arch/arm/mach-snapdragon/Kconfig"
 
 source "arch/arm/mach-socfpga/Kconfig"
 
+source "arch/arm/mach-sti/Kconfig"
+
 source "arch/arm/mach-stm32/Kconfig"
 
 source "arch/arm/mach-tegra/Kconfig"
 
 source "arch/arm/mach-uniphier/Kconfig"
 
+source "arch/arm/cpu/armv7/vf610/Kconfig"
+
 source "arch/arm/mach-zynq/Kconfig"
 
 source "arch/arm/cpu/armv7/Kconfig"
@@ -1183,6 +1242,8 @@ source "arch/arm/cpu/armv8/Kconfig"
 
 source "arch/arm/imx-common/Kconfig"
 
+source "board/aries/m28evk/Kconfig"
+source "board/aries/m53evk/Kconfig"
 source "board/bosch/shc/Kconfig"
 source "board/BuR/brxre1/Kconfig"
 source "board/BuR/brppt1/Kconfig"
@@ -1197,13 +1258,12 @@ 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/bcmns2/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/creative/xfi3/Kconfig"
-source "board/denx/m28evk/Kconfig"
-source "board/denx/m53evk/Kconfig"
 source "board/freescale/ls2080a/Kconfig"
 source "board/freescale/ls2080aqds/Kconfig"
 source "board/freescale/ls2080ardb/Kconfig"
@@ -1229,7 +1289,7 @@ 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/gdsys/a38x/Kconfig"
 source "board/grinn/chiliboard/Kconfig"
 source "board/gumstix/pepper/Kconfig"
 source "board/h2200/Kconfig"
@@ -1238,7 +1298,6 @@ source "board/imx31_phycore/Kconfig"
 source "board/isee/igep0033/Kconfig"
 source "board/olimex/mx23_olinuxino/Kconfig"
 source "board/phytec/pcm051/Kconfig"
-source "board/phytec/pcm052/Kconfig"
 source "board/ppcag/bg0900/Kconfig"
 source "board/sandisk/sansa_fuze_plus/Kconfig"
 source "board/schulercontrol/sc_sps_1/Kconfig"
@@ -1262,7 +1321,6 @@ source "board/ti/ti814x/Kconfig"
 source "board/ti/ti816x/Kconfig"
 source "board/timll/devkit3250/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
-source "board/toradex/colibri_vf/Kconfig"
 source "board/technologic/ts4600/Kconfig"
 source "board/technologic/ts4800/Kconfig"
 source "board/vscom/baltos/Kconfig"