From: Simon Glass Date: Mon, 16 Jan 2017 14:03:34 +0000 (-0700) Subject: spl: Don't create a BSS padding when it is separate X-Git-Tag: v2017.03-rc2~106 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0ec28e026606fa579e9c8639f82843fb6a60337a;p=u-boot spl: Don't create a BSS padding when it is separate When BSS does not immediate follow the SPL image we don't need padding before the device tree. Remove it in this case. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index ced10e6f95..82cfc601b2 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -191,7 +191,8 @@ quiet_cmd_copy = COPY $@ cmd_copy = cp $< $@ ifeq ($(CONFIG_SPL_OF_CONTROL)$(CONFIG_OF_SEPARATE)$(CONFIG_SPL_OF_PLATDATA),yy) -$(obj)/$(SPL_BIN)-dtb.bin: $(obj)/$(SPL_BIN)-nodtb.bin $(obj)/$(SPL_BIN)-pad.bin \ +$(obj)/$(SPL_BIN)-dtb.bin: $(obj)/$(SPL_BIN)-nodtb.bin \ + $(if $(CONFIG_SPL_SEPARATE_BSS),,$(obj)/$(SPL_BIN)-pad.bin) \ $(obj)/$(SPL_BIN).dtb FORCE $(call if_changed,cat)