[PATCH] dtc: introduce label relative path references

[Simon Glass]

Hi Patrice,

On Fri, 28 Mar 2025 at 11:35, Patrice CHOTARD
<patrice.chotard at foss.st.com> wrote:
>
>
>
> On 3/28/25 18:06, Peter Robinson wrote:
> > On Fri, 28 Mar 2025 at 16:52, Patrice Chotard <patrice.chotard at foss.st.com>
> > wrote:
> >
> >> Since introduction of OF_UPSTREAM flag, U-Boot's dtc must be able
> >> to compile Kernel's device tree.
> >>
> >> Since kernel commit 7de129f5389b ("ARM: dts: stm32: stm32mp151a-prtt1l:
> >> Fix QSPI configuration"), label relative path references has been
> >> introduced. These label relative path references is not supported
> >> by current U-Boot dtc version 1.5.0: (see mailing list discussion [1]).
> >>
> >> In order to support such label relative patch references
> >> adds following commit from upstream DTC tree:
> >>
> >
> > Maybe we need to rebase to the latest upstream dtc, I'm not sure pulling in
> > a random set of bits from upstream is the right way to do things as it's
> > brings things selectively which may bring along other issues.
>
> Hi Peter
>
> Initially it was expected to migrate to dtc 1.7.1 as proposed by Tom,
> but as explained here [1] it has huge impacts on several U-Boot components
> mainly due to DT header alignment on 8 bytes (even if some DT check can
> be bypassed using FDT_ASSUME_MASK, i am not sure it's a good option).
>
> I have spent time to investigate some issue raised by U-Boot CI-Build and
> it's a huge time consuming task, more than expected.

I'm fine with this change and I'm not likely to try to figure out this
mess either.

>
> Thanks
> Patrice
>
> >
> >
> >> commit 651410e54cb9 ("util: introduce xstrndup helper")
> >> commit ec7986e682cf ("dtc: introduce label relative path references")
> >>
> >> [1] https://lore.kernel.org/all/20250115144428.GZ3476@bill-the-cat/T/
> >>
> >> Signed-off-by: Patrice Chotard <patrice.chotard at foss.st.com>
> >> Cc: Tom Rini <trini at konsulko.com>
> >> Cc: Simon Glass <sjg at chromium.org>
> >> ---
> >>
> >>  scripts/dtc/dtc-lexer.l  |  2 +-
> >>  scripts/dtc/dtc-parser.y | 13 +++++++++++++
> >>  scripts/dtc/livetree.c   | 33 ++++++++++++++++++++++++++++++---
> >>  scripts/dtc/util.c       | 11 +++++++++++
> >>  scripts/dtc/util.h       |  1 +
> >>  5 files changed, 56 insertions(+), 4 deletions(-)
> >>

Reviewed-by: Simon Glass <sjg at chromium.org>

Regards,
SImon