[PATCH][TOOLS] firmware: fix romimage generation

["Christoph Egger" <Christoph.Egger@amd.com>]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]


Hi!

Attached patch makes the following changes:
- portability fix in Makefile: mkhex is not bash specific
- GNU od separates column with one blank, BSD od uses eight blanks.
  Change sed to deal with this.
- Add a fourth sed to fix the following build error on NetBSD:

gcc -I../../../tools/libxc -I. -m32 -march=i686 -DNDEBUG -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototyp
es -Wno-unused-value -Wdeclaration-after-statement  -D__XEN_TOOLS__  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -
mno-tls-direct-seg-refs  -fno-stack-protector  -fno-builtin -O2 -msoft-float -c 
hvmloader.c mp_tables.c util.c s
mbios.c 32bitbios_support.c
In file included from 32bitbios_support.c:33:
../rombios/32bit/32bitbios_flat.h:818:13: error: invalid suffix "x" on integer 
constant

- Add a fifth sed to eliminate the offset column (= 1st column) printed in the 
last line. Example:

od -v -t x ../rombios/BIOS-bochs-latest | less
<last 3 lines>
0177740 00000000 00000000 00000000 00000000
0177760 00e05bea 2f3630f0 392f3332 12fc0039
0200000     <-- Eliminate this


Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

P.S.: Is there a reason for having mkhex twice?


-- 
AMD Saxony, Dresden, Germany
Operating System Research Center

Legal Information:
AMD Saxony Limited Liability Company & Co. KG
Sitz (Geschäftsanschrift):
   Wilschdorfer Landstr. 101, 01109 Dresden, Deutschland
Registergericht Dresden: HRA 4896
vertretungsberechtigter Komplementär:
   AMD Saxony LLC (Sitz Wilmington, Delaware, USA)
Geschäftsführer der AMD Saxony LLC:
   Dr. Hans-R. Deppe, Thomas McCoy

[-- Attachment #2: tools_firmware.diff --]
[-- Type: text/plain, Size: 1337 bytes --]

diff -r 974c00dec723 tools/firmware/hvmloader/mkhex
--- a/tools/firmware/hvmloader/mkhex	Tue Sep 25 10:21:07 2007 +0100
+++ b/tools/firmware/hvmloader/mkhex	Tue Sep 25 13:40:47 2007 +0000
@@ -21,6 +21,6 @@
 #
 
 echo "unsigned $1[] = {"
-od -v -t x $2 | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$/,/'
+od -v -t x $2 | sed 's/^[0-9]*  */0x/' | sed 's/  */, 0x/g' | sed 's/$/,/' | sed 's/0x,//' | sed 's/^[0-9]*,//'
 echo "};"
 
diff -r 974c00dec723 tools/firmware/rombios/32bit/Makefile
--- a/tools/firmware/rombios/32bit/Makefile	Tue Sep 25 10:21:07 2007 +0100
+++ b/tools/firmware/rombios/32bit/Makefile	Tue Sep 25 13:40:47 2007 +0000
@@ -39,4 +39,4 @@ clean:
 	    nm -u 32bitbios_all.o;                           \
 	    exit 11;                                         \
 	  } || :
-	bash mkhex highbios_array 32bitbios_all.o > $@
+	sh mkhex highbios_array 32bitbios_all.o > $@
diff -r 974c00dec723 tools/firmware/rombios/32bit/mkhex
--- a/tools/firmware/rombios/32bit/mkhex	Tue Sep 25 10:21:07 2007 +0100
+++ b/tools/firmware/rombios/32bit/mkhex	Tue Sep 25 13:40:47 2007 +0000
@@ -21,6 +21,6 @@
 #
 
 echo "unsigned $1[] = {"
-od -v -t x $2 | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$/,/'
+od -v -t x $2 | sed 's/^[0-9]*  */0x/' | sed 's/  */, 0x/g' | sed 's/$/,/' | sed 's/0x,//' | sed 's/^[0-9]*,//'
 echo "};"
 

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel