summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2023-10-06 17:23:47 -0400
committerTom Rini <[email protected]>2023-10-06 17:23:47 -0400
commit83aa0ed1e93e1ffac24888d98d37a5b04ed3fb07 (patch)
treefcabaf4a86164f385ede03b654bc69cbffb2a3ee /Makefile
parentbe2abe73df58a35da9e8d5afb13fccdf1b0faa8e (diff)
parentf69d3d6d10b15872a279aeb10b7c522627aff6c2 (diff)
Merge branch '2023-10-06-spl-prepare-for-universal-payload'
To quote the author: This series tidies up SPL a little and adds some core ofnode functions needed to support Universal Payload. It also includes a few minor fix-ups for sandbox. For SPL the changes include CONFIG naming, removing various #ifdefs and tidying up the FIT code. One notable piece of the ofnode improvements is support for flattening a livetree. This should be useful in future as we move FDT fixups to use the ofnode API.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8af1fa9468b..f67888b1b59 100644
--- a/Makefile
+++ b/Makefile
@@ -1287,7 +1287,7 @@ binary_size_check: u-boot-nodtb.bin FORCE
fi
ifeq ($(CONFIG_INIT_SP_RELATIVE)$(CONFIG_OF_SEPARATE),yy)
-ifneq ($(CONFIG_SYS_MALLOC_F_LEN),)
+ifneq ($(CONFIG_SYS_MALLOC_F),)
subtract_sys_malloc_f_len = space=$$(($${space} - $(CONFIG_SYS_MALLOC_F_LEN)))
else
subtract_sys_malloc_f_len = true