From 4612632edc784eddc423f8017176c1afc11cb585 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Fri, 29 May 2020 13:51:35 -0700 Subject: mb/google/dedede: Switch to using auto-generated SPDs This change switches dedede and family to using auto-generated SPDs obtained using gen_spd.go and gen_part_id.go. Change-Id: I6fadae0abcfb6e50d3cc502098ace9b668667a51 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/c/coreboot/+/41881 Reviewed-by: Karthik Ramasubramanian Tested-by: build bot (Jenkins) --- src/mainboard/google/dedede/Makefile.inc | 7 ++++--- src/mainboard/google/dedede/spd/Makefile.inc | 2 +- src/mainboard/google/dedede/variants/waddledee/Makefile.inc | 3 --- src/mainboard/google/dedede/variants/waddledoo/Makefile.inc | 3 --- src/mainboard/google/dedede/variants/wheelie/Makefile.inc | 3 --- 5 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 src/mainboard/google/dedede/variants/wheelie/Makefile.inc (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/dedede/Makefile.inc b/src/mainboard/google/dedede/Makefile.inc index 76b1af1b1b..cd73bb08a1 100644 --- a/src/mainboard/google/dedede/Makefile.inc +++ b/src/mainboard/google/dedede/Makefile.inc @@ -12,11 +12,12 @@ ramstage-y += board_info.c smm-y += smihandler.c +VARIANT_DIR:=$(call strip_quotes,$(CONFIG_VARIANT_DIR)) + subdirs-y += variants/baseboard +subdirs-y += variants/$(VARIANT_DIR) +subdirs-y += variants/$(VARIANT_DIR)/memory subdirs-y += spd CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include - -VARIANT_DIR:=$(call strip_quotes,$(CONFIG_VARIANT_DIR)) -subdirs-y += variants/$(VARIANT_DIR) CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/dedede/spd/Makefile.inc b/src/mainboard/google/dedede/spd/Makefile.inc index 24c34651bc..d2bed28dbc 100644 --- a/src/mainboard/google/dedede/spd/Makefile.inc +++ b/src/mainboard/google/dedede/spd/Makefile.inc @@ -3,7 +3,7 @@ ifneq ($(SPD_SOURCES),) SPD_BIN = $(obj)/spd.bin -SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/spd/$(f).spd.hex) +SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/soc/intel/jasperlake/spd/lp4x/$(f)) # Include spd ROM data $(SPD_BIN): $(SPD_DEPS) diff --git a/src/mainboard/google/dedede/variants/waddledee/Makefile.inc b/src/mainboard/google/dedede/variants/waddledee/Makefile.inc index 1813377292..eda535c992 100644 --- a/src/mainboard/google/dedede/variants/waddledee/Makefile.inc +++ b/src/mainboard/google/dedede/variants/waddledee/Makefile.inc @@ -1,8 +1,5 @@ ## SPDX-License-Identifier: GPL-2.0-or-later -SPD_SOURCES = SPD_LPDDR4X_200b_8Gb_4267_DDP_1x16 #0b0000 -SPD_SOURCES += SPD_LPDDR4X_200b_4Gb_3733_DDP_1x16 #0b0001 - romstage-y += memory.c ramstage-y += variant.c diff --git a/src/mainboard/google/dedede/variants/waddledoo/Makefile.inc b/src/mainboard/google/dedede/variants/waddledoo/Makefile.inc index 11bbbd60cc..eda535c992 100644 --- a/src/mainboard/google/dedede/variants/waddledoo/Makefile.inc +++ b/src/mainboard/google/dedede/variants/waddledoo/Makefile.inc @@ -1,8 +1,5 @@ ## SPDX-License-Identifier: GPL-2.0-or-later -SPD_SOURCES = empty #0b0000 -SPD_SOURCES += SPD_LPDDR4X_200b_8Gb_4267_DDP_1x16 #0b0001 - romstage-y += memory.c ramstage-y += variant.c diff --git a/src/mainboard/google/dedede/variants/wheelie/Makefile.inc b/src/mainboard/google/dedede/variants/wheelie/Makefile.inc deleted file mode 100644 index 6c8c913302..0000000000 --- a/src/mainboard/google/dedede/variants/wheelie/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-or-later - -SPD_SOURCES = Micron_MT53E512M32D2NP_2GB #0b0000 -- cgit v1.2.3