Kconfig conversion: CONFIG_SYS_[DI]CACHE_OFF
Subsystems (23)
v3 cover Kconfig conversion: CONFIG_SYS_[DI]CACHE_OFF
This series of patches starts with a couple clean-up patches for various items related to CONFIG_SYS_[DI]CACHE_OFF, then converts these two configuration items to the Kconfig system.
CONFIG_SYS_[DI]CACHE_OFF had been minimally converted to Kconfig, but only for the arc architecture; all other instances were still #define's in include/configs.
In some cases a configuration wants to, for example, disable one or both caches for SPL, but not for full U-Boot (or vice versa). Therefore additional SPL variants needed to be added. This required the configuration checks to be modified to use CONFIG_IS_ENABLED().
This conversion has been verified with tools/moveconfig.py
These patches have been verified with tools/buildman.py
Changes in v3:
- rebase on top of U-Boot master:
b4ee6daad7 Merge tag 'u-boot-imx-20190426' of git://git.denx.de/u-boot-imx
Changes in v2:
- rebased on top of U-Boot master:
3fbd2dce35 Merge branch '2019-04-22-master-imports'
- fixed up configs/xilinx_zynqmp_mini_qspi_defconfig
Trevor Woerner (5):
CONFIG_SYS_[ID]CACHE_OFF: unify the 'any' case CONFIG_SYS_[DI]CACHE_OFF: remove superfluous "1" CONFIG_SYS_[DI]CACHE_OFF: remove commented lines CONFIG_SYS_[DI]CACHE_OFF: convert to Kconfig CONFIG_SPL_SYS_[DI]CACHE_OFF: add
README | 2 -- arch/arc/Kconfig | 22 ++++++++++++++-- arch/arc/lib/start.S | 4 +-- arch/arm/Kconfig | 26 +++++++++++++++++++ arch/arm/cpu/arm11/cpu.c | 12 ++++----- arch/arm/cpu/arm926ejs/cache.c | 12 ++++----- arch/arm/cpu/arm926ejs/cpu.c | 2 +- arch/arm/cpu/arm926ejs/start.S | 4 +-- arch/arm/cpu/armv7/cache_v7.c | 8 +++--- .../cpu/armv7/iproc-common/hwinit-common.c | 2 +- .../arm/cpu/armv7/kona-common/hwinit-common.c | 2 +- arch/arm/cpu/armv7/ls102xa/cpu.c | 4 +-- arch/arm/cpu/armv7/start.S | 4 +-- arch/arm/cpu/armv7/vf610/generic.c | 2 +- arch/arm/cpu/armv7m/cache.c | 8 +++--- arch/arm/cpu/armv8/cache_v8.c | 12 ++++----- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 4 +-- arch/arm/cpu/armv8/s32v234/cpu.c | 2 +- arch/arm/cpu/pxa/cache.c | 6 ++--- arch/arm/cpu/pxa/pxa2xx.c | 4 +-- arch/arm/include/asm/global_data.h | 2 +- arch/arm/lib/cache-cp15.c | 6 ++--- arch/arm/lib/cache.c | 2 +- arch/arm/mach-exynos/soc.c | 2 +- arch/arm/mach-imx/cache.c | 2 +- arch/arm/mach-imx/imx8/cpu.c | 2 +- arch/arm/mach-imx/mx5/soc.c | 2 +- arch/arm/mach-keystone/init.c | 2 +- arch/arm/mach-kirkwood/include/mach/config.h | 6 ----- arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/omap5/sec_entry_cpu1.S | 6 ++--- arch/arm/mach-omap2/sec-common.c | 4 +-- arch/arm/mach-rmobile/cpu_info.c | 2 +- arch/arm/mach-rockchip/rk3036-board.c | 2 +- arch/arm/mach-rockchip/rk3128-board.c | 2 +- arch/arm/mach-rockchip/rk3188-board.c | 2 +- arch/arm/mach-rockchip/rk322x-board.c | 2 +- arch/arm/mach-rockchip/rk3288-board.c | 2 +- arch/arm/mach-rockchip/rv1108/rv1108.c | 2 +- arch/arm/mach-s5pc1xx/cache.c | 2 +- arch/arm/mach-socfpga/misc.c | 4 +-- arch/arm/mach-sunxi/board.c | 2 +- arch/arm/mach-tegra/board.c | 2 +- arch/arm/mach-zynq/cpu.c | 2 +- arch/nds32/Kconfig | 26 +++++++++++++++++++ arch/nds32/cpu/n1213/start.S | 8 +++--- arch/nds32/lib/cache.c | 6 ++--- arch/riscv/Kconfig | 26 +++++++++++++++++++ arch/riscv/cpu/ax25/cache.c | 8 +++--- arch/xtensa/Kconfig | 26 +++++++++++++++++++ arch/xtensa/cpu/start.S | 8 +++--- board/st/stih410-b2260/board.c | 2 +- cmd/bdinfo.c | 2 +- common/board_f.c | 2 +- common/lcd.c | 2 +- configs/SBx81LIFKW_defconfig | 1 + configs/SBx81LIFXCAT_defconfig | 1 + configs/armadillo-800eva_defconfig | 1 + configs/bcm23550_w1d_defconfig | 2 ++ configs/bitmain_antminer_s9_defconfig | 1 + configs/colibri_pxa270_defconfig | 1 + configs/d2net_v2_defconfig | 1 + configs/devkit3250_defconfig | 2 ++ configs/dns325_defconfig | 1 + configs/dockstar_defconfig | 1 + configs/dreamplug_defconfig | 1 + configs/ds109_defconfig | 1 + configs/evb-ast2500_defconfig | 1 + configs/flea3_defconfig | 1 + configs/goflexhome_defconfig | 1 + configs/gplugd_defconfig | 1 + configs/guruplug_defconfig | 1 + configs/highbank_defconfig | 1 + configs/ib62x0_defconfig | 1 + configs/iconnect_defconfig | 1 + configs/imx8mq_evk_defconfig | 2 ++ configs/imx8qxp_mek_defconfig | 2 ++ configs/inetspace_v2_defconfig | 1 + configs/k2e_evm_defconfig | 1 + configs/k2e_hs_evm_defconfig | 1 + configs/k2g_evm_defconfig | 1 + configs/k2g_hs_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + configs/k2hk_hs_evm_defconfig | 1 + configs/k2l_evm_defconfig | 1 + configs/k2l_hs_evm_defconfig | 1 + configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/km_kirkwood_pci_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmnusa_defconfig | 1 + configs/kmsugp1_defconfig | 1 + configs/kmsuv31_defconfig | 1 + configs/lschlv2_defconfig | 1 + configs/lsxhl_defconfig | 1 + configs/mgcoge3un_defconfig | 1 + configs/nas220_defconfig | 1 + configs/net2big_v2_defconfig | 1 + configs/netspace_lite_v2_defconfig | 1 + configs/netspace_max_v2_defconfig | 1 + configs/netspace_mini_v2_defconfig | 1 + configs/netspace_v2_defconfig | 1 + configs/nsa310s_defconfig | 1 + configs/openrd_base_defconfig | 1 + configs/openrd_client_defconfig | 1 + configs/openrd_ultimate_defconfig | 1 + configs/origen_defconfig | 1 + configs/pogo_e02_defconfig | 1 + configs/portl2_defconfig | 1 + configs/sheevaplug_defconfig | 1 + configs/smartweb_defconfig | 2 ++ configs/stv0991_defconfig | 1 + configs/syzygy_hub_defconfig | 1 + configs/taurus_defconfig | 2 ++ configs/topic_miami_defconfig | 1 + configs/topic_miamilite_defconfig | 1 + configs/topic_miamiplus_defconfig | 1 + configs/woodburn_defconfig | 1 + configs/woodburn_sd_defconfig | 1 + configs/work_92105_defconfig | 2 ++ configs/xilinx_versal_mini_defconfig | 1 + configs/xilinx_versal_mini_emmc0_defconfig | 1 + configs/xilinx_versal_mini_emmc1_defconfig | 1 + configs/xilinx_zynqmp_mini_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_defconfig | 1 + configs/xilinx_zynqmp_mini_qspi_defconfig | 1 + configs/zynq_cse_nand_defconfig | 3 +++ configs/zynq_cse_nor_defconfig | 3 +++ configs/zynq_cse_qspi_defconfig | 3 +++ drivers/dma/apbh_dma.c | 2 +- drivers/mtd/nand/raw/mxs_nand.c | 2 +- drivers/net/dwc_eth_qos.c | 2 +- drivers/net/rtl8169.c | 2 +- drivers/net/sh_eth.c | 3 ++- drivers/video/video-uclass.c | 2 +- include/configs/armadillo-800eva.h | 1 - include/configs/aspeed-common.h | 3 --- include/configs/bcm23550_w1d.h | 2 -- include/configs/colibri_pxa270.h | 3 --- include/configs/devkit3250.h | 2 -- include/configs/flea3.h | 2 -- include/configs/gplugd.h | 3 --- include/configs/highbank.h | 2 -- include/configs/imx8mq_evk.h | 2 -- include/configs/imx8qxp_mek.h | 2 -- include/configs/mx7ulp_evk.h | 2 +- include/configs/origen.h | 2 -- include/configs/smartweb.h | 5 ---- include/configs/stv0991.h | 1 - include/configs/taurus.h | 4 --- include/configs/ti_armv7_keystone2.h | 1 - include/configs/uniphier.h | 4 --- include/configs/woodburn_common.h | 2 -- include/configs/work_92105.h | 2 -- include/configs/xilinx_versal_mini.h | 3 --- include/configs/xilinx_zynqmp_mini_emmc.h | 1 - include/configs/xilinx_zynqmp_mini_nand.h | 1 - include/configs/xilinx_zynqmp_mini_qspi.h | 1 - include/configs/zynq-common.h | 5 ---- include/configs/zynq_cse.h | 2 -- 162 files changed, 315 insertions(+), 167 deletions(-)
Signature · 1 line
2.21.0.rc2
PATCH v3 1/5 CONFIG_SYS_[ID]CACHE_OFF: unify the 'any' case
According to De Morgan's Law[1]:
!(A && B) = !A || !B !(A || B) = !A && !B
There are 5 places in the code where we find:
#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF)) and 4 places in the code where we find: #if (!defined(CONFIG_SYS_ICACHE_OFF) || !defined(CONFIG_SYS_DCACHE_OFF))
In words, the construct:
!defined(CONFIG_SYS_[DI]CACHE_OFF)
means:
"is the [DI]CACHE on?"
and the construct:
defined(CONFIG_SYS_[DI]CACHE_OFF)
means:
"is the [DI]CACHE off?"
Therefore
!(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
means:
"the opposite of 'are they both off?'"
in other words:
"are either or both on?"
and:
(!defined(CONFIG_SYS_ICACHE_OFF) || !defined(CONFIG_SYS_DCACHE_OFF)
means:
"are either or both on?"
As a result, I've converted the 4 instances of '(!A || !B)' to '!(A && B)' for consistency.
[1] https://en.wikipedia.org/wiki/De_Morgan%27s_laws
---
Changes in v3: None
Changes in v2: None
arch/arm/cpu/arm11/cpu.c | 2 +- arch/nds32/cpu/n1213/start.S | 2 +- arch/nds32/lib/cache.c | 2 +- arch/xtensa/cpu/start.S | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-)
arch/arm/cpu/arm11/cpu.c +1 -1
@@ -97,7 +97,7 @@ void flush_dcache_all(void) }#endif /* #ifndef CONFIG_SYS_DCACHE_OFF */ -#if !defined(CONFIG_SYS_ICACHE_OFF ) || !defined(CONFIG_SYS_DCACHE_OFF ) +#if !(defined(CONFIG_SYS_ICACHE_OFF ) && defined(CONFIG_SYS_DCACHE_OFF ))void enable_caches (void ) {#ifndef CONFIG_SYS_ICACHE_OFF
arch/nds32/cpu/n1213/start.S +1 -1
@@ -129,7 +129,7 @@ set_ivb: mfsr $r1, $mr8 and $r1, $r1, $r0 mtsr $r1, $mr8 -#if (!defined(CONFIG_SYS_ICACHE_OFF) || !defined(CONFIG_SYS_DCACHE_OFF)) +#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF)) /* * MMU_CTL NTC0 Cacheable/Write-Back */
arch/nds32/lib/cache.c +1 -1
@@ -6,7 +6,7 @@*/ #include <common.h> -#if (!defined(CONFIG_SYS_ICACHE_OFF ) || !defined(CONFIG_SYS_DCACHE_OFF )) +#if !(defined(CONFIG_SYS_ICACHE_OFF ) && defined(CONFIG_SYS_DCACHE_OFF ))static inline unsigned long CACHE_SET (unsigned char cache) {if (cache ==ICACHE )
arch/xtensa/cpu/start.S +1 -2
@@ -164,8 +164,7 @@ _start: * enable data/instruction cache for relocated image. */ #if XCHAL_HAVE_SPANNING_WAY && \ - (!defined(CONFIG_SYS_DCACHE_OFF) || \ - !defined(CONFIG_SYS_ICACHE_OFF)) + !(defined(CONFIG_SYS_DCACHE_OFF) && defined(CONFIG_SYS_ICACHE_OFF)) srli a7, a4, 29 slli a7, a7, 29 addi a7, a7, XCHAL_SPANNING_WAY
Signature · 1 line
2.21.0.rc2
PATCH v3 1/5 CONFIG_SYS_[ID]CACHE_OFF: unify the 'any' case
Quoted 29 lines · Trevor Woerner
According to De Morgan's Law[1]:
!(A && B) = !A || !B !(A || B) = !A && !BThere are 5 places in the code where we find:
#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF)) and 4 places in the code where we find: #if (!defined(CONFIG_SYS_ICACHE_OFF) || !defined(CONFIG_SYS_DCACHE_OFF))In words, the construct:
!defined(CONFIG_SYS_[DI]CACHE_OFF)
means:
"is the [DI]CACHE on?"
and the construct:
defined(CONFIG_SYS_[DI]CACHE_OFF)
means:
"is the [DI]CACHE off?"Therefore
!(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))means:
"the opposite of 'are they both off?'"
in other words:
"are either or both on?"
and:(!defined(CONFIG_SYS_ICACHE_OFF) || !defined(CONFIG_SYS_DCACHE_OFF)means:
"are either or both on?"
Quoted 6 lines
As a result, I've converted the 4 instances of '(!A || !B)' to '!(A && B)' for consistency.
[1] https://en.wikipedia.org/wiki/De_Morgan%27s_laws
Signed-off-by Trevor Woerner <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190519/f3cb3005/attachment.sig>
PATCH v3 2/5 CONFIG_SYS_[DI]CACHE_OFF: remove superfluous "1"
In reply to Trevor WoernerThis config is the only config that uses:
#define CONFIG_SYS_DCACHE_OFF 1
in its #define.
Remove the superfluous "1" so this cache #define is like all the others.
---
Changes in v3: None
Changes in v2: None
include/configs/origen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/origen.h +1 -1
@@ -14,7 +14,7 @@#define CONFIG_EXYNOS4210 1/* which is a EXYNOS4210 SoC */ #define CONFIG_ORIGEN 1/* working with ORIGEN*/ -#define CONFIG_SYS_DCACHE_OFF 1 +#define CONFIG_SYS_DCACHE_OFF /* ORIGEN has 4 bank of DRAM */ #define CONFIG_SYS_SDRAM_BASE 0x40000000
Signature · 1 line
2.21.0.rc2
PATCH v3 2/5 CONFIG_SYS_[DI]CACHE_OFF: remove superfluous "1"
Quoted 7 lines · Trevor Woerner
This config is the only config that uses:
#define CONFIG_SYS_DCACHE_OFF 1in its #define.
Remove the superfluous "1" so this cache #define is like all the others.
Signed-off-by Trevor Woerner <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190519/c47377e6/attachment.sig>
PATCH v3 3/5 CONFIG_SYS_[DI]CACHE_OFF: remove commented lines
In reply to Trevor WoernerEventually these configuration items will be converted to Kconfig, therefore there's little point in leaving commented-out versions of them in include/configs.
---
Changes in v3: None
Changes in v2: None
include/configs/uniphier.h | 4 ---- include/configs/xilinx_versal_mini.h | 1 - 2 files changed, 5 deletions(-)
include/configs/uniphier.h +0 -4
@@ -45,10 +45,6 @@* MMU and Cache Setting *----------------------------------------------------------------------*/ -/* Comment out the following to enable L1 cache */ -/* #define CONFIG_SYS_ICACHE_OFF */ -/* #define CONFIG_SYS_DCACHE_OFF */ -#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024)#define CONFIG_TIMESTAMP
include/configs/xilinx_versal_mini.h +0 -1
@@ -10,7 +10,6 @@#ifndef __CONFIG_VERSAL_MINI_H#define __CONFIG_VERSAL_MINI_H -/* #define CONFIG_SYS_DCACHE_OFF */ #define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_MEMTEST_SCRATCH 0xfffc0000
Signature · 1 line
2.21.0.rc2
PATCH v3 3/5 CONFIG_SYS_[DI]CACHE_OFF: remove commented lines
Quoted 5 lines · Trevor Woerner
Eventually these configuration items will be converted to
Kconfig, therefore there's little point in leaving commented-out versions of them ininclude/configs.Signed-off-by Trevor Woerner <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190519/11badc1b/attachment.sig>
PATCH v3 4/5 CONFIG_SYS_[DI]CACHE_OFF: convert to Kconfig
In reply to Trevor WoernerCONFIG_SYS_[DI]CACHE_OFF had been partially converted to Kconfig parameters; only for the ARC architecture. This patch turns these two parameters into Kconfig items everywhere else they are found.
All of the include/configs/* and defconfig changes in this patch are for arm machines only. The Kconfig changes for arc, nds32, riscv, and xtensa have been included since these symbols are found in code under arch/{arc,nds32,riscv,xtensa}, however, no currently-defined include/configs/* or defconfigs for these architectures exist which include these symbols.
These results have been confirmed with tools/moveconfig.py.
---
Changes in v3:
- rebase on top of U-Boot master:
b4ee6daad7 Merge tag 'u-boot-imx-20190426' of git://git.denx.de/u-boot-imx
Changes in v2:
- rebased on top of U-Boot master:
3fbd2dce35 Merge branch '2019-04-22-master-imports'
- fixed up configs/xilinx_zynqmp_mini_qspi_defconfig
README | 2 -- arch/arc/Kconfig | 8 ++++++-- arch/arm/Kconfig | 12 ++++++++++++ arch/arm/mach-kirkwood/include/mach/config.h | 6 ------ arch/nds32/Kconfig | 12 ++++++++++++ arch/riscv/Kconfig | 12 ++++++++++++ arch/xtensa/Kconfig | 12 ++++++++++++ configs/SBx81LIFKW_defconfig | 1 + configs/SBx81LIFXCAT_defconfig | 1 + configs/armadillo-800eva_defconfig | 1 + configs/bcm23550_w1d_defconfig | 2 ++ configs/colibri_pxa270_defconfig | 1 + configs/d2net_v2_defconfig | 1 + configs/devkit3250_defconfig | 2 ++ configs/dns325_defconfig | 1 + configs/dockstar_defconfig | 1 + configs/dreamplug_defconfig | 1 + configs/ds109_defconfig | 1 + configs/evb-ast2500_defconfig | 1 + configs/flea3_defconfig | 1 + configs/goflexhome_defconfig | 1 + configs/gplugd_defconfig | 1 + configs/guruplug_defconfig | 1 + configs/highbank_defconfig | 1 + configs/ib62x0_defconfig | 1 + configs/iconnect_defconfig | 1 + configs/inetspace_v2_defconfig | 1 + configs/k2e_evm_defconfig | 1 + configs/k2e_hs_evm_defconfig | 1 + configs/k2g_evm_defconfig | 1 + configs/k2g_hs_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + configs/k2hk_hs_evm_defconfig | 1 + configs/k2l_evm_defconfig | 1 + configs/k2l_hs_evm_defconfig | 1 + configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/km_kirkwood_pci_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmnusa_defconfig | 1 + configs/kmsugp1_defconfig | 1 + configs/kmsuv31_defconfig | 1 + configs/lschlv2_defconfig | 1 + configs/lsxhl_defconfig | 1 + configs/mgcoge3un_defconfig | 1 + configs/nas220_defconfig | 1 + configs/net2big_v2_defconfig | 1 + configs/netspace_lite_v2_defconfig | 1 + configs/netspace_max_v2_defconfig | 1 + configs/netspace_mini_v2_defconfig | 1 + configs/netspace_v2_defconfig | 1 + configs/nsa310s_defconfig | 1 + configs/openrd_base_defconfig | 1 + configs/openrd_client_defconfig | 1 + configs/openrd_ultimate_defconfig | 1 + configs/origen_defconfig | 1 + configs/pogo_e02_defconfig | 1 + configs/portl2_defconfig | 1 + configs/sheevaplug_defconfig | 1 + configs/stv0991_defconfig | 1 + configs/woodburn_defconfig | 1 + configs/woodburn_sd_defconfig | 1 + configs/work_92105_defconfig | 2 ++ configs/xilinx_versal_mini_defconfig | 1 + configs/xilinx_versal_mini_emmc0_defconfig | 1 + configs/xilinx_versal_mini_emmc1_defconfig | 1 + configs/xilinx_zynqmp_mini_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_defconfig | 1 + configs/xilinx_zynqmp_mini_qspi_defconfig | 1 + configs/zynq_cse_nand_defconfig | 2 ++ configs/zynq_cse_nor_defconfig | 2 ++ configs/zynq_cse_qspi_defconfig | 2 ++ include/configs/armadillo-800eva.h | 1 - include/configs/aspeed-common.h | 3 --- include/configs/bcm23550_w1d.h | 2 -- include/configs/colibri_pxa270.h | 3 --- include/configs/devkit3250.h | 2 -- include/configs/flea3.h | 2 -- include/configs/gplugd.h | 3 --- include/configs/highbank.h | 2 -- include/configs/origen.h | 2 -- include/configs/stv0991.h | 1 - include/configs/ti_armv7_keystone2.h | 1 - include/configs/woodburn_common.h | 2 -- include/configs/work_92105.h | 2 -- include/configs/xilinx_versal_mini.h | 2 -- include/configs/xilinx_zynqmp_mini_emmc.h | 1 - include/configs/xilinx_zynqmp_mini_nand.h | 1 - include/configs/xilinx_zynqmp_mini_qspi.h | 1 - include/configs/zynq_cse.h | 2 -- 92 files changed, 127 insertions(+), 43 deletions(-)
README +0 -2
@@ -634,8 +634,6 @@ The following options need to be configured: the defaults discussed just above. - Cache Configuration: - CONFIG_SYS_ICACHE_OFF - Do not enable instruction cache in U-Boot - CONFIG_SYS_DCACHE_OFF - Do not enable data cache in U-Boot CONFIG_SYS_L2CACHE_OFF- Do not enable L2 cache in U-Boot - Cache Configuration for ARM:
arch/arc/Kconfig +6 -2
@@ -109,12 +109,16 @@ config CPU_BIG_ENDIAN Build kernel for Big Endian Mode of ARC CPU config SYS_ICACHE_OFF - bool "Do not use Instruction Cache" + bool "Do not enable icache" default n + help + Do not enable instruction cache in U-Boot. config SYS_DCACHE_OFF - bool "Do not use Data Cache" + bool "Do not enable dcache" default n + help + Do not enable data cache in U-Boot. menuconfig ARC_DBG bool "ARC debugging"
arch/arm/Kconfig +12 -0
@@ -74,6 +74,18 @@ config ARM_ASM_UNIFIED config THUMB2_KERNEL bool +config SYS_ICACHE_OFF + bool "Do not enable icache" + default n + help + Do not enable instruction cache in U-Boot. + +config SYS_DCACHE_OFF + bool "Do not enable dcache" + default n + help + Do not enable data cache in U-Boot. + config SYS_ARM_CACHE_CP15 bool "CP15 based cache enabling support" help
arch/arm/mach-kirkwood/include/mach/config.h +0 -6
@@ -26,12 +26,6 @@#define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */ #define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */ #define CONFIG_KIRKWOOD_PCIE_INIT /* Enable PCIE Port0 for kernel */ -/* -* Disable the dcache. Currently the network driver (mvgbe.c) and USB -* EHCI driver (ehci-marvell.c) and possibly others rely on the data -* cache being disabled. -*/ -#define CONFIG_SYS_DCACHE_OFF /* * By default kwbimage.cfg from board specific folder is used
arch/nds32/Kconfig +12 -0
@@ -16,6 +16,18 @@ config TARGET_ADP_AE3XX endchoice +config SYS_ICACHE_OFF + bool "Do not enable icache" + default n + help + Do not enable instruction cache in U-Boot. + +config SYS_DCACHE_OFF + bool "Do not enable dcache" + default n + help + Do not enable data cache in U-Boot. + source "board/AndesTech/adp-ag101p/Kconfig" source "board/AndesTech/adp-ae3xx/Kconfig"
arch/riscv/Kconfig +12 -0
@@ -19,6 +19,18 @@ config TARGET_SIFIVE_FU540 endchoice +config SYS_ICACHE_OFF + bool "Do not enable icache" + default n + help + Do not enable instruction cache in U-Boot. + +config SYS_DCACHE_OFF + bool "Do not enable dcache" + default n + help + Do not enable data cache in U-Boot. + # board-specific options below source "board/AndesTech/ax25-ae350/Kconfig" source "board/emulation/qemu-riscv/Kconfig"
arch/xtensa/Kconfig +12 -0
@@ -16,6 +16,18 @@ config TARGET_XTFPGA endchoice +config SYS_ICACHE_OFF + bool "Do not enable icache" + default n + help + Do not enable instruction cache in U-Boot. + +config SYS_DCACHE_OFF + bool "Do not enable dcache" + default n + help + Do not enable data cache in U-Boot. + source "board/cadence/xtfpga/Kconfig" endmenu
configs/SBx81LIFKW_defconfig +1 -0
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y CONFIG_SYS_TEXT_BASE=0x00600000 CONFIG_TARGET_SBx81LIFKW=y CONFIG_IDENT_STRING="\nSBx81LIFKW" +CONFIG_SYS_DCACHE_OFF=y # CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_SILENT_CONSOLE=y
configs/SBx81LIFXCAT_defconfig +1 -0
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y CONFIG_SYS_TEXT_BASE=0x00600000 CONFIG_TARGET_SBx81LIFXCAT=y CONFIG_IDENT_STRING="\nSBx81LIFXCAT" +CONFIG_SYS_DCACHE_OFF=y # CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_SILENT_CONSOLE=y
configs/armadillo-800eva_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_ARCH_RMOBILE_BOARD_STRING="Armadillo-800EVA Board" CONFIG_R8A7740=y CONFIG_TARGET_ARMADILLO_800EVA=y CONFIG_NR_DRAM_BANKS=1 +CONFIG_SYS_DCACHE_OFF=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y # CONFIG_CMDLINE_EDITING is not set
configs/bcm23550_w1d_defconfig +2 -0
@@ -3,6 +3,8 @@ CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y CONFIG_TARGET_BCM23550_W1D=y CONFIG_SYS_TEXT_BASE=0x9f000000 CONFIG_NR_DRAM_BANKS=1 +CONFIG_SYS_ICACHE_OFF=y +CONFIG_SYS_DCACHE_OFF=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_MISC_INIT_R=y CONFIG_VERSION_VARIABLE=y
configs/colibri_pxa270_defconfig +1 -0
@@ -3,6 +3,7 @@ CONFIG_TARGET_COLIBRI_PXA270=y CONFIG_SYS_TEXT_BASE=0x0 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_VARS_UBOOT_CONFIG=y +CONFIG_SYS_DCACHE_OFF=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=tty0 console=ttyS0,115200" # CONFIG_DISPLAY_BOARDINFO is not set
configs/d2net_v2_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_NET2BIG_V2=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING=" D2 v2" +CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/devkit3250_defconfig +2 -0
@@ -6,6 +6,8 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SPL=y +CONFIG_SYS_ICACHE_OFF=y +CONFIG_SYS_DCACHE_OFF=y CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200n8"
configs/dns325_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_DNS325=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING="\nD-Link DNS-325" +CONFIG_SYS_DCACHE_OFF=y # CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_CONSOLE_MUX=y
configs/dockstar_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_DOCKSTAR=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING="\nSeagate FreeAgent DockStar" +CONFIG_SYS_DCACHE_OFF=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="DockStar> "
configs/dreamplug_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_DREAMPLUG=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING="\nMarvell-DreamPlug" +CONFIG_SYS_DCACHE_OFF=y # CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set
configs/ds109_defconfig +1 -0
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_DS109=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_SYS_DCACHE_OFF=y # CONFIG_SYS_MALLOC_F is not set CONFIG_HUSH_PARSER=y # CONFIG_CMD_FLASH is not set
configs/evb-ast2500_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_ASPEED_AST2500=y CONFIG_TARGET_EVB_AST2500=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=1 +CONFIG_SYS_DCACHE_OFF=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS4,115200n8 root=/dev/ram rw" CONFIG_PRE_CONSOLE_BUFFER=y
configs/flea3_defconfig +1 -0
@@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_FLEA3=y CONFIG_SYS_TEXT_BASE=0xA0000000 CONFIG_NR_DRAM_BANKS=1 +CONFIG_SYS_DCACHE_OFF=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=3
configs/goflexhome_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_GOFLEXHOME=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING="\nSeagate GoFlex Home" +CONFIG_SYS_DCACHE_OFF=y # CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_CONSOLE_MUX=y
configs/gplugd_defconfig +1 -0
@@ -3,6 +3,7 @@ CONFIG_TARGET_GPLUGD=y CONFIG_SYS_TEXT_BASE=0x00f00000 CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING="\nMarvell-gplugD" +CONFIG_SYS_DCACHE_OFF=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y
configs/guruplug_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_GURUPLUG=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING="\nMarvell-GuruPlug" +CONFIG_SYS_DCACHE_OFF=y # CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set
configs/highbank_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_ARCH_HIGHBANK=y CONFIG_SYS_TEXT_BASE=0x00008000 CONFIG_NR_DRAM_BANKS=0 CONFIG_DISTRO_DEFAULTS=y +CONFIG_SYS_DCACHE_OFF=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y # CONFIG_USE_BOOTCOMMAND is not set
configs/ib62x0_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_IB62X0=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING=" RaidSonic ICY BOX IB-NAS62x0" +CONFIG_SYS_DCACHE_OFF=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y
configs/iconnect_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_ICONNECT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING=" Iomega iConnect" +CONFIG_SYS_DCACHE_OFF=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="iconnect => "
configs/inetspace_v2_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_NETSPACE_V2=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING=" IS v2" +CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/k2e_evm_defconfig +1 -0
@@ -8,6 +8,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_K2E_EVM=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_SYS_DCACHE_OFF=y CONFIG_SPL=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y
configs/k2e_hs_evm_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0xC000060 CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TARGET_K2E_EVM=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_SYS_DCACHE_OFF=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_OF_BOARD_SETUP=y
configs/k2g_evm_defconfig +1 -0
@@ -8,6 +8,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_K2G_EVM=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_SYS_DCACHE_OFF=y CONFIG_SPL=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y
configs/k2g_hs_evm_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0xC000060 CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TARGET_K2G_EVM=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_SYS_DCACHE_OFF=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_OF_BOARD_SETUP=y
configs/k2hk_evm_defconfig +1 -0
@@ -8,6 +8,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_K2HK_EVM=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_SYS_DCACHE_OFF=y CONFIG_SPL=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y
configs/k2hk_hs_evm_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0xC000060 CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TARGET_K2HK_EVM=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_SYS_DCACHE_OFF=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_OF_BOARD_SETUP=y
configs/k2l_evm_defconfig +1 -0
@@ -8,6 +8,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_K2L_EVM=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_SYS_DCACHE_OFF=y CONFIG_SPL=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y
configs/k2l_hs_evm_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0xC000060 CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TARGET_K2L_EVM=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_SYS_DCACHE_OFF=y CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y
configs/km_kirkwood_128m16_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_IDENT_STRING="\nKeymile Kirkwood 128M16" CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16" +CONFIG_SYS_DCACHE_OFF=y CONFIG_MISC_INIT_R=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set
configs/km_kirkwood_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_IDENT_STRING="\nKeymile Kirkwood" CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD" +CONFIG_SYS_DCACHE_OFF=y CONFIG_MISC_INIT_R=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set
configs/km_kirkwood_pci_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_IDENT_STRING="\nKeymile Kirkwood PCI" CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI" +CONFIG_SYS_DCACHE_OFF=y CONFIG_MISC_INIT_R=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set
configs/kmcoge5un_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_IDENT_STRING="\nKeymile COGE5UN" CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN" +CONFIG_SYS_DCACHE_OFF=y CONFIG_MISC_INIT_R=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set
configs/kmnusa_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_IDENT_STRING="\nKeymile NUSA" CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA" +CONFIG_SYS_DCACHE_OFF=y CONFIG_MISC_INIT_R=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set
configs/kmsugp1_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_IDENT_STRING="\nKeymile SUGP1" CONFIG_SYS_EXTRA_OPTIONS="KM_SUGP1" +CONFIG_SYS_DCACHE_OFF=y CONFIG_MISC_INIT_R=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set
configs/kmsuv31_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_IDENT_STRING="\nKeymile SUV31" CONFIG_SYS_EXTRA_OPTIONS="KM_SUV31" +CONFIG_SYS_DCACHE_OFF=y CONFIG_MISC_INIT_R=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set
configs/lschlv2_defconfig +1 -0
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_LSXL=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_SYS_DCACHE_OFF=y CONFIG_IDENT_STRING=" LS-CHLv2" CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="LSCHLV2"
configs/lsxhl_defconfig +1 -0
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_LSXL=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_SYS_DCACHE_OFF=y CONFIG_IDENT_STRING=" LS-XHL" CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="LSXHL"
configs/mgcoge3un_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_IDENT_STRING="\nKeymile COGE3UN" CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN" +CONFIG_SYS_DCACHE_OFF=y CONFIG_MISC_INIT_R=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set
configs/nas220_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_NAS220=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING="\nNAS 220" +CONFIG_SYS_DCACHE_OFF=y # CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set
configs/net2big_v2_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_NET2BIG_V2=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING=" 2Big v2" +CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/netspace_lite_v2_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_NETSPACE_V2=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING=" NS v2 Lite" +CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/netspace_max_v2_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_NETSPACE_V2=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING=" NS Max v2" +CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/netspace_mini_v2_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_NETSPACE_V2=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING=" NS v2 Mini" +CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/netspace_v2_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_NETSPACE_V2=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING=" NS v2" +CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/nsa310s_defconfig +1 -0
@@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_NSA310S=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_SYS_DCACHE_OFF=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y
configs/openrd_base_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_OPENRD=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING="\nOpenRD-Base" +CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_BASE" CONFIG_BOOTDELAY=3 CONFIG_LOGLEVEL=2
configs/openrd_client_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_OPENRD=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING="\nOpenRD-Client" +CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_CLIENT" CONFIG_BOOTDELAY=3 CONFIG_LOGLEVEL=2
configs/openrd_ultimate_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_OPENRD=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING="\nOpenRD-Ultimate" +CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_ULTIMATE" CONFIG_BOOTDELAY=3 CONFIG_LOGLEVEL=2
configs/origen_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x43E00000 CONFIG_ARCH_EXYNOS4=y CONFIG_TARGET_ORIGEN=y CONFIG_SPL=y +CONFIG_SYS_DCACHE_OFF=y CONFIG_IDENT_STRING=" for ORIGEN" CONFIG_DISTRO_DEFAULTS=y # CONFIG_USE_BOOTCOMMAND is not set
configs/pogo_e02_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_POGO_E02=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING="\nPogo E02" +CONFIG_SYS_DCACHE_OFF=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="PogoE02> "
configs/portl2_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_IDENT_STRING="\nKeymile Port-L2" CONFIG_SYS_EXTRA_OPTIONS="KM_PORTL2" +CONFIG_SYS_DCACHE_OFF=y CONFIG_MISC_INIT_R=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set
configs/sheevaplug_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_TARGET_SHEEVAPLUG=y CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING="\nMarvell-Sheevaplug" +CONFIG_SYS_DCACHE_OFF=y # CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set
configs/stv0991_defconfig +1 -0
@@ -3,6 +3,7 @@ CONFIG_TARGET_STV0991=y CONFIG_SYS_TEXT_BASE=0x00010000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=1 +CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_EXTRA_OPTIONS="STV0991" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_CPUINFO is not set
configs/woodburn_defconfig +1 -0
@@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_WOODBURN=y CONFIG_SYS_TEXT_BASE=0xA0000000 CONFIG_NR_DRAM_BANKS=1 +CONFIG_SYS_DCACHE_OFF=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y
configs/woodburn_sd_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL=y CONFIG_SPL_LIBDISK_SUPPORT=y +CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/woodburn/imximage.cfg" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set
configs/work_92105_defconfig +2 -0
@@ -9,6 +9,8 @@ CONFIG_CMD_MAX6957=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SPL=y +CONFIG_SYS_ICACHE_OFF=y +CONFIG_SYS_DCACHE_OFF=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS2,115200n8"
configs/xilinx_versal_mini_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_MALLOC_LEN=0x2000 CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_COUNTER_FREQUENCY=2720000 +CONFIG_SYS_ICACHE_OFF=y # CONFIG_IMAGE_FORMAT_LEGACY is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_CPUINFO is not set
configs/xilinx_versal_mini_emmc0_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_ENV_SIZE=0x80 CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_COUNTER_FREQUENCY=2720000 +CONFIG_SYS_ICACHE_OFF=y CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_R=y
configs/xilinx_versal_mini_emmc1_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_ENV_SIZE=0x80 CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_COUNTER_FREQUENCY=2720000 +CONFIG_SYS_ICACHE_OFF=y CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_R=y
configs/xilinx_zynqmp_mini_defconfig +1 -0
@@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_SYS_ICACHE_OFF=y CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_qspi" CONFIG_ARCH_ZYNQMP=y CONFIG_SYS_TEXT_BASE=0xFFFC0000
configs/xilinx_zynqmp_mini_emmc0_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_ENV_SIZE=0x80 CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL=y # CONFIG_CMD_ZYNQMP is not set +CONFIG_SYS_ICACHE_OFF=y CONFIG_FIT=y CONFIG_SUPPORT_RAW_INITRD=y # CONFIG_BOARD_LATE_INIT is not set
configs/xilinx_zynqmp_mini_emmc1_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_ENV_SIZE=0x80 CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL=y # CONFIG_CMD_ZYNQMP is not set +CONFIG_SYS_ICACHE_OFF=y CONFIG_FIT=y CONFIG_SUPPORT_RAW_INITRD=y # CONFIG_BOARD_LATE_INIT is not set
configs/xilinx_zynqmp_mini_nand_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x10000 CONFIG_ENV_SIZE=0x80 CONFIG_NR_DRAM_BANKS=1 # CONFIG_CMD_ZYNQMP is not set +CONFIG_SYS_ICACHE_OFF=y CONFIG_FIT=y CONFIG_SUPPORT_RAW_INITRD=y # CONFIG_BOARD_LATE_INIT is not set
configs/xilinx_zynqmp_mini_qspi_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_ZYNQMP_NO_DDR=y # CONFIG_PSCI_RESET is not set # CONFIG_CMD_ZYNQMP is not set +CONFIG_SYS_ICACHE_OFF=y # CONFIG_EXPERT is not set # CONFIG_IMAGE_FORMAT_LEGACY is not set # CONFIG_BOARD_LATE_INIT is not set
configs/zynq_cse_nand_defconfig +2 -0
@@ -5,6 +5,8 @@ CONFIG_SYS_TEXT_BASE=0x100000 CONFIG_ENV_SIZE=0x190 CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL=y +CONFIG_SYS_ICACHE_OFF=y +CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_MALLOC_LEN=0x1000 # CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set
configs/zynq_cse_nor_defconfig +2 -0
@@ -5,6 +5,8 @@ CONFIG_SYS_TEXT_BASE=0xFFFC0000 CONFIG_ENV_SIZE=0x190 CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL=y +CONFIG_SYS_ICACHE_OFF=y +CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_MALLOC_LEN=0x1000 # CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set
configs/zynq_cse_qspi_defconfig +2 -0
@@ -5,6 +5,8 @@ CONFIG_SYS_TEXT_BASE=0xFFFC0000 CONFIG_ENV_SIZE=0x190 CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL=y +CONFIG_SYS_ICACHE_OFF=y +CONFIG_SYS_DCACHE_OFF=y CONFIG_DEBUG_UART_BASE=0x0 CONFIG_DEBUG_UART_CLOCK=0 # CONFIG_ZYNQ_DDRC_INIT is not set
include/configs/armadillo-800eva.h +0 -1
@@ -21,7 +21,6 @@#define CONFIG_SYS_TIMER_COUNTS_DOWN #define CONFIG_SYS_TIMER_COUNTER (TMU_BASE + 0xc)/* TCNT0 */ #define CONFIG_SYS_TIMER_RATE (CONFIG_SYS_CLK_FREQ / 4) -#define CONFIG_SYS_DCACHE_OFF /* STACK */ #define CONFIG_SYS_INIT_SP_ADDR 0xE8083000
include/configs/aspeed-common.h +0 -3
@@ -15,9 +15,6 @@#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -/* Enable cache controller */ -#define CONFIG_SYS_DCACHE_OFF -#define CONFIG_SYS_SDRAM_BASE 0x80000000#ifdef CONFIG_PRE_CON_BUF_SZ
include/configs/bcm23550_w1d.h +0 -2
@@ -100,8 +100,6 @@#define CONFIG_USBID_ADDR 0x34052c46 -#define CONFIG_SYS_ICACHE_OFF -#define CONFIG_SYS_DCACHE_OFF #define CONFIG_SYS_L2CACHE_OFF #endif /* __BCM23550_W1D_H */
include/configs/colibri_pxa270.h +0 -3
@@ -16,9 +16,6 @@/* Avoid overwriting factory configuration block */ #define CONFIG_BOARD_SIZE_LIMIT 0x40000 -/* We will never enable dcache because we have to setup MMU first */ -#define CONFIG_SYS_DCACHE_OFF -/* * Environment settings */
include/configs/devkit3250.h +0 -2
@@ -14,8 +14,6 @@#define CONFIG_MACH_TYPE MACH_TYPE_DEVKIT3250 -#define CONFIG_SYS_ICACHE_OFF -#define CONFIG_SYS_DCACHE_OFF #if !defined(CONFIG_SPL_BUILD )#define CONFIG_SKIP_LOWLEVEL_INIT #endif
include/configs/flea3.h +0 -2
@@ -17,8 +17,6 @@/* High Level Configuration Options */ #define CONFIG_MX35 -#define CONFIG_SYS_DCACHE_OFF -#define CONFIG_MACH_TYPE MACH_TYPE_FLEA3/* Set TEXT at the beginning of the NOR flash */
include/configs/gplugd.h +0 -3
@@ -33,9 +33,6 @@* Commands configuration */ -/* Disable DCACHE */ -#define CONFIG_SYS_DCACHE_OFF -/* Network configuration */ #ifdef CONFIG_CMD_NET #define CONFIG_ARMADA100_FEC
include/configs/highbank.h +0 -2
@@ -6,8 +6,6 @@#ifndef __CONFIG_H#define __CONFIG_H -#define CONFIG_SYS_DCACHE_OFF -#define CONFIG_SYS_BOOTMAPSZ (16 << 20)#define CONFIG_SYS_TIMER_RATE (150000000/256)
include/configs/origen.h +0 -2
@@ -14,8 +14,6 @@#define CONFIG_EXYNOS4210 1/* which is a EXYNOS4210 SoC */ #define CONFIG_ORIGEN 1/* working with ORIGEN*/ -#define CONFIG_SYS_DCACHE_OFF -/* ORIGEN has 4 bank of DRAM */ #define CONFIG_SYS_SDRAM_BASE 0x40000000#define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE
include/configs/stv0991.h +0 -1
@@ -6,7 +6,6 @@#ifndef __CONFIG_STV0991_H#define __CONFIG_STV0991_H -#define CONFIG_SYS_DCACHE_OFF #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH /* ram memory-related information */
include/configs/ti_armv7_keystone2.h +0 -1
@@ -17,7 +17,6 @@/* SoC Configuration */ #define CONFIG_ARCH_CPU_INIT #define CONFIG_SPL_TARGET "u-boot-spi.gph" -#define CONFIG_SYS_DCACHE_OFF /* Memory Configuration */ #define CONFIG_SYS_LPAE_SDRAM_BASE 0x800000000
include/configs/woodburn_common.h +0 -2
@@ -17,8 +17,6 @@#define CONFIG_MX35_HCLK_FREQ 24000000#define CONFIG_SYS_FSL_CLK -#define CONFIG_SYS_DCACHE_OFF -#define CONFIG_MACH_TYPE MACH_TYPE_FLEA3/* This is required to setup the ESDC controller */
include/configs/work_92105.h +0 -2
@@ -19,8 +19,6 @@*/ #define CONFIG_MACH_TYPE 736 -#define CONFIG_SYS_ICACHE_OFF -#define CONFIG_SYS_DCACHE_OFF #if !defined(CONFIG_SPL_BUILD )#define CONFIG_SKIP_LOWLEVEL_INIT #endif
include/configs/xilinx_versal_mini.h +0 -2
@@ -10,8 +10,6 @@#ifndef __CONFIG_VERSAL_MINI_H#define __CONFIG_VERSAL_MINI_H -#define CONFIG_SYS_ICACHE_OFF -#define CONFIG_SYS_MEMTEST_SCRATCH 0xfffc0000#define CONFIG_EXTRA_ENV_SETTINGS
include/configs/xilinx_zynqmp_mini_emmc.h +0 -1
@@ -12,7 +12,6 @@#include <configs/xilinx_zynqmp_mini.h> -#define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_MALLOC_LEN 0x800000
include/configs/xilinx_zynqmp_mini_nand.h +0 -1
@@ -12,7 +12,6 @@#include <configs/xilinx_zynqmp_mini.h> -#define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_SDRAM_SIZE 0x1000000#define CONFIG_SYS_SDRAM_BASE 0x0#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x40000)
include/configs/xilinx_zynqmp_mini_qspi.h +0 -1
@@ -12,7 +12,6 @@#include <configs/xilinx_zynqmp_mini.h> -#define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0x20000)#define CONFIG_SYS_MALLOC_LEN 0x2000
include/configs/zynq_cse.h +0 -2
@@ -10,8 +10,6 @@#define __CONFIG_ZYNQ_CSE_H#define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SYS_DCACHE_OFF -#define CONFIG_SYS_ICACHE_OFF #include <configs/zynq-common.h>
Signature · 1 line
2.21.0.rc2
PATCH v3 4/5 CONFIG_SYS_[DI]CACHE_OFF: convert to Kconfig
Quoted 11 lines · Trevor Woerner
CONFIG_SYS_[DI]CACHE_OFF had been partially converted to
Kconfigparameters; only for the ARC architecture. This patch turns these two parameters intoKconfigitems everywhere else they are found.All of the
include/configs/*and defconfig changes in this patch are for arm machines only. TheKconfigchanges for arc, nds32, riscv, and xtensa have been included since these symbols are found in code underarch/{arc,nds32,riscv,xtensa}, however, no currently-definedinclude/configs/*or defconfigs for these architectures exist which include these symbols.
Quoted 4 lines
These results have been confirmed with
tools/moveconfig.py.Acked-by Alexey Brodkin <[email protected]>Signed-off-by Trevor Woerner <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190519/f052bb54/attachment.sig>
PATCH v3 5/5 CONFIG_SPL_SYS_[DI]CACHE_OFF: add
In reply to Trevor WoernerWhile converting CONFIG_SYS_[DI]CACHE_OFF to Kconfig, there are instances where these configuration items are conditional on SPL. This commit adds SPL variants of these configuration items, uses CONFIG_IS_ENABLED(), and updates the configurations as required.
---
Changes in v3: None
Changes in v2: None
arch/arc/Kconfig | 14 ++++++++++++++ arch/arc/lib/start.S | 4 ++-- arch/arm/Kconfig | 14 ++++++++++++++ arch/arm/cpu/arm11/cpu.c | 12 ++++++------ arch/arm/cpu/arm926ejs/cache.c | 12 ++++++------ arch/arm/cpu/arm926ejs/cpu.c | 2 +- arch/arm/cpu/arm926ejs/start.S | 4 ++-- arch/arm/cpu/armv7/cache_v7.c | 8 ++++---- arch/arm/cpu/armv7/iproc-common/hwinit-common.c | 2 +- arch/arm/cpu/armv7/kona-common/hwinit-common.c | 2 +- arch/arm/cpu/armv7/ls102xa/cpu.c | 4 ++-- arch/arm/cpu/armv7/start.S | 4 ++-- arch/arm/cpu/armv7/vf610/generic.c | 2 +- arch/arm/cpu/armv7m/cache.c | 8 ++++---- arch/arm/cpu/armv8/cache_v8.c | 12 ++++++------ arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 4 ++-- arch/arm/cpu/armv8/s32v234/cpu.c | 2 +- arch/arm/cpu/pxa/cache.c | 6 +++--- arch/arm/cpu/pxa/pxa2xx.c | 4 ++-- arch/arm/include/asm/global_data.h | 2 +- arch/arm/lib/cache-cp15.c | 6 +++--- arch/arm/lib/cache.c | 2 +- arch/arm/mach-exynos/soc.c | 2 +- arch/arm/mach-imx/cache.c | 2 +- arch/arm/mach-imx/imx8/cpu.c | 2 +- arch/arm/mach-imx/mx5/soc.c | 2 +- arch/arm/mach-keystone/init.c | 2 +- arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/omap5/sec_entry_cpu1.S | 6 +++--- arch/arm/mach-omap2/sec-common.c | 4 ++-- arch/arm/mach-rmobile/cpu_info.c | 2 +- arch/arm/mach-rockchip/rk3036-board.c | 2 +- arch/arm/mach-rockchip/rk3128-board.c | 2 +- arch/arm/mach-rockchip/rk3188-board.c | 2 +- arch/arm/mach-rockchip/rk322x-board.c | 2 +- arch/arm/mach-rockchip/rk3288-board.c | 2 +- arch/arm/mach-rockchip/rv1108/rv1108.c | 2 +- arch/arm/mach-s5pc1xx/cache.c | 2 +- arch/arm/mach-socfpga/misc.c | 4 ++-- arch/arm/mach-sunxi/board.c | 2 +- arch/arm/mach-tegra/board.c | 2 +- arch/arm/mach-zynq/cpu.c | 2 +- arch/nds32/Kconfig | 14 ++++++++++++++ arch/nds32/cpu/n1213/start.S | 8 ++++---- arch/nds32/lib/cache.c | 6 +++--- arch/riscv/Kconfig | 14 ++++++++++++++ arch/riscv/cpu/ax25/cache.c | 8 ++++---- arch/xtensa/Kconfig | 14 ++++++++++++++ arch/xtensa/cpu/start.S | 7 ++++--- board/st/stih410-b2260/board.c | 2 +- cmd/bdinfo.c | 2 +- common/board_f.c | 2 +- common/lcd.c | 2 +- configs/bitmain_antminer_s9_defconfig | 1 + configs/imx8mq_evk_defconfig | 2 ++ configs/imx8qxp_mek_defconfig | 2 ++ configs/smartweb_defconfig | 2 ++ configs/syzygy_hub_defconfig | 1 + configs/taurus_defconfig | 2 ++ configs/topic_miami_defconfig | 1 + configs/topic_miamilite_defconfig | 1 + configs/topic_miamiplus_defconfig | 1 + configs/zynq_cse_nand_defconfig | 1 + configs/zynq_cse_nor_defconfig | 1 + configs/zynq_cse_qspi_defconfig | 1 + drivers/dma/apbh_dma.c | 2 +- drivers/mtd/nand/raw/mxs_nand.c | 2 +- drivers/net/dwc_eth_qos.c | 2 +- drivers/net/rtl8169.c | 2 +- drivers/net/sh_eth.c | 3 ++- drivers/video/video-uclass.c | 2 +- include/configs/imx8mq_evk.h | 2 -- include/configs/imx8qxp_mek.h | 2 -- include/configs/mx7ulp_evk.h | 2 +- include/configs/smartweb.h | 5 ----- include/configs/taurus.h | 4 ---- include/configs/zynq-common.h | 5 ----- 77 files changed, 188 insertions(+), 118 deletions(-)
arch/arc/Kconfig +14 -0
@@ -114,12 +114,26 @@ config SYS_ICACHE_OFF help Do not enable instruction cache in U-Boot. +config SPL_SYS_ICACHE_OFF + bool "Do not enable icache in SPL" + depends on SPL + default n + help + Do not enable instruction cache in SPL. + config SYS_DCACHE_OFF bool "Do not enable dcache" default n help Do not enable data cache in U-Boot. +config SPL_SYS_DCACHE_OFF + bool "Do not enable dcache in SPL" + depends on SPL + default n + help + Do not enable data cache in SPL. + menuconfig ARC_DBG bool "ARC debugging" default n
arch/arc/lib/start.S +2 -2
@@ -16,7 +16,7 @@ ENTRY(_start) lr r5, [ARC_BCR_IC_BUILD] breq r5, 0, 1f ; I$ doesn't exist lr r5, [ARC_AUX_IC_CTRL] -#ifndef CONFIG_SYS_ICACHE_OFF +#if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF) bclr r5, r5, 0 ; 0 - Enable, 1 is Disable #else bset r5, r5, 0 ; I$ exists, but is not used
@@ -37,7 +37,7 @@ ENTRY(_start) breq r5, 0, 1f ; D$ doesn't exist lr r5, [ARC_AUX_DC_CTRL] bclr r5, r5, 6 ; Invalidate (discard w/o wback) -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) bclr r5, r5, 0 ; Enable (+Inv) #else bset r5, r5, 0 ; Disable (+Inv)
arch/arm/Kconfig +14 -0
@@ -80,12 +80,26 @@ config SYS_ICACHE_OFF help Do not enable instruction cache in U-Boot. +config SPL_SYS_ICACHE_OFF + bool "Do not enable icache in SPL" + depends on SPL + default n + help + Do not enable instruction cache in SPL. + config SYS_DCACHE_OFF bool "Do not enable dcache" default n help Do not enable data cache in U-Boot. +config SPL_SYS_DCACHE_OFF + bool "Do not enable dcache in SPL" + depends on SPL + default n + help + Do not enable data cache in SPL. + config SYS_ARM_CACHE_CP15 bool "CP15 based cache enabling support" help
arch/arm/cpu/arm11/cpu.c +6 -6
@@ -51,7 +51,7 @@ static void cache_flush(void) asmvolatile ("mcr p15, 0, %0, c7, c10, 4" : :"r" (i)); } -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void invalidate_dcache_all (void ) { asmvolatile ("mcr p15, 0, %0, c7, c6, 0" : :"r" (0 ));
@@ -87,7 +87,7 @@ void flush_dcache_range(unsigned long start, unsigned long stop) asm volatile("mcr p15, 0, %0, c7, c10, 4" : : "r" (0)); } -#else /* #ifndef CONFIG_SYS_DCACHE_OFF */ +#else /* #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) */ void invalidate_dcache_all (void ) { }
@@ -95,15 +95,15 @@ void invalidate_dcache_all(void)void flush_dcache_all (void ) { } -#endif /* #ifndef CONFIG_SYS_DCACHE_OFF */ +#endif /* #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) */ -#if !(defined(CONFIG_SYS_ICACHE_OFF ) && defined(CONFIG_SYS_DCACHE_OFF )) +#if !(CONFIG_IS_ENABLED (SYS_ICACHE_OFF ) &&CONFIG_IS_ENABLED (SYS_DCACHE_OFF ))void enable_caches (void ) { -#ifndef CONFIG_SYS_ICACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_ICACHE_OFF )icache_enable ();#endif -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )dcache_enable ();#endif }
arch/arm/cpu/arm926ejs/cache.c +6 -6
@@ -6,7 +6,7 @@#include <linux/types.h> #include <common.h> -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void invalidate_dcache_all (void ) { asmvolatile ("mcr p15, 0, %0, c7, c6, 0\n" : :"r" (0 ));
@@ -46,7 +46,7 @@ void flush_dcache_range(unsigned long start, unsigned long stop) asm volatile("mcr p15, 0, %0, c7, c10, 4\n" : : "r"(0)); } -#else /* #ifndef CONFIG_SYS_DCACHE_OFF */ +#else /* #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) */ void invalidate_dcache_all (void ) { }
@@ -54,7 +54,7 @@ void invalidate_dcache_all(void)void flush_dcache_all (void ) { } -#endif /* #ifndef CONFIG_SYS_DCACHE_OFF */ +#endif /* #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) */ /* * Stub implementations for l2 cache operations
@@ -66,7 +66,7 @@ __weak void l2_cache_disable(void) {}__weak void invalidate_l2_cache (void ) {}#endif -#ifndef CONFIG_SYS_ICACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_ICACHE_OFF )/* Invalidate entire I-cache and branch predictor array */ void invalidate_icache_all (void ) {
@@ -80,10 +80,10 @@ void invalidate_icache_all(void) {}void enable_caches (void ) { -#ifndef CONFIG_SYS_ICACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_ICACHE_OFF )icache_enable ();#endif -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )dcache_enable ();#endif }
arch/arm/cpu/arm926ejs/cpu.c +1 -1
@@ -44,7 +44,7 @@ int cleanup_before_linux (void)/* flush I/D-cache */ static void cache_flush (void ) { -#if !(defined(CONFIG_SYS_ICACHE_OFF ) && defined(CONFIG_SYS_DCACHE_OFF )) +#if !(CONFIG_IS_ENABLED (SYS_ICACHE_OFF ) &&CONFIG_IS_ENABLED (SYS_DCACHE_OFF ))unsigned long i =0 ; asm ("mcr p15, 0, %0, c7, c7, 0" : :"r" (i));
arch/arm/cpu/arm926ejs/start.S +2 -2
@@ -84,7 +84,7 @@ flush_dcache: /* * disable MMU and D cache - * enable I cache if CONFIG_SYS_ICACHE_OFF is not defined + * enable I cache if SYS_ICACHE_OFF is not defined */ mrc p15, 0, r0, c1, c0, 0 bic r0, r0, #0x00000300 /* clear bits 9:8 (---- --RS) */
@@ -95,7 +95,7 @@ flush_dcache: bic r0, r0, #0x00002000 /* clear bit 13 (--V- ----) */ #endif orr r0, r0, #0x00000002 /* set bit 1 (A) Align */ -#ifndef CONFIG_SYS_ICACHE_OFF +#if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF) orr r0, r0, #0x00001000 /* set bit 12 (I) I-Cache */ #endif mcr p15, 0, r0, c1, c0, 0
arch/arm/cpu/armv7/cache_v7.c +4 -4
@@ -12,7 +12,7 @@#define ARMV7_DCACHE_INVAL_RANGE 1#define ARMV7_DCACHE_CLEAN_INVAL_RANGE 2 -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )/* Asm functions from cache_v7_asm.S */ void v7_flush_dcache_all (void );
@@ -149,7 +149,7 @@ void mmu_page_table_flush(unsigned long start, unsigned long stop)flush_dcache_range (start, stop); v7_inval_tlb(); } -#else /* #ifndef CONFIG_SYS_DCACHE_OFF */ +#else /* #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) */ void invalidate_dcache_all (void ) { }
@@ -177,9 +177,9 @@ void mmu_page_table_flush(unsigned long start, unsigned long stop)void arm_init_domains (void ) { } -#endif /* #ifndef CONFIG_SYS_DCACHE_OFF */ +#endif /* #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) */ -#ifndef CONFIG_SYS_ICACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_ICACHE_OFF )/* Invalidate entire I-cache and branch predictor array */ void invalidate_icache_all (void ) {
arch/arm/cpu/armv7/iproc-common/hwinit-common.c +1 -1
@@ -5,7 +5,7 @@#include <common.h> -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void enable_caches (void ) {/* Enable D-cache. I-cache is already enabled in start.S */
arch/arm/cpu/armv7/kona-common/hwinit-common.c +1 -1
@@ -6,7 +6,7 @@#include <common.h> #include <linux/sizes.h> -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void enable_caches (void ) {/* Enable D-cache. I-cache is already enabled in start.S */
arch/arm/cpu/armv7/ls102xa/cpu.c +2 -2
@@ -26,7 +26,7 @@DECLARE_GLOBAL_DATA_PTR ; -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )/* * Bit[1] of the descriptor indicates the descriptor type,
@@ -215,7 +215,7 @@ void enable_caches(void)invalidate_dcache_all (); set_cr(get_cr() | CR_C); } -#endif /* #ifndef CONFIG_SYS_DCACHE_OFF */ +#endif /* #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) */ uint get_svr (void )
arch/arm/cpu/armv7/start.S +2 -2
@@ -97,7 +97,7 @@ ENTRY(c_runtime_cpu_setup) /* * If I-cache is enabled invalidate it */ -#ifndef CONFIG_SYS_ICACHE_OFF +#if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF) mcr p15, 0, r0, c7, c5, 0 @ invalidate icache mcr p15, 0, r0, c7, c10, 4 @ DSB mcr p15, 0, r0, c7, c5, 4 @ ISB
@@ -155,7 +155,7 @@ ENTRY(cpu_init_cp15) bic r0, r0, #0x00000007 @ clear bits 2:0 (-CAM) orr r0, r0, #0x00000002 @ set bit 1 (--A-) Align orr r0, r0, #0x00000800 @ set bit 11 (Z---) BTB -#ifdef CONFIG_SYS_ICACHE_OFF +#if CONFIG_IS_ENABLED(SYS_ICACHE_OFF) bic r0, r0, #0x00001000 @ clear bit 12 (I) I-cache #else orr r0, r0, #0x00001000 @ set bit 12 (I) I-cache
arch/arm/cpu/armv7/vf610/generic.c +1 -1
@@ -360,7 +360,7 @@ int get_clocks(void)return 0 ; } -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void enable_caches (void ) {#if defined(CONFIG_SYS_ARM_CACHE_WRITETHROUGH )
arch/arm/cpu/armv7m/cache.c +4 -4
@@ -54,7 +54,7 @@ enum cache_action { FLUSH_INVAL_SET_WAY, /* d-cache clean & invalidate by set/ways */ }; -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) struct dcache_config { u32 ways; u32 sets;
@@ -292,7 +292,7 @@ void invalidate_dcache_all(void) }#endif -#ifndef CONFIG_SYS_ICACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_ICACHE_OFF )void invalidate_icache_all (void ) {
@@ -349,10 +349,10 @@ int icache_status(void)void enable_caches (void ) { -#ifndef CONFIG_SYS_ICACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_ICACHE_OFF )icache_enable ();#endif -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )dcache_enable ();#endif }
arch/arm/cpu/armv8/cache_v8.c +6 -6
@@ -13,7 +13,7 @@DECLARE_GLOBAL_DATA_PTR ; -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )/* * With 4k page granule, a virtual address is split into 4 lookup parts
@@ -647,7 +647,7 @@ void mmu_change_region_attr(phys_addr_t addr, size_t siz, u64 attrs) __asm_invalidate_tlb_all(); } -#else /* CONFIG_SYS_DCACHE_OFF */ +#else /* !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) */ /* * For SPL builds, we may want to not have dcache enabled. Any real U-Boot
@@ -684,9 +684,9 @@ void mmu_set_region_dcache_behaviour(phys_addr_t start, size_t size, { } -#endif /* CONFIG_SYS_DCACHE_OFF */ +#endif /* !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) */ -#ifndef CONFIG_SYS_ICACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_ICACHE_OFF )void icache_enable (void ) {
@@ -710,7 +710,7 @@ void invalidate_icache_all(void) __asm_invalidate_l3_icache(); } -#else /* CONFIG_SYS_ICACHE_OFF */ +#else /* !CONFIG_IS_ENABLED(SYS_ICACHE_OFF) */ void icache_enable (void ) {
@@ -729,7 +729,7 @@ void invalidate_icache_all(void) { } -#endif /* CONFIG_SYS_ICACHE_OFF */ +#endif /* !CONFIG_IS_ENABLED(SYS_ICACHE_OFF) */ /* * Enable dCache & iCache, whether cache is actually enabled
arch/arm/cpu/armv8/fsl-layerscape/cpu.c +2 -2
@@ -388,7 +388,7 @@ void cpu_name(char *name)strcpy (name,"unknown" ); } -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )/* * To start MMU before DDR is available, we create MMU table in SRAM. * The base address of SRAM is CONFIG_SYS_FSL_OCRAM_BASE. We use three
@@ -611,7 +611,7 @@ void enable_caches(void)icache_enable (); dcache_enable(); } -#endif /* CONFIG_SYS_DCACHE_OFF */ +#endif /* !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) */ #ifdef CONFIG_TFABOOT enum boot_src __get_boot_src (u32 porsr1)
arch/arm/cpu/armv8/s32v234/cpu.c +1 -1
@@ -16,7 +16,7 @@ u32 cpu_mask(void)return readl (MC_ME_CS ); } -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )#define S32V234_IRAM_BASE 0x3e800000UL#define S32V234_IRAM_SIZE 0x800000UL
arch/arm/cpu/pxa/cache.c +3 -3
@@ -6,7 +6,7 @@#include <linux/types.h> #include <common.h> -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void invalidate_dcache_all (void ) {/* Flush/Invalidate I cache */
@@ -35,7 +35,7 @@ void flush_dcache_range(unsigned long start, unsigned long stop) {return invalidate_dcache_range (start, stop); } -#else /* #ifndef CONFIG_SYS_DCACHE_OFF */ +#else /* #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) */ void invalidate_dcache_all (void ) { }
@@ -43,7 +43,7 @@ void invalidate_dcache_all(void)void flush_dcache_all (void ) { } -#endif /* #ifndef CONFIG_SYS_DCACHE_OFF */ +#endif /* #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) */ /* * Stub implementations for l2 cache operations
arch/arm/cpu/pxa/pxa2xx.c +2 -2
@@ -286,10 +286,10 @@ void reset_cpu(ulong ignored)void enable_caches (void ) { -#ifndef CONFIG_SYS_ICACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_ICACHE_OFF )icache_enable ();#endif -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )dcache_enable ();#endif }
arch/arm/include/asm/global_data.h +1 -1
@@ -35,7 +35,7 @@ struct arch_global_data {unsigned int tbl;unsigned long lastinc;unsigned long long timer_reset_value; -#if !(defined(CONFIG_SYS_ICACHE_OFF ) && defined(CONFIG_SYS_DCACHE_OFF )) +#if !(CONFIG_IS_ENABLED (SYS_ICACHE_OFF ) &&CONFIG_IS_ENABLED (SYS_DCACHE_OFF ))unsigned long tlb_addr;unsigned long tlb_size;#if defined(CONFIG_ARM64 )
arch/arm/lib/cache-cp15.c +3 -3
@@ -10,7 +10,7 @@#include <linux/compiler.h> #include <asm/armv7_mpu.h> -#if !(defined(CONFIG_SYS_ICACHE_OFF ) && defined(CONFIG_SYS_DCACHE_OFF )) +#if !(CONFIG_IS_ENABLED (SYS_ICACHE_OFF ) &&CONFIG_IS_ENABLED (SYS_DCACHE_OFF ))DECLARE_GLOBAL_DATA_PTR ;
@@ -246,7 +246,7 @@ static void cache_disable(uint32_t cache_bit) }#endif -#ifdef CONFIG_SYS_ICACHE_OFF +#if CONFIG_IS_ENABLED (SYS_ICACHE_OFF )void icache_enable (void ) {return ;
@@ -278,7 +278,7 @@ int icache_status(void) }#endif -#ifdef CONFIG_SYS_DCACHE_OFF +#if CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void dcache_enable (void ) {return ;
arch/arm/lib/cache.c +1 -1
@@ -87,7 +87,7 @@ void noncached_init(void) noncached_end = end; noncached_next = start; -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )mmu_set_region_dcache_behaviour (noncached_start, size,DCACHE_OFF );#endif }
arch/arm/mach-exynos/soc.c +1 -1
@@ -25,7 +25,7 @@ void reset_cpu(ulong addr)#endif } -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void enable_caches (void ) {/* Enable D-cache. I-cache is already enabled in start.S */
arch/arm/mach-imx/cache.c +1 -1
@@ -37,7 +37,7 @@ static void enable_ca7_smp(void) } } -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void enable_caches (void ) {#if defined(CONFIG_SYS_ARM_CACHE_WRITETHROUGH )
arch/arm/mach-imx/imx8/cpu.c +1 -1
@@ -446,7 +446,7 @@ void enable_caches(void)dcache_enable (); } -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )u64 get_page_table_size (void ) {u64 one_pt =MAX_PTE_ENTRIES *sizeof (u64);
arch/arm/mach-imx/mx5/soc.c +1 -1
@@ -62,7 +62,7 @@ u32 __weak get_board_rev(void) }#endif -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void enable_caches (void ) {/* Enable D-cache. I-cache is already enabled in start.S */
arch/arm/mach-keystone/init.c +1 -1
@@ -204,7 +204,7 @@ void reset_cpu(ulong addr)void enable_caches (void ) { -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )/* Enable D-cache. I-cache is already enabled in start.S */ dcache_enable ();#endif
arch/arm/mach-omap2/Makefile +1 -1
@@ -34,7 +34,7 @@ obj-$(CONFIG_SCSI_AHCI_PLAT) += sata.o endif endif -ifeq ($(CONFIG_SYS_DCACHE_OFF),) +ifeq ($(CONFIG_$(SPL_TPL_)SYS_DCACHE_OFF),) obj-y += omap-cache.o endif
arch/arm/mach-omap2/omap5/sec_entry_cpu1.S +3 -3
@@ -16,7 +16,7 @@ .arch_extension sec -#if !defined(CONFIG_SYS_DCACHE_OFF) +#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) .global flush_dcache_range #endif
@@ -79,7 +79,7 @@ ENTRY(omap_smc_sec_cpu1) push {r4, r5, lr} ldr r4, =omap_smc_sec_cpu1_args stm r4, {r0,r1,r2,r3} @ Save args to memory -#if !defined(CONFIG_SYS_DCACHE_OFF) +#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) mov r0, r4 mov r1, #CONFIG_SYS_CACHELINE_SIZE add r1, r0, r1 @ dcache is not enabled on CPU1, so
@@ -109,7 +109,7 @@ ENDPROC(omap_smc_sec_cpu1) */ .section .data omap_smc_sec_cpu1_args: -#if !defined(CONFIG_SYS_DCACHE_OFF) +#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) .balign CONFIG_SYS_CACHELINE_SIZE .rept CONFIG_SYS_CACHELINE_SIZE/4 .word 0
arch/arm/mach-omap2/sec-common.c +2 -2
@@ -333,7 +333,7 @@ int secure_tee_install(u32 addr)debug ("tee_info.tee_arg0 = %08X\n" , tee_info.tee_arg0);debug ("tee_file_size = %d\n" , tee_file_size); -#if !defined(CONFIG_SYS_DCACHE_OFF ) +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )flush_dcache_range (rounddown ((u32 )loadptr,ARCH_DMA_MINALIGN ),roundup ((u32 )loadptr + tee_file_size,ARCH_DMA_MINALIGN ));
@@ -356,7 +356,7 @@ int secure_tee_install(u32 addr)/* Reuse the tee_info buffer for SMC params */ smc_cpu1_params = (u32 *)&tee_info; smc_cpu1_params[0 ] =0 ; -#if !defined(CONFIG_SYS_DCACHE_OFF ) +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )flush_dcache_range ((u32 )smc_cpu1_params, (u32 )smc_cpu1_params +roundup (sizeof (u32),ARCH_DMA_MINALIGN ));#endif
arch/arm/mach-rmobile/cpu_info.c +1 -1
@@ -17,7 +17,7 @@ int arch_cpu_init(void)/* R-Car Gen3 D-cache is enabled in memmap-gen3.c */ #ifndef CONFIG_RCAR_GEN3 -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) void enable_caches(void) { dcache_enable();
arch/arm/mach-rockchip/rk3036-board.c +1 -1
@@ -48,7 +48,7 @@ int dram_init(void) }#endif -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void enable_caches (void ) {/* Enable D-cache. I-cache is already enabled in start.S */
arch/arm/mach-rockchip/rk3128-board.c +1 -1
@@ -57,7 +57,7 @@ int dram_init_banksize(void)return 0 ; } -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void enable_caches (void ) {/* Enable D-cache. I-cache is already enabled in start.S */
arch/arm/mach-rockchip/rk3188-board.c +1 -1
@@ -75,7 +75,7 @@ err:#endif } -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void enable_caches (void ) {/* Enable D-cache. I-cache is already enabled in start.S */
arch/arm/mach-rockchip/rk322x-board.c +1 -1
@@ -85,7 +85,7 @@ int dram_init_banksize(void)return 0 ; } -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void enable_caches (void ) {/* Enable D-cache. I-cache is already enabled in start.S */
arch/arm/mach-rockchip/rk3288-board.c +1 -1
@@ -186,7 +186,7 @@ err:#endif } -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void enable_caches (void ) {/* Enable D-cache. I-cache is already enabled in start.S */
arch/arm/mach-rockchip/rv1108/rv1108.c +1 -1
@@ -6,7 +6,7 @@#include <common.h> -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void enable_caches (void ) {/* Enable D-cache. I-cache is already enabled in start.S */
arch/arm/mach-s5pc1xx/cache.c +1 -1
@@ -9,7 +9,7 @@#include <common.h> -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void enable_caches (void ) {dcache_enable ();
arch/arm/mach-socfpga/misc.c +2 -2
@@ -48,10 +48,10 @@ int dram_init(void)void enable_caches (void ) { -#ifndef CONFIG_SYS_ICACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_ICACHE_OFF )icache_enable ();#endif -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )dcache_enable ();#endif }
arch/arm/mach-sunxi/board.c +1 -1
@@ -300,7 +300,7 @@ void reset_cpu(ulong addr)#endif } -#if !defined(CONFIG_SYS_DCACHE_OFF ) && !defined(CONFIG_ARM64 ) +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF ) && !defined(CONFIG_ARM64 )void enable_caches (void ) {/* Enable D-cache. I-cache is already enabled in start.S */
arch/arm/mach-tegra/board.c +1 -1
@@ -226,7 +226,7 @@ U_BOOT_DEVICE(ns16550_com1) = { };#endif -#if !defined(CONFIG_SYS_DCACHE_OFF ) && !defined(CONFIG_ARM64 ) +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF ) && !defined(CONFIG_ARM64 )void enable_caches (void ) {/* Enable D-cache. I-cache is already enabled in start.S */
arch/arm/mach-zynq/cpu.c +1 -1
@@ -83,7 +83,7 @@ void reset_cpu(ulong addr) ; } -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void enable_caches (void ) {/* Enable D-cache. I-cache is already enabled in start.S */
arch/nds32/Kconfig +14 -0
@@ -22,12 +22,26 @@ config SYS_ICACHE_OFF help Do not enable instruction cache in U-Boot. +config SPL_SYS_ICACHE_OFF + bool "Do not enable icache in SPL" + depends on SPL + default n + help + Do not enable instruction cache in SPL. + config SYS_DCACHE_OFF bool "Do not enable dcache" default n help Do not enable data cache in U-Boot. +config SPL_SYS_DCACHE_OFF + bool "Do not enable dcache in SPL" + depends on SPL + default n + help + Do not enable data cache in SPL. + source "board/AndesTech/adp-ag101p/Kconfig" source "board/AndesTech/adp-ae3xx/Kconfig"
arch/nds32/cpu/n1213/start.S +4 -4
@@ -129,7 +129,7 @@ set_ivb: mfsr $r1, $mr8 and $r1, $r1, $r0 mtsr $r1, $mr8 -#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF)) +#if !(CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(SYS_DCACHE_OFF)) /* * MMU_CTL NTC0 Cacheable/Write-Back */
@@ -139,7 +139,7 @@ set_ivb: mtsr $r1, $mr0 #endif -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) #ifdef CONFIG_ARCH_MAP_SYSMEM /* * MMU_CTL NTC1 Non-cacheable
@@ -158,14 +158,14 @@ set_ivb: #endif #endif -#if !defined(CONFIG_SYS_ICACHE_OFF) +#if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF) li $r0, 0x1 mfsr $r1, $mr8 or $r1, $r1, $r0 mtsr $r1, $mr8 #endif -#if !defined(CONFIG_SYS_DCACHE_OFF) +#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) li $r0, 0x2 mfsr $r1, $mr8 or $r1, $r1, $r0
arch/nds32/lib/cache.c +3 -3
@@ -6,7 +6,7 @@*/ #include <common.h> -#if !(defined(CONFIG_SYS_ICACHE_OFF ) && defined(CONFIG_SYS_DCACHE_OFF )) +#if !(CONFIG_IS_ENABLED (SYS_ICACHE_OFF ) &&CONFIG_IS_ENABLED (SYS_DCACHE_OFF ))static inline unsigned long CACHE_SET (unsigned char cache) {if (cache ==ICACHE )
@@ -38,7 +38,7 @@ static inline unsigned long CACHE_LINE_SIZE(enum cache_t cache) }#endif -#ifndef CONFIG_SYS_ICACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_ICACHE_OFF )void invalidate_icache_all (void ) {unsigned long end, line_size;
@@ -133,7 +133,7 @@ int icache_status(void)#endif -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void dcache_wbinval_all (void ) {unsigned long end, line_size;
arch/riscv/Kconfig +14 -0
@@ -25,12 +25,26 @@ config SYS_ICACHE_OFF help Do not enable instruction cache in U-Boot. +config SPL_SYS_ICACHE_OFF + bool "Do not enable icache in SPL" + depends on SPL + default n + help + Do not enable instruction cache in SPL. + config SYS_DCACHE_OFF bool "Do not enable dcache" default n help Do not enable data cache in U-Boot. +config SPL_SYS_DCACHE_OFF + bool "Do not enable dcache in SPL" + depends on SPL + default n + help + Do not enable data cache in SPL. + # board-specific options below source "board/AndesTech/ax25-ae350/Kconfig" source "board/emulation/qemu-riscv/Kconfig"
arch/riscv/cpu/ax25/cache.c +4 -4
@@ -30,7 +30,7 @@ void invalidate_dcache_range(unsigned long start, unsigned long end)void icache_enable (void ) { -#ifndef CONFIG_SYS_ICACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_ICACHE_OFF )#ifdef CONFIG_RISCV_NDS_CACHE asmvolatile ( "csrr t1, mcache_ctl\n\t"
@@ -43,7 +43,7 @@ void icache_enable(void)void icache_disable (void ) { -#ifndef CONFIG_SYS_ICACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_ICACHE_OFF )#ifdef CONFIG_RISCV_NDS_CACHE asmvolatile ( "fence.i\n\t"
@@ -57,7 +57,7 @@ void icache_disable(void)void dcache_enable (void ) { -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )#ifdef CONFIG_RISCV_NDS_CACHE asmvolatile ( "csrr t1, mcache_ctl\n\t"
@@ -70,7 +70,7 @@ void dcache_enable(void)void dcache_disable (void ) { -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )#ifdef CONFIG_RISCV_NDS_CACHE asmvolatile ( "fence\n\t"
arch/xtensa/Kconfig +14 -0
@@ -22,12 +22,26 @@ config SYS_ICACHE_OFF help Do not enable instruction cache in U-Boot. +config SPL_SYS_ICACHE_OFF + bool "Do not enable icache in SPL" + depends on SPL + default n + help + Do not enable instruction cache in SPL. + config SYS_DCACHE_OFF bool "Do not enable dcache" default n help Do not enable data cache in U-Boot. +config SPL_SYS_DCACHE_OFF + bool "Do not enable dcache in SPL" + depends on SPL + default n + help + Do not enable data cache in SPL. + source "board/cadence/xtfpga/Kconfig" endmenu
arch/xtensa/cpu/start.S +4 -3
@@ -164,18 +164,19 @@ _start: * enable data/instruction cache for relocated image. */ #if XCHAL_HAVE_SPANNING_WAY && \ - !(defined(CONFIG_SYS_DCACHE_OFF) && defined(CONFIG_SYS_ICACHE_OFF)) + !(CONFIG_IS_ENABLED(SYS_DCACHE_OFF) && \ + CONFIG_IS_ENABLED(SYS_ICACHE_OFF)) srli a7, a4, 29 slli a7, a7, 29 addi a7, a7, XCHAL_SPANNING_WAY -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) rdtlb1 a8, a7 srli a8, a8, 4 slli a8, a8, 4 addi a8, a8, CA_WRITEBACK wdtlb a8, a7 #endif -#ifndef CONFIG_SYS_ICACHE_OFF +#if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF) ritlb1 a8, a7 srli a8, a8, 4 slli a8, a8, 4
board/st/stih410-b2260/board.c +1 -1
@@ -26,7 +26,7 @@ int dram_init_banksize(void)return 0 ; } -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void enable_caches (void ) {/* Enable D-cache. I-cache is already enabled in start.S */
cmd/bdinfo.c +1 -1
@@ -321,7 +321,7 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc,print_eths ();#endif print_baudrate (); -#if !(defined(CONFIG_SYS_ICACHE_OFF ) && defined(CONFIG_SYS_DCACHE_OFF )) +#if !(CONFIG_IS_ENABLED (SYS_ICACHE_OFF ) &&CONFIG_IS_ENABLED (SYS_DCACHE_OFF ))print_num ("TLB addr" , gd->arch.tlb_addr);#endif print_num ("relocaddr" , gd->relocaddr);
common/board_f.c +1 -1
@@ -381,7 +381,7 @@ static int reserve_round_4k(void)#ifdef CONFIG_ARM __weak int reserve_mmu (void ) { -#if !(defined(CONFIG_SYS_ICACHE_OFF ) && defined(CONFIG_SYS_DCACHE_OFF )) +#if !(CONFIG_IS_ENABLED (SYS_ICACHE_OFF ) &&CONFIG_IS_ENABLED (SYS_DCACHE_OFF ))/* reserve TLB table */ gd->arch.tlb_size =PGTABLE_SIZE ; gd->relocaddr -= gd->arch.tlb_size;
common/lcd.c +1 -1
@@ -61,7 +61,7 @@ void lcd_sync(void)* architectures do not actually implement it. Is there a way to find * out whether it exists? For now, ARM is safe. */ -#if defined(CONFIG_ARM ) && !defined(CONFIG_SYS_DCACHE_OFF ) +#if defined(CONFIG_ARM ) && !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )int line_length;if (lcd_flush_dcache)
configs/bitmain_antminer_s9_defconfig +1 -0
@@ -3,6 +3,7 @@ CONFIG_SYS_VENDOR="bitmain" CONFIG_SYS_BOARD="antminer_s9" CONFIG_SYS_CONFIG_NAME="bitmain_antminer_s9" CONFIG_ARCH_ZYNQ=y +CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_ENV_OFFSET=0x300000 CONFIG_SPL_STACK_R_ADDR=0x200000
configs/imx8mq_evk_defconfig +2 -0
@@ -1,5 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y +CONFIG_SPL_SYS_ICACHE_OFF=y +CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_SYS_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_IMX8MQ_EVK=y
configs/imx8qxp_mek_defconfig +2 -0
@@ -1,5 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8=y +CONFIG_SPL_SYS_ICACHE_OFF=y +CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_SYS_TEXT_BASE=0x80020000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/smartweb_defconfig +2 -0
@@ -2,6 +2,8 @@ CONFIG_ARM=y CONFIG_SPL_SYS_THUMB_BUILD=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set +CONFIG_SPL_SYS_ICACHE_OFF=y +CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_ARCH_AT91=y CONFIG_SYS_TEXT_BASE=0x23000000 CONFIG_TARGET_SMARTWEB=y
configs/syzygy_hub_defconfig +1 -0
@@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_VENDOR="opalkelly" CONFIG_SYS_CONFIG_NAME="syzygy_hub" CONFIG_ARCH_ZYNQ=y +CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL=y
configs/taurus_defconfig +2 -0
@@ -2,6 +2,8 @@ CONFIG_ARM=y CONFIG_SPL_SYS_THUMB_BUILD=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set +CONFIG_SPL_SYS_ICACHE_OFF=y +CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_ARCH_AT91=y CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds" CONFIG_SYS_TEXT_BASE=0x21000000
configs/topic_miami_defconfig +1 -0
@@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_VENDOR="topic" CONFIG_SYS_CONFIG_NAME="topic_miami" CONFIG_ARCH_ZYNQ=y +CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL=y
configs/topic_miamilite_defconfig +1 -0
@@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_VENDOR="topic" CONFIG_SYS_CONFIG_NAME="topic_miami" CONFIG_ARCH_ZYNQ=y +CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL=y
configs/topic_miamiplus_defconfig +1 -0
@@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_VENDOR="topic" CONFIG_SYS_CONFIG_NAME="topic_miami" CONFIG_ARCH_ZYNQ=y +CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL=y
configs/zynq_cse_nand_defconfig +1 -0
@@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="zynq_cse" CONFIG_ARCH_ZYNQ=y +CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_SYS_TEXT_BASE=0x100000 CONFIG_ENV_SIZE=0x190 CONFIG_SPL_STACK_R_ADDR=0x200000
configs/zynq_cse_nor_defconfig +1 -0
@@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="zynq_cse" CONFIG_ARCH_ZYNQ=y +CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_SYS_TEXT_BASE=0xFFFC0000 CONFIG_ENV_SIZE=0x190 CONFIG_SPL_STACK_R_ADDR=0x200000
configs/zynq_cse_qspi_defconfig +1 -0
@@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="zynq_cse" CONFIG_ARCH_ZYNQ=y +CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_SYS_TEXT_BASE=0xFFFC0000 CONFIG_ENV_SIZE=0x190 CONFIG_SPL_STACK_R_ADDR=0x200000
drivers/dma/apbh_dma.c +1 -1
@@ -81,7 +81,7 @@ static int mxs_dma_read_semaphore(int channel)return tmp; } -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )void mxs_dma_flush_desc (struct mxs_dma_desc *desc) {uint32_t addr;
drivers/mtd/nand/raw/mxs_nand.c +1 -1
@@ -50,7 +50,7 @@ struct nand_ecclayout fake_ecc_layout;/* * Cache management functions */ -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )static void mxs_nand_flush_data_buf (struct mxs_nand_info *info) {uint32_t addr = (uint32_t )info->data_buf;
drivers/net/dwc_eth_qos.c +1 -1
@@ -241,7 +241,7 @@ struct eqos_tegra186_regs {*/ #if EQOS_DESCRIPTOR_SIZE <ARCH_DMA_MINALIGN #if !defined(CONFIG_SYS_NONCACHED_MEMORY ) && \ - !defined(CONFIG_SYS_DCACHE_OFF ) && !defined(CONFIG_X86 ) + !CONFIG_IS_ENABLED (SYS_DCACHE_OFF ) && !defined(CONFIG_X86 )#warning Cache line size is larger than descriptor size#endif #endif
drivers/net/rtl8169.c +1 -1
@@ -301,7 +301,7 @@ static unsigned char rxdata[RX_BUF_LEN];*/ #if RTL8169_DESC_SIZE <ARCH_DMA_MINALIGN #if !defined(CONFIG_SYS_NONCACHED_MEMORY ) && \ - !defined(CONFIG_SYS_DCACHE_OFF ) && !defined(CONFIG_X86 ) + !CONFIG_IS_ENABLED (SYS_DCACHE_OFF ) && !defined(CONFIG_X86 )#warning cache-line size is larger than descriptor size#endif #endif
drivers/net/sh_eth.c +2 -1
@@ -34,7 +34,8 @@# error "Please define CONFIG_SH_ETHER_PHY_ADDR"#endif -#if defined(CONFIG_SH_ETHER_CACHE_WRITEBACK ) && !defined(CONFIG_SYS_DCACHE_OFF ) +#if defined(CONFIG_SH_ETHER_CACHE_WRITEBACK ) && \ + !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )#define flush_cache_wback (addr, len) \ flush_dcache_range((u32)addr, \ (u32)(addr + ALIGN(len, CONFIG_SH_ETHER_ALIGNE_SIZE)))
drivers/video/video-uclass.c +1 -1
@@ -149,7 +149,7 @@ void video_sync(struct udevice *vid, bool force)* architectures do not actually implement it. Is there a way to find * out whether it exists? For now, ARM is safe. */ -#if defined(CONFIG_ARM ) && !defined(CONFIG_SYS_DCACHE_OFF ) +#if defined(CONFIG_ARM ) && !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )struct video_priv *priv =dev_get_uclass_priv (vid);if (priv->flush_dcache) {
include/configs/imx8mq_evk.h +0 -2
@@ -36,8 +36,6 @@#define CONFIG_SYS_SPL_MALLOC_START 0x42200000#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000/* 512 KB */ #define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 -#define CONFIG_SYS_ICACHE_OFF -#define CONFIG_SYS_DCACHE_OFF /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CONFIG_MALLOC_F_ADDR 0x182000
include/configs/imx8qxp_mek.h +0 -2
@@ -23,8 +23,6 @@#define CONFIG_SYS_SPL_MALLOC_START 0x00120000#define CONFIG_SYS_SPL_MALLOC_SIZE 0x3000/* 12 KB */ #define CONFIG_SERIAL_LPUART_BASE 0x5a060000 -#define CONFIG_SYS_ICACHE_OFF -#define CONFIG_SYS_DCACHE_OFF #define CONFIG_MALLOC_F_ADDR 0x00120000#define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE
include/configs/mx7ulp_evk.h +1 -1
@@ -168,7 +168,7 @@#define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )#define CONFIG_CMD_CACHE #endif
include/configs/smartweb.h +0 -5
@@ -216,11 +216,6 @@#define CONFIG_SYS_MCKR_CSS (0x02 | CONFIG_SYS_MCKR)#define CONFIG_SYS_AT91_PLLB 0x10483f0e -#if defined(CONFIG_SPL_BUILD ) -#define CONFIG_SYS_ICACHE_OFF -#define CONFIG_SYS_DCACHE_OFF -#endif -#define CONFIG_SPL_PAD_TO CONFIG_SYS_NAND_U_BOOT_OFFS#define CONFIG_SYS_SPL_LEN CONFIG_SPL_PAD_TO
include/configs/taurus.h +0 -4
@@ -21,10 +21,6 @@#include <asm/hardware.h> #include <linux/sizes.h> -#if defined(CONFIG_SPL_BUILD ) -#define CONFIG_SYS_ICACHE_OFF -#define CONFIG_SYS_DCACHE_OFF -#endif /* * Warning: changing CONFIG_SYS_TEXT_BASE requires * adapting the initial boot program.
include/configs/zynq-common.h +0 -5
@@ -284,11 +284,6 @@#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"#endif -/* Disable dcache for SPL just for sure */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_DCACHE_OFF -#endif -/* Address in RAM where the parameters must be copied by SPL. */ #define CONFIG_SYS_SPL_ARGS_ADDR 0x10000000
Signature · 1 line
2.21.0.rc2
PATCH v3 5/5 CONFIG_SPL_SYS_[DI]CACHE_OFF: add
Quoted 7 lines · Trevor Woerner
While converting CONFIG_SYS_[DI]CACHE_OFF to
Kconfig, there are instances where these configuration items are conditional on SPL. This commit adds SPL variants of these configuration items, usesCONFIG_IS_ENABLED(), and updates the configurations as required.Acked-by Alexey Brodkin <[email protected]>Signed-off-by Trevor Woerner <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190519/2f80443b/attachment.sig>