diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-09-18 12:24:57 -0600 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-09-18 21:24:59 +0200 |
| commit | 8a783a65851bc7421ab69f442261215e21b8891a (patch) | |
| tree | 4e365db198d679c8f379b6bb40a3af985b0d8c86 | |
| parent | 67c31036acaaaa992fc346cc89db0909a7e733c4 (diff) | |
| download | u-boot-imx-8a783a65851bc7421ab69f442261215e21b8891a.zip u-boot-imx-8a783a65851bc7421ab69f442261215e21b8891a.tar.gz u-boot-imx-8a783a65851bc7421ab69f442261215e21b8891a.tar.bz2 | |
Bugfix: remove embedded null (\0) from CFG_BOOTFILE macro in TQM8540_config
/bin/bash and /bin/dash (which /bin/sh is linked to on ubuntu) handle embedded
nulls in a string differently. For example, the following statement:
echo "this is a string\0" > afile
Will produce the following with /bin/bash:
"this is a string\0"
But with /bin/dash, will produce:
"this is a string
Bug fixed by moving the embedded null out of the makefile and into the
config header. Also renamed the macro to avoid usage colision with the same
macro used by other board ports.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| -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 " \ |