summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-07-11 18:08:44 -0400
committerTom Rini <trini@konsulko.com>2019-07-11 18:08:44 -0400
commit79b8d3c285f4f1c2ee4b27367f2ca3ecb76ed9ce (patch)
tree20571bc51871460b41b53c906881541e4ee2ce5c /Makefile
parent5acce685c9227b3d4b48f6fab6a33f6d74ca9c14 (diff)
parent2ce6b82d340cf1b1e5a43f1b5c8965d0067d5246 (diff)
Merge tag 'uniphier-v2019.10' of https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier
UniPhier SoC updates for v2019.10 - import DT updates from Linux - add UniPhier SPI controller driver - make U-Boot image for 64bit SoCs position independent - tidy up various init code for next generation SoCs - misc cleanups
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 516260f46d..73fdf70cdd 100644
--- a/Makefile
+++ b/Makefile
@@ -874,7 +874,7 @@ ifneq ($(CONFIG_BUILD_TARGET),)
ALL-y += $(CONFIG_BUILD_TARGET:"%"=%)
endif
-ifneq ($(CONFIG_SYS_INIT_SP_BSS_OFFSET),)
+ifdef CONFIG_INIT_SP_RELATIVE
ALL-y += init_sp_bss_offset_check
endif
@@ -1155,7 +1155,7 @@ binary_size_check: u-boot-nodtb.bin FORCE
fi \
fi
-ifneq ($(CONFIG_SYS_INIT_SP_BSS_OFFSET),)
+ifdef CONFIG_INIT_SP_RELATIVE
ifneq ($(CONFIG_SYS_MALLOC_F_LEN),)
subtract_sys_malloc_f_len = space=$$(($${space} - $(CONFIG_SYS_MALLOC_F_LEN)))
else