From 0be6cee817d69fa32230405bc1eb70b6505ab88a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= Date: Tue, 26 Jun 2018 14:52:51 +0200 Subject: [PATCH] mb/pcengines/apu1: use generic SPD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Clean up leftovers of old SPD generation and utilize common procedure to produce SPD binary. Change-Id: I4e48817c03b4372887bc0ea14209736ae2b4e48f Signed-off-by: Michał Żygowski Reviewed-on: https://review.coreboot.org/27301 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Patrick Georgi --- src/mainboard/pcengines/apu1/Kconfig | 1 + src/mainboard/pcengines/apu1/Makefile.inc | 19 ++----------------- .../apu1/{ => spd}/HYNIX-H5TQ2G83CFR.spd.hex | 0 .../apu1/{ => spd}/HYNIX-H5TQ4G83MFR.spd.hex | 0 4 files changed, 3 insertions(+), 17 deletions(-) rename src/mainboard/pcengines/apu1/{ => spd}/HYNIX-H5TQ2G83CFR.spd.hex (100%) rename src/mainboard/pcengines/apu1/{ => spd}/HYNIX-H5TQ4G83MFR.spd.hex (100%) diff --git a/src/mainboard/pcengines/apu1/Kconfig b/src/mainboard/pcengines/apu1/Kconfig index 8361d8d1d8..6c98d01147 100644 --- a/src/mainboard/pcengines/apu1/Kconfig +++ b/src/mainboard/pcengines/apu1/Kconfig @@ -29,6 +29,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_CMOS_DEFAULT select BOARD_ROMSIZE_KB_2048 + select GENERIC_SPD_BIN config MAINBOARD_DIR string diff --git a/src/mainboard/pcengines/apu1/Makefile.inc b/src/mainboard/pcengines/apu1/Makefile.inc index 324e4aa365..543ac97723 100644 --- a/src/mainboard/pcengines/apu1/Makefile.inc +++ b/src/mainboard/pcengines/apu1/Makefile.inc @@ -31,22 +31,7 @@ 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-H5TQ2G83CFR HYNIX-H5TQ4G83MFR - -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-H5TQ2G83CFR +SPD_SOURCES += HYNIX-H5TQ4G83MFR diff --git a/src/mainboard/pcengines/apu1/HYNIX-H5TQ2G83CFR.spd.hex b/src/mainboard/pcengines/apu1/spd/HYNIX-H5TQ2G83CFR.spd.hex similarity index 100% rename from src/mainboard/pcengines/apu1/HYNIX-H5TQ2G83CFR.spd.hex rename to src/mainboard/pcengines/apu1/spd/HYNIX-H5TQ2G83CFR.spd.hex diff --git a/src/mainboard/pcengines/apu1/HYNIX-H5TQ4G83MFR.spd.hex b/src/mainboard/pcengines/apu1/spd/HYNIX-H5TQ4G83MFR.spd.hex similarity index 100% rename from src/mainboard/pcengines/apu1/HYNIX-H5TQ4G83MFR.spd.hex rename to src/mainboard/pcengines/apu1/spd/HYNIX-H5TQ4G83MFR.spd.hex