diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2007-10-04 11:00:44 +0100 |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2007-10-04 11:00:44 +0100 |
| commit | e81a95a9e7cb68ab611e074cd65790015520ea99 (patch) | |
| tree | 8ca6d8dc1ec2d6db1f4fdabdb17baf5ad9c37650 /Makefile | |
| parent | bd86220f58b99d6896198c385fda132f0c980915 (diff) | |
| parent | 527c80f012030fa0b51f8594847ec56c9317e9b1 (diff) | |
| download | talos-obmc-uboot-e81a95a9e7cb68ab611e074cd65790015520ea99.tar.gz talos-obmc-uboot-e81a95a9e7cb68ab611e074cd65790015520ea99.zip | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -24,7 +24,7 @@ VERSION = 1 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -rc1 +EXTRAVERSION = -rc2 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) VERSION_FILE = $(obj)include/version_autogenerated.h @@ -319,7 +319,7 @@ updater: env: $(MAKE) -C tools/env all || exit 1 -depend dep: +depend dep: version for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir _depend ; done tags ctags: @@ -1961,7 +1961,7 @@ TQM8560_config: unconfig echo "#define CONFIG_TQM$${CTYPE}">>$(obj)include/config.h; \ echo "#define CONFIG_HOSTNAME tqm$${CTYPE}">>$(obj)include/config.h; \ echo "#define CONFIG_BOARDNAME \"TQM$${CTYPE}\"">>$(obj)include/config.h; \ - echo "#define CFG_BOOTFILE \"bootfile=/tftpboot/tqm$${CTYPE}/uImage\0\"">>$(obj)include/config.h + echo "#define CFG_BOOTFILE_PATH \"/tftpboot/tqm$${CTYPE}/uImage\"">>$(obj)include/config.h @$(MKCONFIG) -a TQM85xx ppc mpc85xx tqm85xx ######################################################################### |
