image: push default arch values to arch headers

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index ee05fb330a5c2077a068191908208f84557f0863..cd6fc8c9165e61e76b83baffe46c0191cd9f5226 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
 #
 
 VERSION = 2011
-PATCHLEVEL = 06
+PATCHLEVEL = 09
 SUBLEVEL =
 EXTRAVERSION =
 ifneq "$(SUBLEVEL)" ""
@@ -253,10 +253,12 @@ LIBS += drivers/power/libpower.o
 LIBS += drivers/spi/libspi.o
 ifeq ($(CPU),mpc83xx)
 LIBS += drivers/qe/libqe.o
+LIBS += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
 LIBS += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
 endif
 ifeq ($(CPU),mpc85xx)
 LIBS += drivers/qe/libqe.o
+LIBS += drivers/net/fm/libfm.o
 LIBS += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
 LIBS += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
 endif
@@ -864,10 +866,6 @@ SX1_config:                unconfig
        fi;
        @$(MKCONFIG) -n $@ SX1 arm arm925t sx1
 
-tx25_config    : unconfig
-       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
-       @$(MKCONFIG) $@ arm arm926ejs tx25 karo mx25
-
 #########################################################################
 ## XScale Systems
 #########################################################################
@@ -890,24 +888,6 @@ apollon_config             : unconfig
        @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
        @$(MKCONFIG) $@ arm arm1136 apollon - omap24xx
 
-imx31_phycore_eet_config \
-imx31_phycore_config   : unconfig
-       @mkdir -p $(obj)include
-       @if [ -n "$(findstring _eet_,$@)" ]; then                       \
-               echo "#define CONFIG_IMX31_PHYCORE_EET" >> $(obj)include/config.h;      \
-       fi
-       @$(MKCONFIG) -n $@ -a imx31_phycore arm arm1136 imx31_phycore - mx31
-
-mx31pdk_config \
-mx31pdk_nand_config    : unconfig
-       @mkdir -p $(obj)include
-       @if [ -n "$(findstring _nand_,$@)" ]; then                                      \
-               echo "#define CONFIG_NAND_U_BOOT" >> $(obj)include/config.h;            \
-       else                                                                            \
-               echo "#define CONFIG_SKIP_LOWLEVEL_INIT" >> $(obj)include/config.h;     \
-       fi
-       @$(MKCONFIG) -n $@ -a mx31pdk arm arm1136 mx31pdk freescale mx31
-
 #########################################################################
 ## ARM1176 Systems
 #########################################################################