* Patch by Rishi Bhattacharya, 08 May 2004:

[oweals/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index 7b84baf6291f16a0dca996350056187b23daba9c..d17f215be248d213848dc72be89318cdfe2f73f5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -417,19 +417,50 @@ NETPHONE_config:  unconfig
                 }
        @./mkconfig -a $(call xtract_NETPHONE,$@) ppc mpc8xx netphone
 
-xtract_NETTA = $(subst _ISDN,,$(subst _config,,$1))
+xtract_NETTA = $(subst _SWAPHOOK,,$(subst _6412,,$(subst _ISDN,,$(subst _config,,$1))))
 
+NETTA_ISDN_6412_SWAPHOOK_config \
+NETTA_ISDN_SWAPHOOK_config \
+NETTA_6412_SWAPHOOK_config \
+NETTA_SWAPHOOK_config \
+NETTA_ISDN_6412_config \
 NETTA_ISDN_config \
+NETTA_6412_config \
 NETTA_config:          unconfig
        @ >include/config.h
-       @[ -z "$(findstring NETTA_config,$@)" ] || \
+       @[ -z "$(findstring ISDN_,$@)" ] || \
+                { echo "#define CONFIG_NETTA_ISDN 1" >>include/config.h ; \
+                }
+       @[ -n "$(findstring ISDN_,$@)" ] || \
                 { echo "#undef CONFIG_NETTA_ISDN" >>include/config.h ; \
                 }
-       @[ -z "$(findstring NETTA_ISDN_config,$@)" ] || \
-                { echo "#define CONFIG_NETTA_ISDN 1" >>include/config.h ; \
+       @[ -z "$(findstring 6412_,$@)" ] || \
+                { echo "#define CONFIG_NETTA_6412 1" >>include/config.h ; \
+                }
+       @[ -n "$(findstring 6412_,$@)" ] || \
+                { echo "#undef CONFIG_NETTA_6412" >>include/config.h ; \
+                }
+       @[ -z "$(findstring SWAPHOOK_,$@)" ] || \
+                { echo "#define CONFIG_NETTA_SWAPHOOK 1" >>include/config.h ; \
+                }
+       @[ -n "$(findstring SWAPHOOK_,$@)" ] || \
+                { echo "#undef CONFIG_NETTA_SWAPHOOK" >>include/config.h ; \
                 }
        @./mkconfig -a $(call xtract_NETTA,$@) ppc mpc8xx netta
 
+xtract_NETTA2 = $(subst _V2,,$(subst _config,,$1))
+
+NETTA2_V2_config \
+NETTA2_config:         unconfig
+       @ >include/config.h
+       @[ -z "$(findstring NETTA2_config,$@)" ] || \
+                { echo "#define CONFIG_NETTA2_VERSION 1" >>include/config.h ; \
+                }
+       @[ -z "$(findstring NETTA2_V2_config,$@)" ] || \
+                { echo "#define CONFIG_NETTA2_VERSION 2" >>include/config.h ; \
+                }
+       @./mkconfig -a $(call xtract_NETTA2,$@) ppc mpc8xx netta2
+
 NX823_config:          unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx nx823
 
@@ -981,6 +1012,8 @@ xtract_trab = $(subst _bigram,,$(subst _bigflash,,$(subst _old,,$(subst _config,
 
 xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
 
+xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
+
 SX1_config :           unconfig
        @./mkconfig $(@:_config=) arm arm925t sx1
 
@@ -996,6 +1029,9 @@ versatile_config : unconfig
 omap1510inn_config :   unconfig
        @./mkconfig $(@:_config=) arm arm925t omap1510inn
 
+omap5912osk_config :   unconfig
+       @./mkconfig $(@:_config=) arm arm926ejs omap5912osk
+
 omap1610inn_config \
 omap1610inn_cs0boot_config \
 omap1610inn_cs3boot_config \
@@ -1011,6 +1047,18 @@ omap1610h2_cs3boot_config :      unconfig
        fi;
        @./mkconfig -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn
 
+omap730p2_config \
+omap730p2_cs0boot_config \
+omap730p2_cs3boot_config :     unconfig
+       @if [ "$(findstring _cs0boot_, $@)" ] ; then \
+               echo "#define CONFIG_CS0_BOOT" >> ./include/config.h ; \
+               echo "... configured for CS0 boot"; \
+       else \
+               echo "#define CONFIG_CS3_BOOT" >> ./include/config.h ; \
+               echo "... configured for CS3 boot"; \
+       fi;
+       @./mkconfig -a $(call xtract_omap730p2,$@) arm arm926ejs omap730p2
+
 smdk2400_config        :       unconfig
        @./mkconfig $(@:_config=) arm arm920t smdk2400