summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-09-18 21:39:39 +0200
committerWolfgang Denk <wd@denx.de>2007-09-18 21:39:39 +0200
commit90a3af45a02d9a5886b689744315064b34dfd413 (patch)
tree0fc7ae7beb184d4198ff21d391f69260236925b9
parent135e19bc2773ebca487e9a8371f67e1ba202313a (diff)
parent8a783a65851bc7421ab69f442261215e21b8891a (diff)
Merge with git+ssh://gemini_vpn/home/wd/git/u-boot/master
-rw-r--r--Makefile2
-rw-r--r--include/configs/TQM85xx.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 011f730e3ae..e74ff361330 100644
--- a/Makefile
+++ b/Makefile
@@ -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
#########################################################################
diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index 2f23c504930..6dbd3924bdd 100644
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -449,7 +449,7 @@
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_EXTRA_ENV_SETTINGS \
- CFG_BOOTFILE \
+ "bootfile="CFG_BOOTFILE_PATH"\0" \
"netdev=eth0\0" \
"consdev=ttyS0\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \