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

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 2403ad97c3bfd60e931be722a9283b28d52dd80d..327aa8cfc7e9ec4ba9e65da5b6b05cf799023a31 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -324,6 +324,10 @@ $(obj)u-boot.img:  $(obj)u-boot.bin
                        sed -e 's/"[     ]*$$/ for $(BOARD) board"/') \
                -d $< $@
 
+$(obj)u-boot.imx:       $(obj)u-boot.bin
+               $(obj)tools/mkimage -n $(IMX_CONFIG) -T imximage \
+               -e $(TEXT_BASE) -d $< $@
+
 $(obj)u-boot.kwb:       $(obj)u-boot.bin
                $(obj)tools/mkimage -n $(KWD_CONFIG) -T kwbimage \
                -a $(TEXT_BASE) -e $(TEXT_BASE) -d $< $@
@@ -2412,6 +2416,16 @@ caddy2_config \
 vme8349_config:                unconfig
        @$(MKCONFIG) -t $(@:_config=) vme8349 ppc mpc83xx vme8349 esd
 
+edb9301_config \
+edb9302_config \
+edb9302a_config \
+edb9307_config \
+edb9307a_config \
+edb9312_config \
+edb9315_config \
+edb9315a_config: unconfig
+       @$(MKCONFIG) -t $(@:_config=) edb93xx arm arm920t edb93xx NULL ep93xx
+
 #########################################################################
 ## MPC85xx Systems
 #########################################################################
@@ -2485,8 +2499,9 @@ MPC8555CDS_config:        unconfig
 MPC8568MDS_config:     unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8568mds freescale
 
+MPC8569MDS_ATM_config \
 MPC8569MDS_config:     unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8569mds freescale
+       @$(MKCONFIG) -t $(@:_config=) MPC8569MDS ppc mpc85xx mpc8569mds freescale
 
 MPC8572DS_36BIT_config \
 MPC8572DS_config:       unconfig
@@ -2867,6 +2882,9 @@ at91sam9g45ekes_config    :       unconfig
        fi;
        @$(MKCONFIG) -a at91sam9m10g45ek arm arm926ejs at91sam9m10g45ek atmel at91
 
+otc570_config  :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs otc570 esd at91
+
 pm9263_config  :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs pm9263 ronetix at91
 
@@ -3036,6 +3054,14 @@ smdk2400_config  :       unconfig
 smdk2410_config        :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t smdk2410 samsung s3c24x0
 
+spear300_config \
+spear310_config \
+spear320_config :      unconfig
+       @$(MKCONFIG) -n $@ -t $(@:_config=) spear3xx arm arm926ejs $(@:_config=) spear spear
+
+spear600_config :      unconfig
+       @$(MKCONFIG) -n $@ -t $(@:_config=) spear6xx arm arm926ejs $(@:_config=) spear spear
+
 SX1_stdout_serial_config \
 SX1_config:            unconfig
        @mkdir -p $(obj)include