From 11259d52d782ad30e28e7ae73e9a2852b5a2cb22 Mon Sep 17 00:00:00 2001 From: AKASHI Takahiro Date: Tue, 10 Mar 2020 09:20:43 +0900 Subject: [PATCH] Makefile: doesn't need check stack size when dtb is not built 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 Fixes: 427d00c64417 ("Makefile: ensure DTB doesn't overflow into initial stack") Reviewed-by: Stephen Warren --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 07539ca596..fa687f13a5 100644 --- 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 -- 2.39.5