summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-12-05 23:33:48 +0100
committerWolfgang Denk <wd@denx.de>2011-12-05 23:33:48 +0100
commitd194837fc3042d943ba088fcc221d534330b2872 (patch)
tree4ab6098374e2c02fb99f3672a23c271fd5ade89f /include
parent2157497615696c41512d857478158f8546942d70 (diff)
parent7717fe10bd61e16790d4605505100a2f8f632f02 (diff)
downloadu-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')
-rw-r--r--include/configs/gr_cpci_ax2000.h2
-rw-r--r--include/configs/gr_ep2s60.h2
-rw-r--r--include/configs/gr_xc3s_1500.h2
-rw-r--r--include/configs/grsim.h2
-rw-r--r--include/configs/grsim_leon2.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index e837f40..dd6c41d 100644
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -108,7 +108,7 @@
"bootm ${kernel_addr}\0" \
"flash_self=run ramargs addip;" \
"bootm ${kernel_addr} ${ramdisk_addr}\0" \
- "getkernel=tftpboot \$\(scratch\)\ \$\(bootfile\)\0" \
+ "getkernel=tftpboot $(scratch) $(bootfile)\0" \
"bootargs=console=ttyS0,38400 root=/dev/nfs rw nfsroot=192.168.0.20:/export/rootfs ip=192.168.0.206:192.168.0.20:192.168.0.1:255.255.255.0:ax2000:eth0\0"
#if CONFIG_LEON_RAM_SELECT == CONFIG_LEON_RAM_SRAM
diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index 0cddeee..7068ff8 100644
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -115,7 +115,7 @@
"bootm ${kernel_addr} ${ramdisk_addr}\0" \
"net_nfs=tftp 40000000 ${bootfile};run nfsargs addip;bootm\0" \
"scratch=40800000\0" \
- "getkernel=tftpboot \$\(scratch\)\ \$\(bootfile\)\0" \
+ "getkernel=tftpboot $(scratch) $(bootfile)\0" \
"bootargs=console=ttyS0,38400 root=/dev/nfs rw nfsroot=192.168.0.20:/export/rootfs ip=192.168.0.207:192.168.0.20:192.168.0.1:255.255.255.0:ml401:eth0\0" \
""
diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index 7e8e6f5..5006322 100644
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -91,7 +91,7 @@
"bootm ${kernel_addr} ${ramdisk_addr}\0" \
"net_nfs=tftp 40000000 ${bootfile};run nfsargs addip;bootm\0" \
"scratch=40200000\0" \
- "getkernel=tftpboot \$\(scratch\)\ \$\(bootfile\)\0" \
+ "getkernel=tftpboot $(scratch) $(bootfile)\0" \
"bootargs=console=ttyS0,38400 root=/dev/nfs rw nfsroot=192.168.0.20:/export/rootfs ip=192.168.0.206:192.168.0.20:192.168.0.1:255.255.255.0:grxc3s1500_daniel:eth0\0" \
""
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" \
""
diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index 88d2aad..fb9a3f9 100644
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -110,7 +110,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" \
""