There are more than a few additional JH7110 CPU boards that may soon be upstreamed. Each new variant supported by U-Boot has the burden of adding a per-dts stub file for automatic dtsi inclusion by the build system. Also i.e. the JH7110S CPU board introduced by StarFive is to be supported by the same U-Boot starfive_visionfive2 target. Let's prepare for and clean out (remove) per-dts file -u-boot.dtsi automatic inclusion stubs for all dts that exist in dts/upstream/src subtree.
The (optional) last patch in this series anticipates additional CPU models for starfive_visionfive2 target and depends on adding CONFIG_SYS_CONFIG_NAME to automatic dtsi inclusion order [1]. 1: https://lore.kernel.org/u-boot/[email protected]/ Changes since v1: - PATCH 1/1 "prune redundant jh7110-common overrides" update commit message - Add patch "sync visionfive2 overrides with upstream Linux for-next" - Add patch "visionfive2 depend on SYS_CPU automatic dtsi inclusion" - Add patch "add CONFIG_SYS_CONFIG_NAME prefix to dtsi search" - Add (optional) patch "visionfive2 depend on SYS_CONFIG_NAME automatic dtsi inclusion" E Shattow (4): riscv: dts: starfive: prune redundant jh7110-common overrides riscv: dts: starfive: sync visionfive2 overrides with upstream Linux for-next riscv: dts: starfive: visionfive2 depend on SYS_CPU automatic dtsi inclusion riscv: dts: starfive: visionfive2 depend on SYS_CONFIG_NAME automatic dtsi inclusion arch/riscv/dts/jh7110-common-u-boot.dtsi | 99 ------------------- .../jh7110-deepcomputing-fml13v01-u-boot.dtsi | 7 -- arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi | 7 -- .../dts/jh7110-pine64-star64-u-boot.dtsi | 7 -- ...10-starfive-visionfive-2-v1.2a-u-boot.dtsi | 7 -- ...10-starfive-visionfive-2-v1.3b-u-boot.dtsi | 7 -- ....dtsi => starfive-visionfive2-u-boot.dtsi} | 82 ++++++--------- 7 files changed, 32 insertions(+), 184 deletions(-) delete mode 100644 arch/riscv/dts/jh7110-common-u-boot.dtsi delete mode 100644 arch/riscv/dts/jh7110-deepcomputing-fml13v01-u-boot.dtsi delete mode 100644 arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi delete mode 100644 arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi delete mode 100644 arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi delete mode 100644 arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi rename arch/riscv/dts/{jh7110-u-boot.dtsi => starfive-visionfive2-u-boot.dtsi} (54%) base-commit: 76b8edbc732e327d1e56f08c641f51fdefdbff06 -- 2.50.0
