Merge with /home/wd/git/u-boot/master

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

diff --git a/Makefile b/Makefile
index cce475c..67eb0dc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -128,6 +128,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
@@ -207,6 +208,9 @@ etags:
                                net disk rtc dtt drivers drivers/sk98lin common \
                        \( -name CVS -prune \) -o \( -name '*.[ch]' -print \)`
 
+ctags:
+               ctags -Re
+
 System.map:    u-boot
                @$(NM) $< | \
                grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
@@ -291,14 +295,23 @@ icecube_5100_config:                      unconfig
                }
        @./mkconfig -a IceCube ppc mpc5xxx icecube
 
-inka4x0_config:                unconfig
+inka4x0_config:        unconfig
        @./mkconfig inka4x0 ppc mpc5xxx inka4x0
 
+mcc200_config  \
+mcc200_lowboot_config: unconfig
+       @ >include/config.h
+       @[ -z "$(findstring lowboot_,$@)" ] || \
+               { echo "TEXT_BASE = 0xFE000000" >board/mcc200/config.tmp ; \
+                 echo "... with lowboot configuration" ; \
+               }
+       @./mkconfig mcc200 ppc mpc5xxx mcc200
+
 o2dnt_config:
-       @./mkconfig -a o2dnt ppc mpc5xxx o2dnt
+       @./mkconfig o2dnt ppc mpc5xxx o2dnt
 
 pf5200_config:  unconfig
-       @./mkconfig -a pf5200  ppc mpc5xxx pf5200 esd
+       @./mkconfig pf5200  ppc mpc5xxx pf5200 esd
 
 PM520_config \
 PM520_DDR_config \
@@ -315,8 +328,8 @@ PM520_ROMBOOT_DDR_config:   unconfig
                }
        @./mkconfig -a PM520 ppc mpc5xxx pm520
 
-SMMACO4_config: unconfig
-       @./mkconfig -a SMMACO4 ppc mpc5xxx tqm5200
+smmaco4_config: unconfig
+       @./mkconfig -a smmaco4 ppc mpc5xxx tqm5200
 
 spieval_config:        unconfig
        echo "#define CONFIG_CS_AUTOCONF">>include/config.h
@@ -1476,6 +1489,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
 
@@ -1620,6 +1644,9 @@ cerf250_config :  unconfig
 cradle_config  :       unconfig
        @./mkconfig $(@:_config=) arm pxa cradle
 
+delta_config :
+       @./mkconfig $(@:_config=) arm pxa delta
+
 csb226_config  :       unconfig
        @./mkconfig $(@:_config=) arm pxa csb226
 
@@ -1650,6 +1677,9 @@ xm250_config      :       unconfig
 xsengine_config :      unconfig
        @./mkconfig $(@:_config=) arm pxa xsengine
 
+zylonite_config :
+       @./mkconfig $(@:_config=) arm pxa zylonite
+
 #########################################################################
 ## ARM1136 Systems
 #########################################################################