* Patch by Fred Klatt, 25 Jun 2004:

[oweals/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index d8b8c7bd5f61ab8f9f31b2762d1bbe6bd1ae857e..516ae69a7ce94187f4a1e9d0f40541ac92a3ef3f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -276,15 +276,12 @@ PM520_ROMBOOT_DDR_config: unconfig
 
 Adder_config    \
 Adder87x_config \
-Adder852_config \
+AdderII_config  \
        :               unconfig
-       $(if $(findstring 852,$@), \
+       $(if $(findstring AdderII,$@), \
        @echo "#define CONFIG_MPC852T" > include/config.h)
        @./mkconfig -a Adder ppc mpc8xx adder
 
-AdderII_config:        unconfig
-       @./mkconfig $(@:_config=) ppc mpc8xx adderII
-
 ADS860_config     \
 FADS823_config    \
 FADS850SAR_config \
@@ -606,7 +603,7 @@ wtk_config: unconfig
 #########################################################################
 ## PPC4xx Systems
 #########################################################################
-xtract_4xx = $(subst _MODEL_BA,,$(subst _MODEL_ME,,$(subst _MODEL_HI,,$(subst _config,,$1))))
+xtract_4xx = $(subst _25,,$(subst _33,,$(subst _BA,,$(subst _ME,,$(subst _HI,,$(subst _config,,$1))))))
 
 ADCIOP_config: unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx adciop esd
@@ -706,10 +703,12 @@ PLU405_config:    unconfig
 PMC405_config: unconfig
        @./mkconfig $(@:_config=) ppc ppc4xx pmc405 esd
 
-PPChameleonEVB_MODEL_BA_config \
-PPChameleonEVB_MODEL_ME_config \
-PPChameleonEVB_MODEL_HI_config \
-PPChameleonEVB_config: unconfig
+PPChameleonEVB_BA_25_config    \
+PPChameleonEVB_ME_25_config    \
+PPChameleonEVB_HI_25_config    \
+PPChameleonEVB_BA_33_config    \
+PPChameleonEVB_ME_33_config    \
+PPChameleonEVB_HI_33_config:   unconfig
        @ >include/config.h
        @[ -z "$(findstring _MODEL_BA,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 0" >>include/config.h ; \
@@ -723,6 +722,14 @@ PPChameleonEVB_config:     unconfig
                { echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 2" >>include/config.h ; \
                  echo "... HIGH-END model" ; \
                }
+       @[ -z "$(findstring _25,$@)" ] || \
+               { echo "#define CONFIG_PPCHAMELEON_CLK_25" >>include/config.h ; \
+                 echo " SysClk = 25MHz" ; \
+               }
+       @[ -z "$(findstring _33,$@)" ] || \
+               { echo "#define CONFIG_PPCHAMELEON_CLK_33" >>include/config.h ; \
+                 echo " SysClk = 33MHz" ; \
+               }
        @./mkconfig -a $(call xtract_4xx,$@) ppc ppc4xx PPChameleonEVB dave
 
 VOH405_config: unconfig
@@ -994,15 +1001,26 @@ M5282EVB_config :                unconfig
 ## MPC85xx Systems
 #########################################################################
 
-MPC8540ADS_config:      unconfig
+MPC8540ADS_config:     unconfig
        @./mkconfig $(@:_config=) ppc mpc85xx mpc8540ads
 
-MPC8560ADS_config:      unconfig
+MPC8560ADS_config:     unconfig
        @./mkconfig $(@:_config=) ppc mpc85xx mpc8560ads
 
-stxgp3_config:      unconfig
+stxgp3_config:         unconfig
        @./mkconfig $(@:_config=) ppc mpc85xx stxgp3
 
+SBC8560_33_config \
+SBC8560_66_config:      unconfig
+       @if [ "$(findstring _66_,$@)" ] ; then \
+               echo "#define CONFIG_PCI_66"  >>include/config.h ; \
+               echo "... 66 MHz PCI" ; \
+       else \
+               >include/config.h ; \
+               echo "... 33 MHz PCI" ; \
+       fi
+       @./mkconfig -a SBC8560 ppc mpc85xx sbc8560
+
 #########################################################################
 ## 74xx/7xx Systems
 #########################################################################
@@ -1183,6 +1201,9 @@ impa7_config      :       unconfig
 modnet50_config :      unconfig
        @./mkconfig $(@:_config=) arm arm720t modnet50
 
+evb4510_config :       unconfig
+       @./mkconfig $(@:_config=) arm arm720t evb4510
+
 #########################################################################
 ## AT91RM9200 Systems
 #########################################################################