diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:40:04 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:40:04 +0200 |
commit | 7f6b6d25d899fea83412255d1d819e3b6450f144 (patch) | |
tree | 4da546d3b4045c842af7ccad3004c6476cb4d523 /arch/arm/Makefile | |
parent | 1729b1798e1bfd4614a9cf7cf651cee8b6923283 (diff) | |
parent | f1cf4433bfc2d2e7bfdab8eacc401a0ccf2fe08d (diff) | |
download | barebox-7f6b6d25d899fea83412255d1d819e3b6450f144.tar.gz barebox-7f6b6d25d899fea83412255d1d819e3b6450f144.tar.xz |
Merge branch 'for-next/omap'
Conflicts:
arch/arm/boards/pcm051/env/config
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 4f45d57ad2..590a0d8f7b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -165,7 +165,7 @@ KBUILD_IMAGE := barebox.ubl endif quiet_cmd_am35xx_spi_image = SPI-IMG $@ - cmd_am35xx_spi_image = scripts/mk-am35xx-spi-image $< > $@ + cmd_am35xx_spi_image = scripts/mk-am35xx-spi-image -a $(TEXT_BASE) $< > $@ barebox.spi: $(KBUILD_BINARY) FORCE $(call if_changed,am35xx_spi_image) |