[PATCH v2] Makefile: doesn't need check stack size when dtb is not built

[PATCH v2] Makefile: doesn't need check stack size when dtb is not built

[AKASHI Takahiro]

The commit 5fed97af20da ("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: 5fed97af20da ("Makefile: ensure DTB doesn't overflow into
	initial stack")
---
v2:
* guard ALL-y += init_sp_bss_offset_check with simplified "if" condition
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 0af89e0a7881..93931c3cb51b 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.25.1

[PATCH v2] Makefile: doesn't need check stack size when dtb is not built

[Stephen Warren]

On 3/9/20 6:20 PM, AKASHI Takahiro wrote:
> The commit 5fed97af20da ("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: 5fed97af20da ("Makefile: ensure DTB doesn't overflow into
> 	initial stack")

It would be best if that line wasn't wrapped; that will make it easier 
for anyone searching for the commit description, since they won't have 
to know to search for a substring of the the description instead of the 
whole thing.

Reviewed-by: Stephen Warren <swarren@nvidia.com>

[PATCH v2] Makefile: doesn't need check stack size when dtb is not built

[AKASHI Takahiro]

Tom,

On Tue, Mar 10, 2020 at 09:56:42AM -0600, Stephen Warren wrote:
> On 3/9/20 6:20 PM, AKASHI Takahiro wrote:
> > The commit 5fed97af20da ("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: 5fed97af20da ("Makefile: ensure DTB doesn't overflow into
> > 	initial stack")
> 
> It would be best if that line wasn't wrapped; that will make it easier for
> anyone searching for the commit description, since they won't have to know
> to search for a substring of the the description instead of the whole thing.

Can you make this change for me when you merge this patch, please?

> Reviewed-by: Stephen Warren <swarren@nvidia.com>

Thanks,
-Takahiro Akashi

[PATCH v2] Makefile: doesn't need check stack size when dtb is not built

[Tom Rini]

On Tue, Mar 10, 2020 at 09:20:43AM +0900, AKASHI Takahiro wrote:

> The commit 5fed97af20da ("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: 5fed97af20da ("Makefile: ensure DTB doesn't overflow into initial stack")
> Reviewed-by: Stephen Warren <swarren@nvidia.com>

(I undid the linewrap as requested)

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200313/f307ca82/attachment.sig>