Patches by Pantelis Antoniou, 30 Mar 2004:

[oweals/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index 9c291da339646e645eadbd991015e6ab0d2e3ba6..1a9116a2307abfb77345ef79268fdd31f3d8a2e8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -187,7 +187,7 @@ endif
 #########################################################################
 
 unconfig:
-       rm -f include/config.h include/config.mk board/*/config.tmp
+       @rm -f include/config.h include/config.mk board/*/config.tmp
 
 #========================================================================
 # PowerPC
@@ -217,13 +217,17 @@ icecube_5200_config               \
 IceCube_5200_config            \
 IceCube_5100_config:           unconfig
        @ >include/config.h
-       @[ -z "$(findstring LOWBOOT,$@)" ] || \
-               { echo "TEXT_BASE = 0xFF000000" >board/icecube/config.tmp ; \
+       @[ -z "$(findstring LOWBOOT_,$@)" ] || \
+               { if [ "$(findstring DDR,$@)" ] ; \
+                       then echo "TEXT_BASE = 0xFF800000" >board/icecube/config.tmp ; \
+                       else echo "TEXT_BASE = 0xFF000000" >board/icecube/config.tmp ; \
+                 fi ; \
                  echo "... with LOWBOOT configuration" ; \
                }
        @[ -z "$(findstring LOWBOOT08,$@)" ] || \
                { echo "TEXT_BASE = 0xFF800000" >board/icecube/config.tmp ; \
                  echo "... with 8 MB flash only" ; \
+                 echo "... with LOWBOOT configuration" ; \
                }
        @[ -z "$(findstring DDR,$@)" ] || \
                { echo "#define CONFIG_MPC5200_DDR"     >>include/config.h ; \
@@ -394,6 +398,22 @@ NETVIA_config:             unconfig
                 }
        @./mkconfig -a $(call xtract_NETVIA,$@) ppc mpc8xx netvia
 
+NETPHONE_config:       unconfig
+       @./mkconfig $(@:_config=) ppc mpc8xx netphone
+
+xtract_NETTA = $(subst _ISDN,,$(subst _config,,$1))
+
+NETTA_ISDN_config \
+NETTA_config:          unconfig
+       @ >include/config.h
+       @[ -z "$(findstring NETTA_config,$@)" ] || \
+                { echo "#undef CONFIG_NETTA_ISDN" >>include/config.h ; \
+                }
+       @[ -z "$(findstring NETTA_ISDN_config,$@)" ] || \
+                { echo "#define CONFIG_NETTA_ISDN 1" >>include/config.h ; \
+                }
+       @./mkconfig -a $(call xtract_NETTA,$@) ppc mpc8xx netta
+
 NX823_config:          unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx nx823
 
@@ -748,8 +768,23 @@ hymod_config:      unconfig
 IPHASE4539_config:     unconfig
        @./mkconfig $(@:_config=) ppc mpc8260 iphase4539
 
-MPC8260ADS_config:     unconfig
-       @./mkconfig $(@:_config=) ppc mpc8260 mpc8260ads
+MPC8260ADS_config      \
+MPC8260ADS_33MHz_config        \
+MPC8260ADS_40MHz_config        \
+MPC8272ADS_config      \
+PQ2FADS_config         \
+PQ2FADS-VR_config      \
+PQ2FADS-ZU_config      \
+PQ2FADS-ZU_66MHz_config        \
+       :               unconfig
+       $(if $(findstring PQ2FADS,$@), \
+       @echo "#define CONFIG_ADSTYPE CFG_PQ2FADS" > include/config.h, \
+       @echo "#define CONFIG_ADSTYPE CFG_"$(subst MPC,,$(word 1,$(subst _, ,$@))) > include/config.h)
+       $(if $(findstring MHz,$@), \
+       @echo "#define CONFIG_8260_CLKIN" $(subst MHz,,$(word 2,$(subst _, ,$@)))"000000" >> include/config.h, \
+       $(if $(findstring VR,$@), \
+       @echo "#define CONFIG_8260_CLKIN 66000000" >> include/config.h))
+       @./mkconfig -a MPC8260ADS ppc mpc8260 mpc8260ads
 
 MPC8266ADS_config:     unconfig
        @./mkconfig $(@:_config=) ppc mpc8260 mpc8266ads