Merge branch 'master' of http://www.denx.de/git/u-boot

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

diff --git a/Makefile b/Makefile
index 2eec40d..8cc2664 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -328,6 +328,7 @@ lite5200b_LOWBOOT_config:   unconfig
 mcc200_config  \
 mcc200_SDRAM   \
 mcc200_highboot        \
+mcc200_COM12   \
 mcc200_highboot_SDRAM: unconfig
        @ >include/config.h
        @[ -n "$(findstring highboot,$@)" ] || \
@@ -344,6 +345,10 @@ mcc200_highboot_SDRAM:     unconfig
                { echo "#define CONFIG_MCC200_SDRAM"    >>include/config.h ; \
                  echo "... with SDRAM" ; \
                }
+       @[ -z "$(findstring COM12,$@)" ] || \
+               { echo "#define CONFIG_CONSOLE_COM12"   >>include/config.h ; \
+                 echo "... with console on COM12" ; \
+               }
        @./mkconfig -a mcc200 ppc mpc5xxx mcc200
 
 o2dnt_config:
@@ -415,25 +420,30 @@ Total5200_Rev2_lowboot_config:    unconfig
                }
        @./mkconfig -a Total5200 ppc mpc5xxx total5200
 
-TQM5200_config \
-TQM5200_B_config \
-TQM5200_B_HIGHBOOT_config \
+cam5200_config \
+fo300_config \
+MiniFAP_config \
 TQM5200S_config \
 TQM5200S_HIGHBOOT_config \
-TQM5200_STK100_config \
-cam5200_config \
-MiniFAP_config:        unconfig
+TQM5200_B_config \
+TQM5200_B_HIGHBOOT_config \
+TQM5200_config \
+TQM5200_STK100_config: unconfig
        @ >include/config.h
-       @[ -z "$(findstring MiniFAP,$@)" ] || \
-               { echo "#define CONFIG_MINIFAP" >>include/config.h ; \
-                 echo "... TQM5200_AC on MiniFAP" ; \
-               }
        @[ -z "$(findstring cam5200,$@)" ] || \
                { echo "#define CONFIG_CAM5200" >>include/config.h ; \
                  echo "#define CONFIG_TQM5200S"        >>include/config.h ; \
                  echo "#define CONFIG_TQM5200_B"       >>include/config.h ; \
                  echo "... TQM5200S on Cam5200" ; \
                }
+       @[ -z "$(findstring fo300,$@)" ] || \
+               { echo "#define CONFIG_FO300"   >>include/config.h ; \
+                 echo "... TQM5200 on FO300" ; \
+               }
+       @[ -z "$(findstring MiniFAP,$@)" ] || \
+               { echo "#define CONFIG_MINIFAP" >>include/config.h ; \
+                 echo "... TQM5200_AC on MiniFAP" ; \
+               }
        @[ -z "$(findstring STK100,$@)" ] || \
                { echo "#define CONFIG_STK52XX_REV100"  >>include/config.h ; \
                  echo "... on a STK52XX.100 base board" ; \