diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-02-02 19:29:59 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-02-02 19:29:59 +0100 |
| commit | e5f5c4a977c411c0cd3899a4f9487eea77a0e150 (patch) | |
| tree | 391225b279509f4403eb6d5e973f0b25e789a8af /spl | |
| parent | 7cb70a34b976e68f6348ea0718780e8f38901482 (diff) | |
| parent | 81ca840976e8e418ae8decaf03ea01f59b1b5be2 (diff) | |
| download | u-boot-e5f5c4a977c411c0cd3899a4f9487eea77a0e150.tar.gz u-boot-e5f5c4a977c411c0cd3899a4f9487eea77a0e150.tar.bz2 u-boot-e5f5c4a977c411c0cd3899a4f9487eea77a0e150.zip | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'spl')
| -rw-r--r-- | spl/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/spl/Makefile b/spl/Makefile index 842f154556..101d478c66 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 |