make-asm-offsets: fix sed script
PATCH 1/1 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.
--- tools/scripts/make-asm-offsets | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
tools/scripts/make-asm-offsets +2 -2
@@ -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
Signature · 1 line
1.7.2.3
PATCH 1/1 make-asm-offsets: fix sed script
Hello Wolfgang,
Quoted 8 lines · Wolfgang Denk
When copying the "sed" script to generate the
asm-offsets.hfile from the LinuxKbuildscript 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 generatedasm-offsets.hwas not correct.
Quoted 4 lines
Signed-off-by Wolfgang Denk <[email protected]>--- tools/scripts/make-asm-offsets | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Tested on the omap3_beagle board, so:
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 1/1 make-asm-offsets: fix sed script
In reply to Wolfgang DenkQuoted 9 lines · Wolfgang Denk
When copying the "sed" script to generate the
asm-offsets.hfile from the LinuxKbuildscript 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 generatedasm-offsets.hwas not correct.Signed-off-by Wolfgang Denk <[email protected]>
Applies cleanly to 79e63139368eb7233b738d3d5a0df018a1287e3b ofgit://git.denx.de/u-boot.git and fixes da850evm build there since 25ddd1fb0a2281b182529afbc8fda5de2dc16d96.
Tested on da850evm with NAND, env.oob and tftp.
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
Wolfgang Denk
AppliedPATCH 1/1 make-asm-offsets: fix sed script
In reply to Wolfgang DenkQuoted 8 lines · In message <[email protected]> you wrote:
When copying the "sed" script to generate the
asm-offsets.hfile from the LinuxKbuildscript 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 generatedasm-offsets.hwas not correct.
Quoted 4 lines
Signed-off-by Wolfgang Denk <[email protected]>--- tools/scripts/make-asm-offsets | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Applied.
Best regards,
Wolfgang Denk
Signature · 13 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"None of our men are "experts." We have most unfortunately found it
necessary to get rid of a man as soon as he thinks himself an expert
-- because no one ever considers himself expert if he really knows
his job. A man who knows a job sees so much more to be done than he
has done, that he is always pressing forward and never gives up an
instant of thought to how good and how efficient he is. Thinking
always ahead, thinking always of trying to do more, brings a state of
mind in which nothing is impossible. The moment one gets into the
"expert" state of mind a great number of things become impossible."
- From Henry Ford Sr., "My Life and Work," p. 86 (1922)