diff options
| author | Tom Rini <trini@konsulko.com> | 2024-01-01 12:38:15 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-01-01 12:38:15 -0500 |
| commit | dffa6d0210f57793f1e4e1e209d91ca5642e4d05 (patch) | |
| tree | 350cb07a9c0fc71a5a149c9fba70bc13ec5195d9 /scripts | |
| parent | 2b28c3b871cd5d55b19f0a86cef970139f8ab952 (diff) | |
| parent | e266d2731145681a55d862360f1b61690b0c6820 (diff) | |
Merge tag 'dm-next-1124' of https://source.denx.de/u-boot/custodians/u-boot-dm into next
support propagating supernode properties with bootph schema
align bloblist with v0.9 of Firmware Handoff spec
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 13 | ||||
| -rw-r--r-- | scripts/Makefile.spl | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 16bbc277a9f..1ca84195c99 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -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 \ diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index e450ffd5d5e..407fc52376a 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -314,7 +314,7 @@ endif # - we have either OF_SEPARATE or OF_HOSTFILE build_dtb := ifneq ($(CONFIG_$(SPL_TPL_)OF_REAL),) -ifeq ($(CONFIG_OF_SEPARATE)$(CONFIG_SANDBOX),y) +ifneq ($(CONFIG_OF_SEPARATE)$(CONFIG_SANDBOX),) build_dtb := y endif endif |