diff options
| author | Tom Rini <trini@konsulko.com> | 2026-03-09 15:26:34 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2026-03-09 15:26:34 -0600 |
| commit | 1e240f7206fccde4ec73ea432ab8360d321c5fe5 (patch) | |
| tree | 931d5985e8a237b5604999922f5662fc464a8817 /scripts | |
| parent | 36add050eea439f0b2a15e4ea0d3a8e21216f159 (diff) | |
| parent | ba7bf918dafcd093ad733b07ba490baeb20cf5da (diff) | |
| download | u-boot-1e240f7206fccde4ec73ea432ab8360d321c5fe5.tar.gz u-boot-1e240f7206fccde4ec73ea432ab8360d321c5fe5.zip | |
Merge tag 'v2026.04-rc4' into next
Prepare v2026.04-rc4
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 377a4700b94..7386353e0cc 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -437,6 +437,8 @@ cmd_dtc_diff = \ $(DTC) -s -O dts -o $@.full.dts -b 0 \ -i $(dir $<) -i $(u_boot_dtsi_loc) $(DTC_FLAGS) $(dtc-tmp) || \ (echo "Check $(shell pwd)/$(pre-tmp) for errors" && false); \ + sed -i '/\<phandle\> = <0x[0-9a-f]\+>;/ d' $@.clean.dts; \ + sed -i '/\<phandle\> = <0x[0-9a-f]\+>;/ d' $@.full.dts; \ (diff -Naru $@.clean.dts $@.full.dts > $@.diff || true) dtn-tmp = $(subst $(comma),_,$(dot-target).dtn.tmp) |