diff options
| author | Tom Rini <trini@ti.com> | 2014-05-30 11:34:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-30 11:34:39 -0400 |
| commit | 90b51c33f362926e17d4c07dcef1ce822abaa89f (patch) | |
| tree | 9eb339bb2b864bfac2434d0cd808301506e9bb82 /Makefile | |
| parent | 95856248ca93b9048d87264fbef67ca382975650 (diff) | |
| parent | 9637a1bb896efe392a58dd2772e2c3fcb646409d (diff) | |
| download | u-boot-imx-90b51c33f362926e17d4c07dcef1ce822abaa89f.zip u-boot-imx-90b51c33f362926e17d4c07dcef1ce822abaa89f.tar.gz u-boot-imx-90b51c33f362926e17d4c07dcef1ce822abaa89f.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -937,6 +937,13 @@ OBJCOPYFLAGS_u-boot-spi.gph = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO) u-boot-spi.gph: spl/u-boot-spl.gph u-boot.img FORCE $(call if_changed,pad_cat) +ifneq ($(CONFIG_SUNXI),) +OBJCOPYFLAGS_u-boot-sunxi-with-spl.bin = -I binary -O binary \ + --pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff +u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img FORCE + $(call if_changed,pad_cat) +endif + ifneq ($(CONFIG_TEGRA),) OBJCOPYFLAGS_u-boot-nodtb-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE) u-boot-nodtb-tegra.bin: spl/u-boot-spl u-boot.bin FORCE @@ -1163,6 +1170,9 @@ spl/u-boot-spl.bin: spl/u-boot-spl spl/u-boot-spl: tools prepare $(Q)$(MAKE) obj=spl -f $(srctree)/spl/Makefile all +spl/sunxi-spl.bin: spl/u-boot-spl + @: + tpl/u-boot-tpl.bin: tools prepare $(Q)$(MAKE) obj=tpl -f $(srctree)/spl/Makefile all CONFIG_TPL_BUILD=y |