]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Makefile: Use the fdtgrep -u flag
authorSimon Glass <sjg@chromium.org>
Tue, 19 Dec 2023 14:21:25 +0000 (07:21 -0700)
committerSimon Glass <sjg@chromium.org>
Sun, 31 Dec 2023 14:21:02 +0000 (07:21 -0700)
Use this flag so that the bootph binding is obeyed correctly.

Add a comment about what is going on.

Signed-off-by: Simon Glass <sjg@chromium.org>
Fixes: https://source.denx.de/u-boot/custodians/u-boot-dm/-/issues/12
Reviewed-by: Tom Rini <trini@konsulko.com>
scripts/Makefile.lib

index 16bbc277a9f1adfc2c9bdec117b21ee844f47ca5..1ca84195c9976a0fab85f5ad692295e650370749 100644 (file)
@@ -635,8 +635,19 @@ else
 fdtgrep_props := -b bootph-all -b bootph-pre-ram $(migrate_spl)
 endif
 endif
+
+# This rule produces the .dtb for an SPL build.
+#
+# The first fdtgrep keeps nodes with the above properties (with -u ensuring that
+# the properties are implied in all parents of a matching node). The root node
+# is always included, along with /chosen and /config nodes. Referenced aliases
+# (i.e. properties in /aliases which point to an incldued node) are also
+# included.
+#
+# The second fdtgrep removes all bootph properties along with unused strings
+# and any properties in CONFIG_OF_SPL_REMOVE_PROPS
 quiet_cmd_fdtgrep = FDTGREP $@
-      cmd_fdtgrep = $(objtree)/tools/fdtgrep $(fdtgrep_props) -RT $< \
+      cmd_fdtgrep = $(objtree)/tools/fdtgrep $(fdtgrep_props) -u -RT $< \
                -n /chosen -n /config -O dtb | \
        $(objtree)/tools/fdtgrep -r -O dtb - -o $@ \
                -P bootph-all -P bootph-pre-ram -P bootph-pre-sram \