applied patches from Freescale and Ka-Ro

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index e4499d707c2e5e45f970383230d8f8895d9c2f3f..db708fd4f9a73d676b1de92740b4b8afc0dff1e5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,8 +30,6 @@ U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 else
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL)$(EXTRAVERSION)
 endif
-TIMESTAMP_FILE = $(obj)include/timestamp_autogenerated.h
-VERSION_FILE = $(obj)include/version_autogenerated.h
 
 HOSTARCH := $(shell uname -m | \
        sed -e s/i.86/i386/ \
@@ -128,6 +126,9 @@ src :=
 endif
 export obj src
 
+TIMESTAMP_FILE = $(obj)include/timestamp_autogenerated.h
+VERSION_FILE = $(obj)include/version_autogenerated.h
+
 # Make sure CDPATH settings don't interfere
 unexport CDPATH
 
@@ -3204,13 +3205,26 @@ apollon_config          : unconfig
        @$(MKCONFIG) $(@:_config=) arm arm1136 apollon NULL omap24xx
        @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
 
+mx23_evk_config : unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs mx23_evk freescale mx23
+
+mx25_3stack_mfg_config \
+mx25_3stack_config     :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs mx25_3stack freescale mx25
+
+mx28_evk_config : unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs mx28_evk freescale mx28
+
+tx28_config : unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs tx28 karo mx28
+
 imx31_litekit_config   : unconfig
        @$(MKCONFIG) $(@:_config=) arm arm1136 imx31_litekit NULL mx31
 
 imx31_phycore_eet_config \
 imx31_phycore_config   : unconfig
        @mkdir -p $(obj)include
-       @if [ -n "$(findstring _eet_,$@)" ]; then                       \
+       @if [ -n "$(findstring _eet_,$@)" ]; then                                       \
                echo "#define CONFIG_IMX31_PHYCORE_EET" >> $(obj)include/config.h;      \
        fi
        @$(MKCONFIG) -a imx31_phycore arm arm1136 imx31_phycore NULL mx31
@@ -3229,6 +3243,39 @@ mx31pdk_nand_config      : unconfig
        fi
        @$(MKCONFIG) -a mx31pdk arm arm1136 mx31pdk freescale mx31
 
+mx31_3stack_config     : unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm1136 mx31_3stack freescale mx31
+
+mx35_3stack_config      \
+mx35_3stack_mfg_config \
+mx35_3stack_mmc_config: unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm1136 mx35_3stack freescale mx35
+
+mx50_arm2_lpddr2_config \
+mx50_arm2_iram_config \
+mx50_arm2_config  \
+mx50_arm2_mfg_config   : unconfig
+       @[ -z "$(findstring iram_,$@)" ] || \
+               { echo "TEXT_BASE = 0xF8008400" >$(obj)board/freescale/mx50_arm2/config.tmp ; \
+                 echo "... with iram configuration" ; \
+               }
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 mx50_arm2 freescale mx50
+
+mx51_bbg_android_config        \
+mx51_bbg_mfg_config \
+mx51_bbg_config                : unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 mx51_bbg freescale mx51
+
+mx51_3stack_android_config     \
+mx51_3stack_config     : unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 mx51_3stack freescale mx51
+
+mx53_evk_mfg_config            \
+mx53_arm2_ddr3_config          \
+mx53_arm2_config               \
+mx53_evk_config      : unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 mx53_evk freescale mx53
+
 omap2420h4_config      : unconfig
        @$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4 NULL omap24xx