Merge with /home/hs/MAN/u-boot-dev

[oweals/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index 6b1c4793b6bd684bfcac8129d4d3880ac822ec82..aa6266f3f659a70d9d5dcd91eb7ab9695e639336 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" ; \
@@ -1541,6 +1546,9 @@ TQM8265_AA_config:  unconfig
        fi
        @$(MKCONFIG) -a TQM8260 ppc mpc8260 tqm8260
 
+TQM8272_config: unconfig
+       @$(MKCONFIG) -a TQM8272 ppc mpc8260 tqm8272
+
 VoVPN-GW_66MHz_config  \
 VoVPN-GW_100MHz_config:                unconfig
        @mkdir -p $(obj)include
@@ -1571,6 +1579,9 @@ EB+MCF-EV123_internal_config :    unconfig
        @echo "TEXT_BASE = 0xF0000000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk
        @$(MKCONFIG) EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
 
+idmr_config :                  unconfig
+       @$(MKCONFIG) $(@:_config=) m68k mcf52x2 idmr
+
 M5271EVB_config :              unconfig
        @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5271evb