diff options
author | Stefan Roese <sr@denx.de> | 2007-01-13 08:01:31 +0100 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-01-13 08:01:31 +0100 |
commit | 44cd6de2e1b0cdff76bf8c85a1c93c6844da62fd (patch) | |
tree | 9eee07aed4b22b114a2527ab24594df4b1e3d451 /Makefile | |
parent | 95981778cff0038fd9941044d6a3eda810e33258 (diff) | |
parent | 6abaee42621c07e81a2cd189ad4368b5e8c50280 (diff) | |
download | blackbird-obmc-uboot-44cd6de2e1b0cdff76bf8c85a1c93c6844da62fd.tar.gz blackbird-obmc-uboot-44cd6de2e1b0cdff76bf8c85a1c93c6844da62fd.zip |
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx-merge-sr
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -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" ; \ |