X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=arch%2Farm%2FKconfig;h=a311215c92bee53b0b6cd274c788bf13a0729c0a;hb=a2c08df3813b6b1ab6fd016a9f5b264c634e6813;hp=5ac94011047388d9bb679319b7f805b1b021e682;hpb=2863a9bfc29092be37f8beee230883367b057065;p=oweals%2Fu-boot.git

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5ac9401104..a311215c92 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -7,62 +7,73 @@ 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
@@ -79,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
@@ -372,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
@@ -433,6 +459,7 @@ config TARGET_AM335X_SL50
 	select CPU_V7
 	select SUPPORT_SPL
 	select DM
+	select DM_GPIO
 	select DM_SERIAL
 
 config TARGET_BAV335X
@@ -579,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"
@@ -789,10 +817,13 @@ config TARGET_LS1021AQDS
 	bool "Support ls1021aqds"
 	select CPU_V7
 	select SUPPORT_SPL
+	select ARCH_SUPPORT_PSCI
+
 config TARGET_LS1021ATWR
 	bool "Support ls1021atwr"
 	select CPU_V7
 	select SUPPORT_SPL
+	select ARCH_SUPPORT_PSCI
 
 config TARGET_LS1043AQDS
 	bool "Support ls1043aqds"
@@ -824,18 +855,22 @@ 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 OF_LIBFDT
 	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_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)
@@ -866,6 +901,7 @@ config TARGET_THUNDERX_88XX
 	bool "Support ThunderX 88xx"
 	select ARM64
 	select OF_CONTROL
+	select SYS_CACHE_SHIFT_7
 
 endchoice
 
@@ -897,7 +933,7 @@ 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-rmobile/Kconfig"
 
 source "arch/arm/mach-meson/Kconfig"