diff options
| author | Simon Glass <sjg@chromium.org> | 2017-01-16 07:03:34 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2017-02-06 11:38:46 +0800 |
| commit | 0ec28e026606fa579e9c8639f82843fb6a60337a (patch) | |
| tree | c281d53b48482158daf2b26840509cf032d4f3ba /scripts | |
| parent | bbe41abf7f0e4362dbadb2928489923db101691f (diff) | |
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 <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.spl | 3 |
1 files changed, 2 insertions, 1 deletions
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) |