Merge git://git.denx.de/u-boot-fsl-qoriq

[people/ms/u-boot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 84cabb8fd8d4cd5ebf86c1396f8c51a43b389949..38ad59058f56d7f9a758d554350a60803ef8f576 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -6,62 +6,74 @@ config SYS_ARCH
 
 config ARM64
        bool
+       select PHYS_64BIT
+       select SYS_CACHE_SHIFT_6
 
 config DMA_ADDR_T_64BIT
        bool
        default y if ARM64
 
 config HAS_VBAR
-        bool
+       bool
 
 config HAS_THUMB2
-        bool
+       bool
 
 config CPU_ARM720T
-        bool
+       bool
+       select SYS_CACHE_SHIFT_5
 
 config CPU_ARM920T
-        bool
+       bool
+       select SYS_CACHE_SHIFT_5
 
 config CPU_ARM926EJS
-        bool
+       bool
+       select SYS_CACHE_SHIFT_5
 
 config CPU_ARM946ES
-        bool
+       bool
+       select SYS_CACHE_SHIFT_5
 
 config CPU_ARM1136
-        bool
+       bool
+       select SYS_CACHE_SHIFT_5
 
 config CPU_ARM1176
-        bool
-        select HAS_VBAR
+       bool
+       select HAS_VBAR
+       select SYS_CACHE_SHIFT_5
 
 config CPU_V7
-        bool
-        select HAS_VBAR
-        select HAS_THUMB2
+       bool
+       select HAS_VBAR
+       select HAS_THUMB2
+       select SYS_CACHE_SHIFT_6
 
 config CPU_V7M
        bool
-        select HAS_THUMB2
+       select HAS_THUMB2
+       select SYS_CACHE_SHIFT_5
 
 config CPU_PXA
-        bool
+       bool
+       select SYS_CACHE_SHIFT_5
 
 config CPU_SA1100
-        bool
+       bool
+       select SYS_CACHE_SHIFT_5
 
 config SYS_CPU
-        default "arm720t" if CPU_ARM720T
-        default "arm920t" if CPU_ARM920T
-        default "arm926ejs" if CPU_ARM926EJS
-        default "arm946es" if CPU_ARM946ES
-        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 "arm720t" if CPU_ARM720T
+       default "arm920t" if CPU_ARM920T
+       default "arm926ejs" if CPU_ARM926EJS
+       default "arm946es" if CPU_ARM946ES
+       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
 
 config SYS_ARM_ARCH
@@ -78,6 +90,21 @@ config SYS_ARM_ARCH
        default 4 if CPU_SA1100
        default 8 if ARM64
 
+config SYS_CACHE_SHIFT_5
+       bool
+
+config SYS_CACHE_SHIFT_6
+       bool
+
+config SYS_CACHE_SHIFT_7
+       bool
+
+config SYS_CACHELINE_SIZE
+       int
+       default 128 if SYS_CACHE_SHIFT_7
+       default 64 if SYS_CACHE_SHIFT_6
+       default 32 if SYS_CACHE_SHIFT_5
+
 config SEMIHOSTING
        bool "support boot from semihosting"
        help
@@ -304,13 +331,13 @@ config TARGET_VEXPRESS_CA9X4
        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
 
-config TARGET_TSERIES
-       bool "Support tseries"
+config TARGET_BRPPT1
+       bool "Support BRPPT1"
        select CPU_V7
        select SUPPORT_SPL
 
@@ -371,9 +398,9 @@ config TARGET_RASTABAN
        select DM_GPIO
 
 config TARGET_ETAMIN
-        bool "Support etamin"
-        select CPU_V7
-        select SUPPORT_SPL
+       bool "Support etamin"
+       select CPU_V7
+       select SUPPORT_SPL
        select DM
        select DM_SERIAL
        select DM_GPIO
@@ -432,6 +459,7 @@ config TARGET_AM335X_SL50
        select CPU_V7
        select SUPPORT_SPL
        select DM
+       select DM_GPIO
        select DM_SERIAL
 
 config TARGET_BAV335X
@@ -553,11 +581,14 @@ config TARGET_MX53SMD
 config OMAP34XX
        bool "OMAP34XX SoC"
        select CPU_V7
+       select SUPPORT_SPL
+       select USE_TINY_PRINTF
 
 config OMAP44XX
        bool "OMAP44XX SoC"
        select CPU_V7
        select SUPPORT_SPL
+       select USE_TINY_PRINTF
 
 config OMAP54XX
        bool "OMAP54XX SoC"
@@ -575,9 +606,10 @@ config AM43XX
          protocols, dual camera support, optional 3D graphics
          and an optional customer programmable secure boot.
 
-config RMOBILE
+config ARCH_RMOBILE
        bool "Renesas ARM SoCs"
-       select CPU_V7
+       select DM
+       select DM_SERIAL
 
 config TARGET_S32V234EVB
        bool "Support s32v234evb"
@@ -610,16 +642,8 @@ config TARGET_CM_T43
 
 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
@@ -627,7 +651,6 @@ config ARCH_SUNXI
        select DM_KEYBOARD
        select DM_SERIAL
        select DM_USB
-       select HUSH_PARSER
        select OF_BOARD_SETUP
        select OF_CONTROL
        select OF_SEPARATE
@@ -637,6 +660,7 @@ config ARCH_SUNXI
        select USB
        select USB_STORAGE
        select USB_KEYBOARD
+       select USE_TINY_PRINTF
 
 config TARGET_TS4800
        bool "Support TS4800"
@@ -665,10 +689,13 @@ config ARCH_ZYNQ
        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_USB if USB
+       select BLK
 
 config ARCH_ZYNQMP
        bool "Support Xilinx ZynqMP Platform"
@@ -677,6 +704,9 @@ config ARCH_ZYNQMP
        select OF_CONTROL
        select DM_SERIAL
        select SUPPORT_SPL
+       select CLK
+       select SPL_CLK
+       select DM_USB if USB
 
 config TEGRA
        bool "NVIDIA Tegra"
@@ -758,6 +788,7 @@ config TARGET_HIKEY
 
 config TARGET_LS1012AQDS
        bool "Support ls1012aqds"
+       select ARCH_LS1012A
        select ARM64
        help
          Support for Freescale LS1012AQDS platform.
@@ -767,6 +798,7 @@ config TARGET_LS1012AQDS
 
 config TARGET_LS1012ARDB
        bool "Support ls1012ardb"
+       select ARCH_LS1012A
        select ARM64
        help
          Support for Freescale LS1012ARDB platform.
@@ -776,6 +808,7 @@ config TARGET_LS1012ARDB
 
 config TARGET_LS1012AFRDM
        bool "Support ls1012afrdm"
+       select ARCH_LS1012A
        select ARM64
        help
          Support for Freescale LS1012AFRDM platform.
@@ -787,13 +820,21 @@ config TARGET_LS1021AQDS
        bool "Support ls1021aqds"
        select CPU_V7
        select SUPPORT_SPL
+       select ARCH_LS1021A
+       select ARCH_SUPPORT_PSCI
+       select LS1_DEEP_SLEEP
+
 config TARGET_LS1021ATWR
        bool "Support ls1021atwr"
        select CPU_V7
        select SUPPORT_SPL
+       select ARCH_LS1021A
+       select ARCH_SUPPORT_PSCI
+       select LS1_DEEP_SLEEP
 
 config TARGET_LS1043AQDS
        bool "Support ls1043aqds"
+       select ARCH_LS1043A
        select ARM64
        select ARMV8_MULTIENTRY
        select SUPPORT_SPL
@@ -802,12 +843,39 @@ config TARGET_LS1043AQDS
 
 config TARGET_LS1043ARDB
        bool "Support ls1043ardb"
+       select ARCH_LS1043A
        select ARM64
        select ARMV8_MULTIENTRY
        select SUPPORT_SPL
        help
          Support for Freescale LS1043ARDB platform.
 
+config TARGET_LS1046AQDS
+       bool "Support ls1046aqds"
+       select ARCH_LS1046A
+       select ARM64
+       select ARMV8_MULTIENTRY
+       select SUPPORT_SPL
+       select DM_SPI_FLASH if DM_SPI
+       help
+         Support for Freescale LS1046AQDS platform.
+         The LS1046A Development System (QDS) is a high-performance
+         development platform that supports the QorIQ LS1046A
+         Layerscape Architecture processor.
+
+config TARGET_LS1046ARDB
+       bool "Support ls1046ardb"
+       select ARCH_LS1046A
+       select ARM64
+       select ARMV8_MULTIENTRY
+       select SUPPORT_SPL
+       select DM_SPI_FLASH if DM_SPI
+       help
+         Support for Freescale LS1046ARDB platform.
+         The LS1046A Reference Design Board (RDB) is a high-performance
+         development platform that supports the QorIQ LS1046A
+         Layerscape Architecture processor.
+
 config TARGET_H2200
        bool "Support h2200"
        select CPU_PXA
@@ -822,17 +890,24 @@ config TARGET_COLIBRI_PXA270
 
 config ARCH_UNIPHIER
        bool "Socionext UniPhier SoCs"
+       select BLK
        select CLK_UNIPHIER
-       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_MMC
+       select DM_SERIAL
+       select DM_USB
+       select OF_CONTROL
+       select OF_LIBFDT
+       select PINCTRL
+       select SPL
+       select SPL_DM
+       select SPL_LIBCOMMON_SUPPORT
+       select SPL_LIBGENERIC_SUPPORT
+       select SPL_OF_CONTROL
+       select SPL_PINCTRL
+       select SUPPORT_SPL
        help
          Support for UniPhier SoC family developed by Socionext Inc.
          (formerly, System LSI Business Division of Panasonic Corporation)
@@ -845,16 +920,26 @@ config STM32
 
 config ARCH_ROCKCHIP
        bool "Support Rockchip SoCs"
-       select SUPPORT_SPL
-       select SPL
        select OF_CONTROL
-       select CPU_V7
+       select BLK
        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
+       select DM_USB if USB
 
 config TARGET_THUNDERX_88XX
        bool "Support ThunderX 88xx"
        select ARM64
        select OF_CONTROL
+       select SYS_CACHE_SHIFT_7
 
 endchoice
 
@@ -876,6 +961,8 @@ source "arch/arm/mach-kirkwood/Kconfig"
 
 source "arch/arm/mach-mvebu/Kconfig"
 
+source "arch/arm/cpu/armv7/ls102xa/Kconfig"
+
 source "arch/arm/cpu/armv7/mx7/Kconfig"
 
 source "arch/arm/cpu/armv7/mx6/Kconfig"
@@ -884,9 +971,11 @@ source "arch/arm/cpu/armv7/mx5/Kconfig"
 
 source "arch/arm/cpu/armv7/omap-common/Kconfig"
 
+source "arch/arm/cpu/armv8/fsl-layerscape/Kconfig"
+
 source "arch/arm/mach-orion5x/Kconfig"
 
-source "arch/arm/cpu/armv7/rmobile/Kconfig"
+source "arch/arm/mach-rmobile/Kconfig"
 
 source "arch/arm/mach-meson/Kconfig"
 
@@ -915,8 +1004,8 @@ source "arch/arm/cpu/armv8/Kconfig"
 source "arch/arm/imx-common/Kconfig"
 
 source "board/bosch/shc/Kconfig"
-source "board/BuR/kwb/Kconfig"
-source "board/BuR/tseries/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"
@@ -941,7 +1030,9 @@ source "board/freescale/ls2080ardb/Kconfig"
 source "board/freescale/ls1021aqds/Kconfig"
 source "board/freescale/ls1043aqds/Kconfig"
 source "board/freescale/ls1021atwr/Kconfig"
+source "board/freescale/ls1046aqds/Kconfig"
 source "board/freescale/ls1043ardb/Kconfig"
+source "board/freescale/ls1046ardb/Kconfig"
 source "board/freescale/ls1012aqds/Kconfig"
 source "board/freescale/ls1012ardb/Kconfig"
 source "board/freescale/ls1012afrdm/Kconfig"