Skip to content

riscv: dts: starfive: prune redundant jh7110-common

E Shattow u-boot 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest4 patches 5 repliesIn review
  2. v24 patches 1 replySuperseded
  3. v11 patch 4 repliesSuperseded

Changes in v3 from the cover letter

- 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

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4riscv: dts: starfive: prune redundant jh7110-common overridesarch/riscv/dts/jh7110-common-u-boot.dtsi arch/riscv/dts/jh7110-deepcomputing-fml13v01-u-boot.dtsi arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi +3 more+5 -1041 reply
2/4riscv: dts: starfive: sync visionfive2 overrides with upstream Linux for-nextarch/riscv/dts/jh7110-u-boot.dtsi+31 -502 replies
3/4riscv: dts: starfive: visionfive2 depend on SYS_CPU automatic dtsi inclusionarch/riscv/dts/jh7110-deepcomputing-fml13v01-u-boot.dtsi arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi +3 more+1 -351 reply
4/4configs: starfive: Use visionfive2 DEVICE_TREE_INCLUDES dtsi named similar to defconfigarch/riscv/dts/starfive-visionfive2-u-boot.dtsi configs/starfive_visionfive2_defconfig+1 -01 reply

Reviews trailers per patch

All 4 patches have a Reviewed-by or Acked-by.

PatchLeo Yu-Chi Liang
1/4R-b
2/4R-b
3/4R-b
4/4R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH v3 0/4] riscv: dts: starfive: prune redundant jh7110-common

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

Signature · 1 line
2.50.0