Merge with /home/wd/git/u-boot/testing-NAND/ to add new NAND handling.

[platform/kernel/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index dde111c..5e0df98 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -121,6 +121,7 @@ LIBS += drivers/libdrivers.a
 LIBS += drivers/sk98lin/libsk98lin.a
 LIBS += post/libpost.a post/cpu/libcpu.a
 LIBS += common/libcommon.a
+LIBS += $(BOARDLIBS)
 .PHONY : $(LIBS)
 
 # Add GCC lib
@@ -1002,9 +1003,6 @@ SL8245_config: unconfig
 utx8245_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc824x utx8245
 
-cobra5272_config :             unconfig
-       @./mkconfig $(@:_config=) m68k mcf52x2 cobra5272
-
 #########################################################################
 ## MPC8260 Systems
 #########################################################################
@@ -1234,6 +1232,9 @@ ZPC1900_config: unconfig
 ## Coldfire
 #########################################################################
 
+cobra5272_config :             unconfig
+       @./mkconfig $(@:_config=) m68k mcf52x2 cobra5272
+
 M5272C3_config :               unconfig
        @./mkconfig $(@:_config=) m68k mcf52x2 m5272c3
 
@@ -1329,12 +1330,7 @@ TQM8540_config           \
 TQM8541_config         \
 TQM8555_config         \
 TQM8560_config:                unconfig
-       @case "$@" in \
-       TQM8540_config) CTYPE=8540;;    \
-       TQM8541_config) CTYPE=8541;;    \
-       TQM8555_config) CTYPE=8555;;    \
-       TQM8560_config) CTYPE=8560;;    \
-       esac; \
+       @CTYPE=$(subst TQM,,$(@:_config=)); \
        >include/config.h ; \
        echo "... TQM"$${CTYPE}; \
        echo "#define CONFIG_MPC$${CTYPE}">>include/config.h; \
@@ -1464,6 +1460,17 @@ mx1ads_config    :       unconfig
 mx1fs2_config  :       unconfig
        @./mkconfig $(@:_config=) arm arm920t mx1fs2 NULL imx
 
+netstar_32_config      \
+netstar_config:                unconfig
+       @if [ "$(findstring _32_,$@)" ] ; then \
+               echo "... 32MB SDRAM" ; \
+               echo "#define PHYS_SDRAM_1_SIZE SZ_32M" >>include/config.h ; \
+       else \
+               echo "... 64MB SDRAM" ; \
+               echo "#define PHYS_SDRAM_1_SIZE SZ_64M" >>include/config.h ; \
+       fi
+       @./mkconfig -a netstar arm arm925t netstar
+
 omap1510inn_config :   unconfig
        @./mkconfig $(@:_config=) arm arm925t omap1510inn