diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2013-01-16 18:34:09 -0600 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2013-01-16 18:34:09 -0600 |
| commit | a6187dccd813920524987792e49ef2feffb213e6 (patch) | |
| tree | 6825884dd47867575aa29cd35f1cb248a91c313e /Makefile | |
| parent | 3a9d879f6f64585b819af728b53be0a05037fe0d (diff) | |
| parent | 22f4442d12a3833e29b6580f6cf9bc0e55340504 (diff) | |
Merge remote-tracking branch 'mpc83xx/next'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -486,8 +486,12 @@ $(obj)u-boot.sha1: $(obj)u-boot.bin $(obj)u-boot.dis: $(obj)u-boot $(OBJDUMP) -d $< > $@ + + $(obj)u-boot-with-spl.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin + $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(or $(CONFIG_SPL_PAD_TO),0) \ + -O binary $(obj)spl/u-boot-spl \ + $(obj)spl/u-boot-spl-pad.bin cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $@ rm $(obj)spl/u-boot-spl-pad.bin |