[U-Boot] [PATCH v2 0/5] Kconfig conversion: CONFIG_SYS_[DI]CACHE_OFF

Trevor Woerner trevor at toganlabs.com
Thu Apr 25 13:05:36 UTC 2019


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 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(-)

-- 
2.21.0.rc2



More information about the U-Boot mailing list