Hi Stefan, On 5 May 2020, at 10:58, Stefan Roese <[email protected]> wrote: > > Hi Ezra, > > On 05.05.20 09:10, Ezra Buehler wrote: >> On 5 May 2020, at 08:45, Stefan Roese <[email protected]> wrote: >>> U-Boot specific DT properties, like "u-boot,dm-pre-reloc" should be >>> added in U-Boot specific DT dtsi files >> OK, that makes sense. However, in your commit 1718a9f3b7 (arm: mvebu: >> armada-370-xp.dtsi: Add "u-boot, dm-pre-reloc" to "internal-regs") you >> wrote: >> I'm not adding this property in an *u-boot.dtsi file, since there is >> none matching the generic rules for all files including this dtsi >> file. So to not miss any of the boards using this dtsi file, I'm >> adding it to this file directly, which makes the Linux merge a less >> easy unforunately. >> So, do you want me to try this now? > > Hmmm, I can't remember the exact details. Thanks for the reference. > But perhaps there is a matching *-u-boot.dtsi rule / pattern that can > be used to include such a newly introduced file. I would very much > welcome it, when you would investigate here. > > Thanks, > Stefan
From looking at other *.dtsi files I understand one would have to include the armada-370-xp-u-boot.dtsi in armada-370-xp.dtsi in order to move the U-Boot-specific properties out. I guess one should then do this for other boards too. I am not sure if I am confortable with touching all these boards. Maybe one should do this the next time when syncing the DTS files with Linux. If it is OK for you, for this patch, I would simply introduce a armada-xp-synology-ds414-u-boot.dtsi as Chris suggested. Cheers, Ezra.
