Merge branch 'next' of git://git.denx.de/u-boot-usb into next

[oweals/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index 84ab6803c93ff17090af156e85355fca22457c76..e5c05028dc87dec63d4ab36caf327200e112bbe9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -904,7 +904,7 @@ ifneq ($(CONFIG_BUILD_TARGET),)
 ALL-y += $(CONFIG_BUILD_TARGET:"%"=%)
 endif
 
-ifdef CONFIG_INIT_SP_RELATIVE
+ifeq ($(CONFIG_INIT_SP_RELATIVE)$(CONFIG_OF_SEPARATE),yy)
 ALL-y += init_sp_bss_offset_check
 endif
 
@@ -1215,7 +1215,7 @@ binary_size_check: u-boot-nodtb.bin FORCE
                fi \
        fi
 
-ifdef CONFIG_INIT_SP_RELATIVE
+ifeq ($(CONFIG_INIT_SP_RELATIVE)$(CONFIG_OF_SEPARATE),yy)
 ifneq ($(CONFIG_SYS_MALLOC_F_LEN),)
 subtract_sys_malloc_f_len = space=$$(($${space} - $(CONFIG_SYS_MALLOC_F_LEN)))
 else