diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-09-18 21:39:39 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-09-18 21:39:39 +0200 |
| commit | 90a3af45a02d9a5886b689744315064b34dfd413 (patch) | |
| tree | 0fc7ae7beb184d4198ff21d391f69260236925b9 | |
| parent | 135e19bc2773ebca487e9a8371f67e1ba202313a (diff) | |
| parent | 8a783a65851bc7421ab69f442261215e21b8891a (diff) | |
| download | u-boot-imx-90a3af45a02d9a5886b689744315064b34dfd413.zip u-boot-imx-90a3af45a02d9a5886b689744315064b34dfd413.tar.gz u-boot-imx-90a3af45a02d9a5886b689744315064b34dfd413.tar.bz2 | |
Merge with git+ssh://gemini_vpn/home/wd/git/u-boot/master
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | include/configs/TQM85xx.h | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 2f23c50..6dbd392 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 " \ |