diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-05 23:33:48 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-05 23:33:48 +0100 |
| commit | d194837fc3042d943ba088fcc221d534330b2872 (patch) | |
| tree | 4ab6098374e2c02fb99f3672a23c271fd5ade89f /include/configs/grsim.h | |
| parent | 2157497615696c41512d857478158f8546942d70 (diff) | |
| parent | 7717fe10bd61e16790d4605505100a2f8f632f02 (diff) | |
| download | u-boot-imx-d194837fc3042d943ba088fcc221d534330b2872.zip u-boot-imx-d194837fc3042d943ba088fcc221d534330b2872.tar.gz u-boot-imx-d194837fc3042d943ba088fcc221d534330b2872.tar.bz2 | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
Makefile: add tools/mkenvimage to target 'clean'
mv_common.c: get rid of 'defined but not used' warning
m68k: fix ambiguous bit testing
sparc: fix unknown escape sequence warnings
sparc: fix unused variable warnings
sf: fix erase debug output
Diffstat (limited to 'include/configs/grsim.h')
| -rw-r--r-- | include/configs/grsim.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/grsim.h b/include/configs/grsim.h index c14749b..f3639dd 100644 --- a/include/configs/grsim.h +++ b/include/configs/grsim.h @@ -113,7 +113,7 @@ "net_nfs=tftp 40000000 ${bootfile};run nfsargs addip;bootm\0" \ "rootpath=/export/roofs\0" \ "scratch=40000000\0" \ - "getkernel=tftpboot \$\(scratch\)\ \$\(bootfile\)\0" \ + "getkernel=tftpboot $(scratch) $(bootfile)\0" \ "ethaddr=00:00:7A:CC:00:12\0" \ "bootargs=console=ttyS0,38400" \ "" |