summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg V <greg@unrelenting.technology>2019-10-07 23:56:05 +0300
committerPatrick Georgi <pgeorgi@google.com>2019-10-09 22:16:40 +0000
commit84c491a8c8948c3f174947aa8e8b9c2d2ca90739 (patch)
tree23fe99a1c5b9e5c3ed02b36db4c35a1decab079c
parentae47a6f4fa4af9495dd907a4beb7d1fc2c137fe3 (diff)
downloadcoreboot-84c491a8c8948c3f174947aa8e8b9c2d2ca90739.tar.xz
mb/[google/intel/lenovo]/*: fix posix shell bug with SPD files
FreeBSD's sh (basic posix shell) did not interpret the '\%o' escape in the same way bash/zsh do. As a result, the decoded files ended up with ASCII numbers instead of the decoded binary data. Change-Id: I95b414d959e5cd4479fcf100adcf390562032c68 Signed-off-by: Greg V <greg@unrelenting.technology> Reviewed-on: https://review.coreboot.org/c/coreboot/+/35867 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--src/mainboard/google/auron/variants/auron_paine/spd/Makefile.inc2
-rw-r--r--src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.inc2
-rw-r--r--src/mainboard/google/auron/variants/gandof/spd/Makefile.inc2
-rw-r--r--src/mainboard/google/auron/variants/lulu/spd/Makefile.inc2
-rw-r--r--src/mainboard/google/auron/variants/samus/spd/Makefile.inc2
-rw-r--r--src/mainboard/google/dragonegg/spd/Makefile.inc2
-rw-r--r--src/mainboard/google/drallion/spd/Makefile.inc2
-rw-r--r--src/mainboard/google/eve/spd/Makefile.inc2
-rw-r--r--src/mainboard/google/hatch/spd/Makefile.inc2
-rw-r--r--src/mainboard/google/poppy/spd/Makefile.inc2
-rw-r--r--src/mainboard/intel/kunimitsu/spd/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc2
13 files changed, 13 insertions, 13 deletions
diff --git a/src/mainboard/google/auron/variants/auron_paine/spd/Makefile.inc b/src/mainboard/google/auron/variants/auron_paine/spd/Makefile.inc
index 26e1a75ca0..44edc70dbb 100644
--- a/src/mainboard/google/auron/variants/auron_paine/spd/Makefile.inc
+++ b/src/mainboard/google/auron/variants/auron_paine/spd/Makefile.inc
@@ -41,7 +41,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do printf $$(printf '\%o' 0x$$c); \
+ do printf $$(printf '\\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.inc b/src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.inc
index 26e1a75ca0..44edc70dbb 100644
--- a/src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.inc
+++ b/src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.inc
@@ -41,7 +41,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do printf $$(printf '\%o' 0x$$c); \
+ do printf $$(printf '\\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/google/auron/variants/gandof/spd/Makefile.inc b/src/mainboard/google/auron/variants/gandof/spd/Makefile.inc
index f3a2162ad7..23d0b4e0c3 100644
--- a/src/mainboard/google/auron/variants/gandof/spd/Makefile.inc
+++ b/src/mainboard/google/auron/variants/gandof/spd/Makefile.inc
@@ -33,7 +33,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do printf $$(printf '\%o' 0x$$c); \
+ do printf $$(printf '\\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/google/auron/variants/lulu/spd/Makefile.inc b/src/mainboard/google/auron/variants/lulu/spd/Makefile.inc
index bc1454f202..86cb2d2119 100644
--- a/src/mainboard/google/auron/variants/lulu/spd/Makefile.inc
+++ b/src/mainboard/google/auron/variants/lulu/spd/Makefile.inc
@@ -42,7 +42,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do printf $$(printf '\%o' 0x$$c); \
+ do printf $$(printf '\\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/google/auron/variants/samus/spd/Makefile.inc b/src/mainboard/google/auron/variants/samus/spd/Makefile.inc
index 6a357c0cf0..a026ef3c66 100644
--- a/src/mainboard/google/auron/variants/samus/spd/Makefile.inc
+++ b/src/mainboard/google/auron/variants/samus/spd/Makefile.inc
@@ -41,7 +41,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do printf $$(printf '\%o' 0x$$c); \
+ do printf $$(printf '\\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/google/dragonegg/spd/Makefile.inc b/src/mainboard/google/dragonegg/spd/Makefile.inc
index 7aa9505e9e..2fdd9d47f8 100644
--- a/src/mainboard/google/dragonegg/spd/Makefile.inc
+++ b/src/mainboard/google/dragonegg/spd/Makefile.inc
@@ -30,7 +30,7 @@ endif
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do printf $$(printf '\%o' 0x$$c); \
+ do printf $$(printf '\\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/google/drallion/spd/Makefile.inc b/src/mainboard/google/drallion/spd/Makefile.inc
index e35544bc7d..9ab7394b30 100644
--- a/src/mainboard/google/drallion/spd/Makefile.inc
+++ b/src/mainboard/google/drallion/spd/Makefile.inc
@@ -25,7 +25,7 @@ endif
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do printf $$(printf '\%o' 0x$$c); \
+ do printf $$(printf '\\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/google/eve/spd/Makefile.inc b/src/mainboard/google/eve/spd/Makefile.inc
index c97a818b55..cb4f8a8124 100644
--- a/src/mainboard/google/eve/spd/Makefile.inc
+++ b/src/mainboard/google/eve/spd/Makefile.inc
@@ -32,7 +32,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 printf $$(printf '\%o' 0x$$c); \
+ do printf $$(printf '\\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/google/hatch/spd/Makefile.inc b/src/mainboard/google/hatch/spd/Makefile.inc
index e35544bc7d..9ab7394b30 100644
--- a/src/mainboard/google/hatch/spd/Makefile.inc
+++ b/src/mainboard/google/hatch/spd/Makefile.inc
@@ -25,7 +25,7 @@ endif
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do printf $$(printf '\%o' 0x$$c); \
+ do printf $$(printf '\\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/google/poppy/spd/Makefile.inc b/src/mainboard/google/poppy/spd/Makefile.inc
index 444ac00b92..dd57835739 100644
--- a/src/mainboard/google/poppy/spd/Makefile.inc
+++ b/src/mainboard/google/poppy/spd/Makefile.inc
@@ -5,7 +5,7 @@ SEC_SPD_BIN = $(obj)/sec-spd.bin
define gen_spd_bin
for f in $2; \
do for c in $$(cat $$f | grep -v ^#); \
- do printf $$(printf '\%o' 0x$$c); \
+ do printf $$(printf '\\%o' 0x$$c); \
done; \
done > $1
endef
diff --git a/src/mainboard/intel/kunimitsu/spd/Makefile.inc b/src/mainboard/intel/kunimitsu/spd/Makefile.inc
index 9856368e7a..4fa2d7e5df 100644
--- a/src/mainboard/intel/kunimitsu/spd/Makefile.inc
+++ b/src/mainboard/intel/kunimitsu/spd/Makefile.inc
@@ -43,7 +43,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 printf $$(printf '\%o' 0x$$c); \
+ do printf $$(printf '\\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc b/src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc
index 4b9ef55007..72657b4c23 100644
--- a/src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc
+++ b/src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc
@@ -22,7 +22,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/
$(SPD_BIN): $(SPD_DEPS)
for f in $+; \
do for c in $$(cat $$f | grep -v ^#); \
- do printf $$(printf '\%o' 0x$$c); \
+ do printf $$(printf '\\%o' 0x$$c); \
done; \
done > $@
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc b/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc
index f5c233add0..235fc102d1 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc
+++ b/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc
@@ -24,7 +24,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 printf $$(printf '\%o' 0x$$c); \
+ do printf $$(printf '\\%o' 0x$$c); \
done; \
done > $@