Hi Conor, Thanks for working on this.
On Fri, 18 Oct 2024 at 20:25, Conor Dooley <[email protected]> wrote: > > From: Conor Dooley <[email protected]> > > The U-Boot copy of the mpfs devicetree has, in general, been neglected > somewhat in comparison to the one in Linux. Moving to OF_UPSTREAM to > keep both in sync should serve to eliminate that discrepancy. > > Additionally, moving to OF_UPSTREAM will let U-Boot automatically pick > up the devicetree rework that is in progress at [1]. > > Link: https://lore.kernel.org/all/20241002-private-unequal-33cfa6101338@spud/ > [1] > Signed-off-by: Conor Dooley <[email protected]> > --- > For obvious reasons, there's partial duplication here with Hal's work, > since we both need the new Makefile: > https://lore.kernel.org/all/[email protected]/ > --- > arch/riscv/dts/Makefile | 1 - > arch/riscv/dts/mpfs-icicle-kit-fabric.dtsi | 71 --- > arch/riscv/dts/mpfs-icicle-kit-u-boot.dtsi | 14 - > arch/riscv/dts/mpfs-icicle-kit.dts | 208 --------- > arch/riscv/dts/mpfs.dtsi | 511 --------------------- > configs/microchip_mpfs_icicle_defconfig | 3 +- > dts/upstream/src/riscv/Makefile | 13 + > 7 files changed, 15 insertions(+), 806 deletions(-) > delete mode 100644 arch/riscv/dts/mpfs-icicle-kit-fabric.dtsi > delete mode 100644 arch/riscv/dts/mpfs-icicle-kit-u-boot.dtsi > delete mode 100644 arch/riscv/dts/mpfs-icicle-kit.dts > delete mode 100644 arch/riscv/dts/mpfs.dtsi > create mode 100644 dts/upstream/src/riscv/Makefile > <snip> > diff --git a/dts/upstream/src/riscv/Makefile b/dts/upstream/src/riscv/Makefile > new file mode 100644 > index 00000000000..dd2ed0bdfbd > --- /dev/null > +++ b/dts/upstream/src/riscv/Makefile > @@ -0,0 +1,13 @@ > +# SPDX-License-Identifier: GPL-2.0+ > + > +include $(srctree)/scripts/Makefile.dts > + > +targets += $(dtb-y) > + > +DTC_FLAGS += -R 4 -p 0x1000 > + > +PHONY += dtbs > +dtbs: $(addprefix $(obj)/, $(dtb-y)) > + @: > + > +clean-files := */*.dtb */*.dtbo Many of the common Makefile bits were moved by patch [1] to scripts/Makefile.dts. So you should rebase to the latest master branch. Apart from that, changes look good to me. [1] https://github.com/u-boot/u-boot/commit/d2061828a4c1b60b44cd2307b6a782ac2efbffbe -Sumit > -- > 2.45.2 >
