firmware: fix romimage generation for *bsd

 - 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 a build error on NetBSD

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

diff --git a/tools/firmware/hvmloader/mkhex b/tools/firmware/hvmloader/mkhex
index 7389d70483b8a0f83a22520b5b4a02086b6593a5..4517e36c533623f7f131139740468dff515d04f8 100755 (executable)
--- a/tools/firmware/hvmloader/mkhex
+++ b/tools/firmware/hvmloader/mkhex
@@ -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 --git a/tools/firmware/rombios/32bit/Makefile b/tools/firmware/rombios/32bit/Makefile
index 1cd7100ae99f96d756cae31d8b78d42dcce8a48c..0a17154a437bcf939bae26ccc4c8d22a086f8c59 100644 (file)
--- a/tools/firmware/rombios/32bit/Makefile
+++ b/tools/firmware/rombios/32bit/Makefile
@@ -39,4 +39,4 @@ $(TARGET): subdirs 32bitbios.o util.o
            nm -u 32bitbios_all.o;                           \
            exit 11;                                         \
          } || :
-       bash mkhex highbios_array 32bitbios_all.o > $@
+       sh mkhex highbios_array 32bitbios_all.o > $@

diff --git a/tools/firmware/rombios/32bit/mkhex b/tools/firmware/rombios/32bit/mkhex
index 7389d70483b8a0f83a22520b5b4a02086b6593a5..4517e36c533623f7f131139740468dff515d04f8 100644 (file)
--- a/tools/firmware/rombios/32bit/mkhex
+++ b/tools/firmware/rombios/32bit/mkhex
@@ -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 "};"