Merge branch 'master' of git://git.denx.de/u-boot-arm into master

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index fa1e0ae1839ea86bf69a9362cdc277ccbcc9f897..7865cb9a3c10d775f4d73ecba76d52344807644e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -165,10 +165,6 @@ VPATH              := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))
 
 export srctree objtree VPATH
 
-SPLTREE                := $(objtree)/spl
-TPLTREE                := $(objtree)/tpl
-export SPLTREE TPLTREE
-
 MKCONFIG       := $(srctree)/mkconfig
 export MKCONFIG
 
@@ -753,6 +749,9 @@ dtbs dts/dt.dtb: checkdtc u-boot
 u-boot-dtb.bin: u-boot.bin dts/dt.dtb FORCE
        $(call if_changed,cat)
 
+%.imx: %.bin
+       $(Q)$(MAKE) $(build)=arch/arm/imx-common $@
+
 quiet_cmd_copy = COPY    $@
       cmd_copy = cp $< $@
 
@@ -806,9 +805,6 @@ MKIMAGEFLAGS_u-boot.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \
 u-boot.img u-boot.kwb u-boot.pbl: u-boot.bin FORCE
        $(call if_changed,mkimage)
 
-u-boot.imx: u-boot.bin
-       $(Q)$(MAKE) $(build)=arch/arm/imx-common $@
-
 u-boot.sha1:   u-boot.bin
                tools/ubsha1 u-boot.bin
 
@@ -1232,7 +1228,7 @@ distclean: mrproper
        @find $(srctree) $(RCS_FIND_IGNORE) \
                \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
                -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
-               -o -name '.*.rej' \
+               -o -name '.*.rej' -o -name '*.pyc' \
                -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
                -type f -print | xargs rm -f