| Submitter | Mike Frysinger |
|---|---|
| Date | Oct. 13, 2011, 5:47 a.m. |
| Message ID | <1318484871-12852-1-git-send-email-vapier@gentoo.org> |
| Download | mbox | patch |
| Permalink | /patch/119356/ |
| State | Accepted |
| Commit | 3a2b9f28c02884157ffd99e2d80454182242410d |
| Delegated to: | Anatolij Gustschin |
| Headers | show |
Comments
On 10/13/2011 07:47 AM, Mike Frysinger wrote: > I don't know what exactly the code was going for, but the object code > is the same before/after my change, and in looking at the env strings, > this seems to be OK. > > Otherwise gcc warns: > cc1: warning: unknown escape sequence: '\$' > cc1: warning: unknown escape sequence: '\)' > cc1: warning: unknown escape sequence: '\040' > cc1: warning: unknown escape sequence: '\$' > cc1: warning: unknown escape sequence: '\)' Thanks for fixing this. Do you want me to run it through the sparc repository or should Wolfgang take the two patches right away? Daniel > Signed-off-by: Mike Frysinger<vapier@gentoo.org> > --- > include/configs/gr_cpci_ax2000.h | 2 +- > include/configs/gr_ep2s60.h | 2 +- > include/configs/gr_xc3s_1500.h | 2 +- > include/configs/grsim.h | 2 +- > include/configs/grsim_leon2.h | 2 +- > 5 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h > index a127a2b..992aea5 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 643efc4..d1fcf3b 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 e13299e..1d804f8 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 f868d96..73bd494 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 ed1008f..75e9605 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" \ > ""
On Thursday 13 October 2011 04:49:59 Daniel Hellstrom wrote: > On 10/13/2011 07:47 AM, Mike Frysinger wrote: > > I don't know what exactly the code was going for, but the object code > > is the same before/after my change, and in looking at the env strings, > > this seems to be OK. > > > > Otherwise gcc warns: > > cc1: warning: unknown escape sequence: '\$' > > cc1: warning: unknown escape sequence: '\)' > > cc1: warning: unknown escape sequence: '\040' > > cc1: warning: unknown escape sequence: '\$' > > cc1: warning: unknown escape sequence: '\)' > > Thanks for fixing this. Do you want me to run it through the sparc > repository or should Wolfgang take the two patches right away? they're not critical, so feel free to merge however you like -mike
On Thu, 13 Oct 2011 01:47:51 -0400 Mike Frysinger <vapier@gentoo.org> wrote: > I don't know what exactly the code was going for, but the object code > is the same before/after my change, and in looking at the env strings, > this seems to be OK. > > Otherwise gcc warns: > cc1: warning: unknown escape sequence: '\$' > cc1: warning: unknown escape sequence: '\)' > cc1: warning: unknown escape sequence: '\040' > cc1: warning: unknown escape sequence: '\$' > cc1: warning: unknown escape sequence: '\)' > > Signed-off-by: Mike Frysinger <vapier@gentoo.org> > --- > include/configs/gr_cpci_ax2000.h | 2 +- > include/configs/gr_ep2s60.h | 2 +- > include/configs/gr_xc3s_1500.h | 2 +- > include/configs/grsim.h | 2 +- > include/configs/grsim_leon2.h | 2 +- > 5 files changed, 5 insertions(+), 5 deletions(-) Appied to u-boot-staging/agust@denx.de. Thanks! Anatolij
Patch
diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h index a127a2b..992aea5 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 643efc4..d1fcf3b 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 e13299e..1d804f8 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 f868d96..73bd494 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 ed1008f..75e9605 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" \ ""
I don't know what exactly the code was going for, but the object code is the same before/after my change, and in looking at the env strings, this seems to be OK. Otherwise gcc warns: cc1: warning: unknown escape sequence: '\$' cc1: warning: unknown escape sequence: '\)' cc1: warning: unknown escape sequence: '\040' cc1: warning: unknown escape sequence: '\$' cc1: warning: unknown escape sequence: '\)' Signed-off-by: Mike Frysinger <vapier@gentoo.org> --- include/configs/gr_cpci_ax2000.h | 2 +- include/configs/gr_ep2s60.h | 2 +- include/configs/gr_xc3s_1500.h | 2 +- include/configs/grsim.h | 2 +- include/configs/grsim_leon2.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)