]> git.baikalelectronics.ru Git - uboot.git/commitdiff
Makefile: doesn't need check stack size when dtb is not built
authorAKASHI Takahiro <takahiro.akashi@linaro.org>
Tue, 10 Mar 2020 00:20:43 +0000 (09:20 +0900)
committerTom Rini <trini@konsulko.com>
Fri, 13 Mar 2020 13:30:30 +0000 (09:30 -0400)
The commit 427d00c64417 ("Makefile: ensure DTB doesn't overflow into
initial stack") adds an extra check for stack size in BSS if
CONFIG_SYS_INIT_SP_BSS_OFFSET is enabled.
This check, however, doesn't make sense under the configuration where
control dtb won't be built in and it should be void in such cases.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Fixes: 427d00c64417 ("Makefile: ensure DTB doesn't overflow into initial stack")
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Makefile

index 07539ca5968633219bbe4fc39405e65f18d6bf63..fa687f13a588cea01afc1edc69db3c72742f7f6f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -903,7 +903,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
 
@@ -1208,7 +1208,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