On 11/11/2024 6:26 PM, Heinrich Schuchardt wrote: > On 11/11/24 03:07, Hal Feng wrote: >> JH7110 boards switch to using upstream DT, so drop >> redundant DT files from arch/riscv/dts/. >> >> Signed-off-by: Hal Feng <hal.f...@starfivetech.com> > > I added paches 1/13 and 2/13 to origin/master. > > make starfive_visionfive2_defconfig > make > > yielded the following error: > > DTC > dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.3b.dtb > Error: dts/upstream/src/riscv/starfive/jh7110.dtsi:518.15-16 syntax error > FATAL ERROR: Unable to parse input tree > Check > /home/zfsdt/workspace/u-boot-build/denx/dts/upstream/src/riscv/starfive/.jh7110-starfive-visionfive-2-v1.3b.dtb.pre.tmp > for errors > make[2]: *** [scripts/Makefile.lib:423: > dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.3b.dtb] > Error 1 > make[1]: *** [dts/Makefile:60: arch-dtbs] Error 2 > make: *** [Makefile:1175: dts/dt.dtb] Error 2 > make: *** Waiting for unfinished jobs.... > > include/dt-bindings/clock/starfive,jh7110-crg.h > which does *not* include the symbol JH7110_SYSCLK_TDM_TDM is evaluated > instead of > dts/upstream/include/dt-bindings/clock/starfive,jh7110-crg.h > which contains the symbol JH7110_SYSCLK_TDM_TDM. > > We want git bisect to work. Hence we must ensure that after each > individual patch building works. > > Before merging the series we need a patch ensuring that upstream > includes are used. >
The include/ dir is included before dts/upstream/include/. To make git bisect work, one choice here is merging patch 1~5 together. Best regards, Hal
