Merge with /home/hs/U-Boot/u-boot-dev

[kernel/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index 86640a6..440ab2c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -259,6 +259,9 @@ PATI_config:                unconfig
 aev_config: unconfig
        @./mkconfig -a aev ppc mpc5xxx tqm5200
 
+BC3450_config: unconfig
+       @./mkconfig -a BC3450 ppc mpc5xxx bc3450
+
 cpci5200_config:  unconfig
        @./mkconfig -a cpci5200  ppc mpc5xxx cpci5200 esd
 
@@ -323,7 +326,7 @@ mcc200_config       \
 mcc200_lowboot_config: unconfig
        @ >include/config.h
        @[ -z "$(findstring lowboot_,$@)" ] || \
-               { echo "TEXT_BASE = 0xFE000000" >board/mcc200/config.tmp ; \
+               { echo "TEXT_BASE = 0xFC000000" >board/mcc200/config.tmp ; \
                  echo "... with lowboot configuration" ; \
                }
        @./mkconfig mcc200 ppc mpc5xxx mcc200
@@ -633,8 +636,21 @@ NETTA2_config:             unconfig
                 }
        @./mkconfig -a $(call xtract_NETTA2,$@) ppc mpc8xx netta2
 
-NC650_config:  unconfig
-       @./mkconfig $(@:_config=) ppc mpc8xx nc650
+NC650_Rev1_config \
+NC650_Rev2_config \
+CP850_config:  unconfig
+       @ >include/config.h
+       @[ -z "$(findstring CP850,$@)" ] || \
+                { echo "#define CONFIG_CP850 1" >>include/config.h ; \
+                  echo "#define CONFIG_IDS852_REV2 1" >>include/config.h ; \
+                }
+       @[ -z "$(findstring Rev1,$@)" ] || \
+                { echo "#define CONFIG_IDS852_REV1 1" >>include/config.h ; \
+                }
+       @[ -z "$(findstring Rev2,$@)" ] || \
+                { echo "#define CONFIG_IDS852_REV2 1" >>include/config.h ; \
+                }
+       @./mkconfig -a NC650 ppc mpc8xx nc650
 
 NX823_config:          unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx nx823
@@ -740,7 +756,8 @@ TQM850M_config              \
 TQM855M_config         \
 TQM860M_config         \
 TQM862M_config         \
-TQM866M_config:                unconfig
+TQM866M_config         \
+virtlab2_config:       unconfig
        @ >include/config.h
        @[ -z "$(findstring _LCD,$@)" ] || \
                { echo "#define CONFIG_LCD"             >>include/config.h ; \
@@ -902,6 +919,9 @@ p3p440_config:      unconfig
 PCI405_config: unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx pci405 esd
 
+pcs440ep_config:       unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx pcs440ep
+
 PIP405_config: unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx pip405 mpl
 
@@ -1280,9 +1300,6 @@ VoVPN-GW_100MHz_config:           unconfig
 ZPC1900_config: unconfig
        @./mkconfig $(@:_config=) ppc mpc8260 zpc1900
 
-#========================================================================
-# M68K
-#========================================================================
 #########################################################################
 ## Coldfire
 #########################################################################
@@ -1290,6 +1307,19 @@ ZPC1900_config: unconfig
 cobra5272_config :             unconfig
        @./mkconfig $(@:_config=) m68k mcf52x2 cobra5272
 
+EB+MCF-EV123_config :          unconfig
+       @ >include/config.h
+       @echo "TEXT_BASE = 0xFFE00000"|tee board/BuS/EB+MCF-EV123/textbase.mk
+       @./mkconfig EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
+
+EB+MCF-EV123_internal_config : unconfig
+       @ >include/config.h
+       @echo "TEXT_BASE = 0xF0000000"|tee board/BuS/EB+MCF-EV123/textbase.mk
+       @./mkconfig EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
+
+M5271EVB_config :              unconfig
+       @./mkconfig $(@:_config=) m68k mcf52x2 m5271evb
+
 M5272C3_config :               unconfig
        @./mkconfig $(@:_config=) m68k mcf52x2 m5272c3
 
@@ -1299,6 +1329,9 @@ M5282EVB_config :         unconfig
 TASREG_config :                unconfig
        @./mkconfig $(@:_config=) m68k mcf52x2 tasreg esd
 
+r5200_config :         unconfig
+       @./mkconfig $(@:_config=) m68k mcf52x2 r5200
+
 #########################################################################
 ## MPC83xx Systems
 #########################################################################
@@ -1313,20 +1346,6 @@ MPC8349EMDS_config:      unconfig
        @./mkconfig $(@:_config=) ppc mpc83xx mpc8349emds
 
 #########################################################################
-# BuS
-#########################################################################
-
-EB+MCF-EV123_config :          unconfig
-       @ >include/config.h
-       @echo "TEXT_BASE = 0xFFE00000"|tee board/BuS/EB+MCF-EV123/textbase.mk
-       @./mkconfig EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
-
-EB+MCF-EV123_internal_config : unconfig
-       @ >include/config.h
-       @echo "TEXT_BASE = 0xF0000000"|tee board/BuS/EB+MCF-EV123/textbase.mk
-       @./mkconfig EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
-
-#########################################################################
 ## MPC85xx Systems
 #########################################################################
 
@@ -1699,12 +1718,18 @@ innokom_config  :       unconfig
 ixdp425_config :       unconfig
        @./mkconfig $(@:_config=) arm ixp ixdp425
 
+ixdpg425_config        :       unconfig
+       @./mkconfig $(@:_config=) arm ixp ixdp425
+
 lubbock_config :       unconfig
        @./mkconfig $(@:_config=) arm pxa lubbock
 
 logodl_config  :       unconfig
        @./mkconfig $(@:_config=) arm pxa logodl
 
+pdnb3_config   :       unconfig
+       @./mkconfig $(@:_config=) arm ixp pdnb3 prodrive
+
 pxa255_idp_config:     unconfig
        @./mkconfig $(@:_config=) arm pxa pxa255_idp