summaryrefslogtreecommitdiff
path: root/spl
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-02-02 19:29:59 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-02-02 19:29:59 +0100
commite5f5c4a977c411c0cd3899a4f9487eea77a0e150 (patch)
tree391225b279509f4403eb6d5e973f0b25e789a8af /spl
parent7cb70a34b976e68f6348ea0718780e8f38901482 (diff)
parent81ca840976e8e418ae8decaf03ea01f59b1b5be2 (diff)
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'spl')
-rw-r--r--spl/Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/spl/Makefile b/spl/Makefile
index 842f1545569..101d478c669 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -141,11 +141,8 @@ $(OBJTREE)/MLO.byteswap: $(obj)u-boot-spl.bin
$(OBJTREE)/tools/mkimage -T omapimage -n byteswap \
-a $(CONFIG_SPL_TEXT_BASE) -d $< $@
-ifneq ($(CONFIG_IMX_CONFIG),)
-$(OBJTREE)/SPL: $(obj)u-boot-spl.bin
- $(OBJTREE)/tools/mkimage -n $(SRCTREE)/$(CONFIG_IMX_CONFIG) -T imximage \
- -e $(CONFIG_SPL_TEXT_BASE) -d $< $@
-endif
+$(OBJTREE)/SPL : $(obj)u-boot-spl.bin depend
+ $(MAKE) -C $(SRCTREE)/arch/arm/imx-common $@
ALL-y += $(obj)u-boot-spl.bin