Finish converting CONFIG_SYS_CACHELINE_SIZE to Kconfig

[platform/kernel/u-boot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d692139..3b1e257 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -63,6 +63,12 @@ config LNX_KRNL_IMG_TEXT_OFFSET_BASE
 endif
 endif
 
+config GICV2
+       bool
+
+config GICV3
+       bool
+
 config GIC_V3_ITS
        bool "ARM GICV3 ITS"
        select REGMAP
@@ -332,21 +338,6 @@ 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
-
 choice
        prompt "Select the ARM data write cache policy"
        default SYS_ARM_CACHE_WRITETHROUGH if TARGET_BCMCYGNUS || \
@@ -723,6 +714,7 @@ config ARCH_KEYSTONE
        bool "TI Keystone"
        select CMD_POWEROFF
        select CPU_V7A
+       select DDR_SPD
        select GPIO_EXTRA_HEADER
        select SUPPORT_SPL
        select SYS_ARCH_TIMER
@@ -787,6 +779,7 @@ config ARCH_IMX8
        select ARM64
        select DM
        select GPIO_EXTRA_HEADER
+       select MACH_IMX
        select OF_CONTROL
        select ENABLE_ARM_SOC_BOOT0_HOOK
 
@@ -794,9 +787,11 @@ config ARCH_IMX8M
        bool "NXP i.MX8M platform"
        select ARM64
        select GPIO_EXTRA_HEADER
+       select MACH_IMX
        select SYS_FSL_HAS_SEC if IMX_HAB
        select SYS_FSL_SEC_COMPAT_4
        select SYS_FSL_SEC_LE
+       select SYS_I2C_MXC
        select DM
        select SUPPORT_SPL
        imply CMD_DM
@@ -805,6 +800,7 @@ config ARCH_IMX8ULP
        bool "NXP i.MX8ULP platform"
        select ARM64
        select DM
+       select MACH_IMX
        select OF_CONTROL
        select SUPPORT_SPL
        select GPIO_EXTRA_HEADER
@@ -816,6 +812,7 @@ config ARCH_IMXRT
        select DM
        select DM_SERIAL
        select GPIO_EXTRA_HEADER
+       select MACH_IMX
        select SUPPORT_SPL
        imply CMD_DM
 
@@ -823,6 +820,7 @@ config ARCH_MX23
        bool "NXP i.MX23 family"
        select CPU_ARM926EJS
        select GPIO_EXTRA_HEADER
+       select MACH_IMX
        select PL011_SERIAL
        select SUPPORT_SPL
 
@@ -830,6 +828,7 @@ config ARCH_MX25
        bool "NXP MX25"
        select CPU_ARM926EJS
        select GPIO_EXTRA_HEADER
+       select MACH_IMX
        imply MXC_GPIO
 
 config ARCH_MX28
@@ -837,17 +836,20 @@ config ARCH_MX28
        select CPU_ARM926EJS
        select GPIO_EXTRA_HEADER
        select PL011_SERIAL
+       select MACH_IMX
        select SUPPORT_SPL
 
 config ARCH_MX31
        bool "NXP i.MX31 family"
        select CPU_ARM1136
        select GPIO_EXTRA_HEADER
+       select MACH_IMX
 
 config ARCH_MX7ULP
        bool "NXP MX7ULP"
        select CPU_V7A
        select GPIO_EXTRA_HEADER
+       select MACH_IMX
        select SYS_FSL_HAS_SEC if IMX_HAB
        select SYS_FSL_SEC_COMPAT_4
        select SYS_FSL_SEC_LE
@@ -860,6 +862,7 @@ config ARCH_MX7
        select ARCH_MISC_INIT
        select CPU_V7A
        select GPIO_EXTRA_HEADER
+       select MACH_IMX
        select SYS_FSL_HAS_SEC if IMX_HAB
        select SYS_FSL_SEC_COMPAT_4
        select SYS_FSL_SEC_LE
@@ -871,6 +874,7 @@ config ARCH_MX6
        bool "Freescale MX6"
        select CPU_V7A
        select GPIO_EXTRA_HEADER
+       select MACH_IMX
        select SYS_FSL_HAS_SEC
        select SYS_FSL_SEC_COMPAT_4
        select SYS_FSL_SEC_LE
@@ -887,6 +891,7 @@ config ARCH_MX5
        select BOARD_EARLY_INIT_F
        select CPU_V7A
        select GPIO_EXTRA_HEADER
+       select MACH_IMX
        imply MXC_GPIO
 
 config ARCH_NEXELL
@@ -952,6 +957,7 @@ config ARCH_SOCFPGA
        select CPU_V7A if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
        select DM
        select DM_SERIAL
+       select GICV2
        select GPIO_EXTRA_HEADER
        select ENABLE_ARM_SOC_BOOT0_HOOK if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
        select OF_CONTROL
@@ -1062,8 +1068,10 @@ config ARCH_VERSAL
        select DM_ETH if NET
        select DM_MMC if MMC
        select DM_SERIAL
+       select GICV3
        select GPIO_EXTRA_HEADER
        select OF_CONTROL
+       select SOC_DEVICE
        imply BOARD_LATE_INIT
        imply ENV_VARS_UBOOT_RUNTIME_CONFIG
 
@@ -1071,6 +1079,7 @@ config ARCH_VF610
        bool "Freescale Vybrid"
        select CPU_V7A
        select GPIO_EXTRA_HEADER
+       select MACH_IMX
        select SYS_FSL_ERRATUM_ESDHC111
        imply CMD_MTDPARTS
        imply MTD_RAW_NAND
@@ -1130,6 +1139,7 @@ config ARCH_ZYNQMP
        select DM_SPI if SPI
        select DM_SPI_FLASH if DM_SPI
        select FIRMWARE
+       select GICV2
        select GPIO_EXTRA_HEADER
        select OF_CONTROL
        select SPL_BOARD_INIT if SPL
@@ -1142,6 +1152,7 @@ config ARCH_ZYNQMP
        select SPL_SEPARATE_BSS if SPL
        select SUPPORT_SPL
        select ZYNQMP_IPI
+       select SOC_DEVICE
        imply BOARD_LATE_INIT
        imply CMD_DM
        imply ENV_VARS_UBOOT_RUNTIME_CONFIG
@@ -1878,6 +1889,7 @@ config TARGET_DURIAN
 config TARGET_PRESIDIO_ASIC
        bool "Support Cortina Presidio ASIC Platform"
        select ARM64
+       select GICV2
 
 config TARGET_XENGUEST_ARM64
        bool "Xen guest ARM64"