[PATCH] Merge Yosemite & Yellowstone board ports

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index b145be43f4c8e7e8f4ad0dc471ac1abd9e21312d..c2642df40e8a826823485885b911159bc50c6d61 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,8 @@
 #
 
 VERSION = 1
-PATCHLEVEL = 1
-SUBLEVEL = 6
+PATCHLEVEL = 2
+SUBLEVEL = 0
 EXTRAVERSION =
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 VERSION_FILE = $(obj)include/version_autogenerated.h
@@ -557,6 +557,7 @@ Total5200_Rev2_lowboot_config:      unconfig
        @$(MKCONFIG) -a Total5200 ppc mpc5xxx total5200
 
 cam5200_config \
+cam5200_niosflash_config \
 fo300_config \
 MiniFAP_config \
 TQM5200S_config \
@@ -574,6 +575,10 @@ TQM5200_STK100_config:     unconfig
                  echo "#define CONFIG_TQM5200_B"       >>$(obj)include/config.h ; \
                  echo "... TQM5200S on Cam5200" ; \
                }
+       @[ -z "$(findstring niosflash,$@)" ] || \
+               { echo "#define CONFIG_CAM5200_NIOSFLASH"       >>$(obj)include/config.h ; \
+                 echo "... with NIOS flash driver" ; \
+               }
        @[ -z "$(findstring fo300,$@)" ] || \
                { echo "#define CONFIG_FO300"   >>$(obj)include/config.h ; \
                  echo "... TQM5200 on FO300" ; \
@@ -597,6 +602,8 @@ TQM5200_STK100_config:      unconfig
                { echo "TEXT_BASE = 0xFFF00000" >$(obj)board/tqm5200/config.tmp ; \
                }
        @$(MKCONFIG) -n $@ -a TQM5200 ppc mpc5xxx tqm5200
+uc101_config:         unconfig
+       @$(MKCONFIG) uc101 ppc mpc5xxx uc101
 
 #########################################################################
 ## MPC8xx Systems
@@ -1193,10 +1200,16 @@ sequoia_nand_config:    unconfig
        @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/sequoia/config.tmp
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 
+sc3_config:unconfig
+       @./mkconfig $(@:_config=) ppc ppc4xx sc3
+
 sycamore_config:       unconfig
        @echo "Configuring for sycamore board as subset of walnut..."
        @$(MKCONFIG) -a walnut ppc ppc4xx walnut amcc
 
+taishan_config:        unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx taishan amcc
+
 VOH405_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx voh405 esd
 
@@ -1223,7 +1236,10 @@ yosemite_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx yosemite amcc
 
 yellowstone_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx yellowstone amcc
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_YELLOWSTONE" > $(obj)include/config.h
+       @echo "Configuring for yellowstone board as subset of yosemite..."
+       @$(MKCONFIG) -a yosemite ppc ppc4xx yosemite amcc
 
 yucca_config:  unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx yucca amcc
@@ -2053,8 +2069,15 @@ pleb2_config     :       unconfig
 logodl_config  :       unconfig
        @$(MKCONFIG) $(@:_config=) arm pxa logodl
 
-pdnb3_config   :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm ixp pdnb3 prodrive
+pdnb3_config \
+scpu_config:    unconfig
+       @if [ "$(findstring scpu_,$@)" ] ; then \
+               echo "#define CONFIG_SCPU"      >>include/config.h ; \
+               echo "... on SCPU board variant" ; \
+       else \
+               >include/config.h ; \
+       fi
+       @$(MKCONFIG) -a pdnb3 arm ixp pdnb3 prodrive
 
 pxa255_idp_config:     unconfig
        @$(MKCONFIG) $(@:_config=) arm pxa pxa255_idp