From 0a44e8f8a1b931424965ba6ac2790edc9cec97a0 Mon Sep 17 00:00:00 2001 From: Werner Zeh Date: Fri, 2 Jul 2021 11:10:35 +0200 Subject: [PATCH] mb/siemens/mc_ehl: Move SPD data to variant directory Since the variants can have different memory move the SPD related content to the variant directory. Change-Id: I38aa5e7514437bfcc61c38d64f0ba6f19350810d Signed-off-by: Werner Zeh Reviewed-on: https://review.coreboot.org/c/coreboot/+/56036 Reviewed-by: Mario Scheithauer Tested-by: build bot (Jenkins) --- src/mainboard/siemens/mc_ehl/spd/Makefile.inc | 3 --- src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Makefile.inc | 4 ++++ .../siemens/mc_ehl/{ => variants/mc_ehl1}/spd/empty.spd.hex | 0 .../mc_ehl.spd.hex => variants/mc_ehl1/spd/mc_ehl1.spd.hex} | 0 src/mainboard/siemens/mc_ehl/{ => variants/mc_ehl1}/spd/spd.h | 0 5 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 src/mainboard/siemens/mc_ehl/spd/Makefile.inc rename src/mainboard/siemens/mc_ehl/{ => variants/mc_ehl1}/spd/empty.spd.hex (100%) rename src/mainboard/siemens/mc_ehl/{spd/mc_ehl.spd.hex => variants/mc_ehl1/spd/mc_ehl1.spd.hex} (100%) rename src/mainboard/siemens/mc_ehl/{ => variants/mc_ehl1}/spd/spd.h (100%) diff --git a/src/mainboard/siemens/mc_ehl/spd/Makefile.inc b/src/mainboard/siemens/mc_ehl/spd/Makefile.inc deleted file mode 100644 index 6d9e9087f4..0000000000 --- a/src/mainboard/siemens/mc_ehl/spd/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = mc_ehl # 0b000 diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Makefile.inc b/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Makefile.inc index 641e814351..e011999940 100644 --- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Makefile.inc +++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Makefile.inc @@ -3,3 +3,7 @@ bootblock-y += gpio.c romstage-y += memory.c ramstage-y += gpio.c + +SPD_SOURCES = mc_ehl1 # 0b000 +LIB_SPD_DEPS := $(foreach f, $(SPD_SOURCES), \ + src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/spd/$(f).spd.hex) diff --git a/src/mainboard/siemens/mc_ehl/spd/empty.spd.hex b/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/spd/empty.spd.hex similarity index 100% rename from src/mainboard/siemens/mc_ehl/spd/empty.spd.hex rename to src/mainboard/siemens/mc_ehl/variants/mc_ehl1/spd/empty.spd.hex diff --git a/src/mainboard/siemens/mc_ehl/spd/mc_ehl.spd.hex b/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/spd/mc_ehl1.spd.hex similarity index 100% rename from src/mainboard/siemens/mc_ehl/spd/mc_ehl.spd.hex rename to src/mainboard/siemens/mc_ehl/variants/mc_ehl1/spd/mc_ehl1.spd.hex diff --git a/src/mainboard/siemens/mc_ehl/spd/spd.h b/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/spd/spd.h similarity index 100% rename from src/mainboard/siemens/mc_ehl/spd/spd.h rename to src/mainboard/siemens/mc_ehl/variants/mc_ehl1/spd/spd.h