summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-04-01 08:49:41 -0500
committerAaron Durbin <adurbin@google.com>2015-04-01 22:51:41 +0200
commit3e91cffd894336c7ec802f0fc49e25e2a3b4efc6 (patch)
tree26fe2c2b82c1c90d930efdb7290d858733cba9b8
parenta30f7e667ca56fdfeea98cbe736b61b67048c621 (diff)
downloadcoreboot-3e91cffd894336c7ec802f0fc49e25e2a3b4efc6.tar.xz
mainboards: fix spd generation
echo is evaluated by a shell builtin producing non-binary spd data of the form '-e -n \<byte>'. Correct this by using printf builtin which does the equivalent and is more cross platform friendly. Boards changed: gizmosphere/gizmo gizmosphere/gizmo2 google/bolt google/falco google/link google/peppy google/rambi google/samus google/slippy pcengines/apu1 Change-Id: Iefdaf59903b9682cc88c94fd991883b560616492 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/9196 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marc.jones@se-eng.com> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--src/mainboard/gizmosphere/gizmo/Makefile.inc2
-rw-r--r--src/mainboard/gizmosphere/gizmo2/Makefile.inc2
-rw-r--r--src/mainboard/google/bolt/Makefile.inc2
-rw-r--r--src/mainboard/google/falco/Makefile.inc2
-rw-r--r--src/mainboard/google/link/Makefile.inc6
-rw-r--r--src/mainboard/google/peppy/Makefile.inc2
-rw-r--r--src/mainboard/google/rambi/spd/Makefile.inc2
-rw-r--r--src/mainboard/google/samus/spd/Makefile.inc2
-rw-r--r--src/mainboard/google/slippy/Makefile.inc2
-rw-r--r--src/mainboard/pcengines/apu1/Makefile.inc2
10 files changed, 14 insertions, 10 deletions
diff --git a/src/mainboard/gizmosphere/gizmo/Makefile.inc b/src/mainboard/gizmosphere/gizmo/Makefile.inc
index 10a15e3afd..e8e5f29388 100644
--- a/src/mainboard/gizmosphere/gizmo/Makefile.inc
+++ b/src/mainboard/gizmosphere/gizmo/Makefile.inc
@@ -45,7 +45,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/$(f).spd.
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do echo -e -n "\\x$$c"; \
+ do printf $$(printf '\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/gizmosphere/gizmo2/Makefile.inc b/src/mainboard/gizmosphere/gizmo2/Makefile.inc
index 8a1c388337..c9f63aaa83 100644
--- a/src/mainboard/gizmosphere/gizmo2/Makefile.inc
+++ b/src/mainboard/gizmosphere/gizmo2/Makefile.inc
@@ -38,7 +38,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/$(f).spd.
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do echo -e -n "\\x$$c"; \
+ do printf $$(printf '\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/google/bolt/Makefile.inc b/src/mainboard/google/bolt/Makefile.inc
index e6c6eb3197..20b83ae543 100644
--- a/src/mainboard/google/bolt/Makefile.inc
+++ b/src/mainboard/google/bolt/Makefile.inc
@@ -36,7 +36,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/$(f).spd.
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do echo -e -n "\\x$$c"; \
+ do printf $$(printf '\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/google/falco/Makefile.inc b/src/mainboard/google/falco/Makefile.inc
index fbc24622ba..d644eeedd2 100644
--- a/src/mainboard/google/falco/Makefile.inc
+++ b/src/mainboard/google/falco/Makefile.inc
@@ -44,7 +44,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/$(f).spd.
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do echo -e -n "\\x$$c"; \
+ do printf $$(printf '\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/google/link/Makefile.inc b/src/mainboard/google/link/Makefile.inc
index 62746adbea..bd2cbf5842 100644
--- a/src/mainboard/google/link/Makefile.inc
+++ b/src/mainboard/google/link/Makefile.inc
@@ -37,7 +37,11 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/$(f).spd.
# Include spd rom data
$(SPD_BIN): $(SPD_DEPS)
- for f in $^; do for c in $$(cat $$f); do echo -e -n "\\x$$c"; done; done > $@
+ for f in $+; \
+ do for c in $$(cat $$f | grep -v ^#); \
+ do printf $$(printf '\%o' 0x$$c); \
+ done; \
+ done > $@
cbfs-files-y += spd.bin
spd.bin-file := $(SPD_BIN)
diff --git a/src/mainboard/google/peppy/Makefile.inc b/src/mainboard/google/peppy/Makefile.inc
index 96c63f0f9c..30497a2cdf 100644
--- a/src/mainboard/google/peppy/Makefile.inc
+++ b/src/mainboard/google/peppy/Makefile.inc
@@ -43,7 +43,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/$(f).spd.
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do echo -e -n "\\x$$c"; \
+ do printf $$(printf '\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/google/rambi/spd/Makefile.inc b/src/mainboard/google/rambi/spd/Makefile.inc
index 2e7d75025a..375cc9170d 100644
--- a/src/mainboard/google/rambi/spd/Makefile.inc
+++ b/src/mainboard/google/rambi/spd/Makefile.inc
@@ -40,7 +40,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/spd/$(f).
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do echo -e -n "\\x$$c"; \
+ do printf $$(printf '\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/google/samus/spd/Makefile.inc b/src/mainboard/google/samus/spd/Makefile.inc
index df63118bed..be6740dd4b 100644
--- a/src/mainboard/google/samus/spd/Makefile.inc
+++ b/src/mainboard/google/samus/spd/Makefile.inc
@@ -45,7 +45,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/spd/$(f).
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do echo -e -n "\\x$$c"; \
+ do printf $$(printf '\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/google/slippy/Makefile.inc b/src/mainboard/google/slippy/Makefile.inc
index ec75717df5..ddac6ee349 100644
--- a/src/mainboard/google/slippy/Makefile.inc
+++ b/src/mainboard/google/slippy/Makefile.inc
@@ -37,7 +37,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/$(f).spd.
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do echo -e -n "\\x$$c"; \
+ do printf $$(printf '\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/pcengines/apu1/Makefile.inc b/src/mainboard/pcengines/apu1/Makefile.inc
index 904dfbe0f9..afff1470ee 100644
--- a/src/mainboard/pcengines/apu1/Makefile.inc
+++ b/src/mainboard/pcengines/apu1/Makefile.inc
@@ -47,7 +47,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/$(f).spd.
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do echo -e -n "\\x$$c"; \
+ do printf $$(printf '\%o' 0x$$c); \
done; \
done > $@