[U-Boot] [PATCH] make-asm-offsets: fix sed script
When copying the "sed" script to generate the asm-offsets.h file from the Linux Kbuild script into the make-asm-offsets file I missed the fact that the former runs in a "make" context and thus uses double "$$" to escape a single "$", while the latter is a shell script, where this must not be done. Unfortunately the problem did not show up during the initial tests on Power Architecture systems, but on ARM the generated asm-offsets.h was not correct.
Signed-off-by: Wolfgang Denk wd@denx.de --- tools/scripts/make-asm-offsets | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/scripts/make-asm-offsets b/tools/scripts/make-asm-offsets index 61c095f..4c33756 100755 --- a/tools/scripts/make-asm-offsets +++ b/tools/scripts/make-asm-offsets @@ -8,8 +8,8 @@ mkdir -p $(dirname $2)
# Default sed regexp - multiline due to syntax constraints SED_CMD="/^->/{s:->#(.*):/* \1 */:; \ - s:^->([^ ]*) [$$#]*([-0-9]*) (.*):#define \1 (\2) /* \3 */:; \ - s:^->([^ ]*) [$$#]*([^ ]*) (.*):#define \1 \2 /* \3 */:; \ + s:^->([^ ]*) [$#]*([-0-9]*) (.*):#define \1 (\2) /* \3 */:; \ + s:^->([^ ]*) [$#]*([^ ]*) (.*):#define \1 \2 /* \3 */:; \ s:->::; p;}"
(set -e
Hello Wolfgang,
Wolfgang Denk wrote:
When copying the "sed" script to generate the asm-offsets.h file from the Linux Kbuild script into the make-asm-offsets file I missed the fact that the former runs in a "make" context and thus uses double "$$" to escape a single "$", while the latter is a shell script, where this must not be done. Unfortunately the problem did not show up during the initial tests on Power Architecture systems, but on ARM the generated asm-offsets.h was not correct.
Signed-off-by: Wolfgang Denk wd@denx.de
tools/scripts/make-asm-offsets | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Tested on the omap3_beagle board, so:
Tested-by: Heiko Schocher hs@denx.de
bye, Heiko
On Wed, Oct 27, 2010 at 2:37 AM, Wolfgang Denk wd@denx.de wrote:
When copying the "sed" script to generate the asm-offsets.h file from the Linux Kbuild script into the make-asm-offsets file I missed the fact that the former runs in a "make" context and thus uses double "$$" to escape a single "$", while the latter is a shell script, where this must not be done. Unfortunately the problem did not show up during the initial tests on Power Architecture systems, but on ARM the generated asm-offsets.h was not correct.
Signed-off-by: Wolfgang Denk wd@denx.de
Applies cleanly to 79e63139368eb7233b738d3d5a0df018a1287e3b of git://git.denx.de/u-boot.git and fixes da850evm build there since 25ddd1fb0a2281b182529afbc8fda5de2dc16d96.
Tested on da850evm with NAND, env.oob and tftp.
Tested-by: Ben Gardiner bengardiner@nanometrics.ca
Best Regards, Ben Gardiner
--- Nanometrics Inc. http://www.nanometrics.ca
In message 1288161467-2979-1-git-send-email-wd@denx.de you wrote:
When copying the "sed" script to generate the asm-offsets.h file from the Linux Kbuild script into the make-asm-offsets file I missed the fact that the former runs in a "make" context and thus uses double "$$" to escape a single "$", while the latter is a shell script, where this must not be done. Unfortunately the problem did not show up during the initial tests on Power Architecture systems, but on ARM the generated asm-offsets.h was not correct.
Signed-off-by: Wolfgang Denk wd@denx.de
tools/scripts/make-asm-offsets | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Applied.
Best regards,
Wolfgang Denk
participants (3)
-
Ben Gardiner -
Heiko Schocher -
Wolfgang Denk