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, making these per-dts
-u-boot.dtsi files unnecessary for future additions.
The last patch in this series anticipates additional CPU models for
starfive_visionfive2 config, changing from SYS_CPU automatic inclusion
dtsi to a filename more similar to the defconfig name via config Extra
dtsi inclusion. This also allows that any supported board for this config
which does need to use the per-dts automatic dtsi inclusion by the build
system may do so without having to include this common dtsi again.
Changes since v2:
- Drop PATCH 4/4 "visionfive2 depend on SYS_CONFIG_NAME automatic dtsi
inclusion"
- Add patch "Use visionfive2 DEVICE_TREE_INCLUDES dtsi named similar to
defconfig"
- Revise cover letter descriptions
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
configs: starfive: Use visionfive2 DEVICE_TREE_INCLUDES dtsi named
similar to defconfig
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 ++++++---------
configs/starfive_visionfive2_defconfig | 1 +
8 files changed, 33 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: b82fa9d752b025d3b5305b5b07debe6808a5d027
--
2.50.0
