summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKamil Wcislo <kamil.wcislo@3mdeb.com>2017-10-12 11:11:07 +0200
committerMartin Roth <martinroth@google.com>2017-10-16 00:13:03 +0000
commitc5d3944ad5d6f7ad987fece6b8672394326f4678 (patch)
tree8c7f1d96e12c115aec669ad8d1948bbc27f93230
parenta5f225f288a6f1bf1db0885bdc9635f2bf185374 (diff)
downloadcoreboot-c5d3944ad5d6f7ad987fece6b8672394326f4678.tar.gz
coreboot-c5d3944ad5d6f7ad987fece6b8672394326f4678.tar.bz2
coreboot-c5d3944ad5d6f7ad987fece6b8672394326f4678.zip
mainboard/pcengines/apu2: use GENERIC_SPD_BIN
Use GENERIC_SPD_BIN method of adding the SPD bins to final rom. Change-Id: I242e393bafac41aa7743f83b52cadf027019ee6e Signed-off-by: Kamil Wcislo <kamil.wcislo@3mdeb.com> Reviewed-on: https://review.coreboot.org/21980 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
-rw-r--r--src/mainboard/pcengines/apu2/Kconfig1
-rw-r--r--src/mainboard/pcengines/apu2/Makefile.inc20
-rw-r--r--src/mainboard/pcengines/apu2/spd/HYNIX-2G-1333.spd.hex (renamed from src/mainboard/pcengines/apu2/HYNIX-2G-1333.spd.hex)0
-rw-r--r--src/mainboard/pcengines/apu2/spd/HYNIX-4G-1333-ECC.spd.hex (renamed from src/mainboard/pcengines/apu2/HYNIX-4G-1333-ECC.spd.hex)0
4 files changed, 3 insertions, 18 deletions
diff --git a/src/mainboard/pcengines/apu2/Kconfig b/src/mainboard/pcengines/apu2/Kconfig
index a077520aa19c..cbcbb7cd6359 100644
--- a/src/mainboard/pcengines/apu2/Kconfig
+++ b/src/mainboard/pcengines/apu2/Kconfig
@@ -29,6 +29,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_ROMSIZE_KB_8192
select HUDSON_DISABLE_IMC
select USE_BLOBS
+ select GENERIC_SPD_BIN
select TPM
select MAINBOARD_HAS_LPC_TPM
diff --git a/src/mainboard/pcengines/apu2/Makefile.inc b/src/mainboard/pcengines/apu2/Makefile.inc
index 77c6d789c3c3..3724b1748eac 100644
--- a/src/mainboard/pcengines/apu2/Makefile.inc
+++ b/src/mainboard/pcengines/apu2/Makefile.inc
@@ -21,22 +21,6 @@ ramstage-y += BiosCallOuts.c
ramstage-y += OemCustomize.c
ramstage-y += gpio_ftns.c
-## DIMM SPD for on-board memory
-SPD_BIN = $(obj)/spd.bin
-
# Order of names in SPD_SOURCES is important!
-SPD_SOURCES = HYNIX-2G-1333 HYNIX-4G-1333-ECC
-
-SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/$(f).spd.hex)
-
-# Include spd rom data
-$(SPD_BIN): $(SPD_DEPS)
- 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)
-spd.bin-type := spd
+SPD_SOURCES = HYNIX-2G-1333
+SPD_SOURCES += HYNIX-4G-1333-ECC
diff --git a/src/mainboard/pcengines/apu2/HYNIX-2G-1333.spd.hex b/src/mainboard/pcengines/apu2/spd/HYNIX-2G-1333.spd.hex
index a70db53eda57..a70db53eda57 100644
--- a/src/mainboard/pcengines/apu2/HYNIX-2G-1333.spd.hex
+++ b/src/mainboard/pcengines/apu2/spd/HYNIX-2G-1333.spd.hex
diff --git a/src/mainboard/pcengines/apu2/HYNIX-4G-1333-ECC.spd.hex b/src/mainboard/pcengines/apu2/spd/HYNIX-4G-1333-ECC.spd.hex
index ac6b4c6c9d0e..ac6b4c6c9d0e 100644
--- a/src/mainboard/pcengines/apu2/HYNIX-4G-1333-ECC.spd.hex
+++ b/src/mainboard/pcengines/apu2/spd/HYNIX-4G-1333-ECC.spd.hex