Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41881 )
Change subject: mb/google/dedede: Switch to using auto-generated SPDs ......................................................................
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 furquan@google.com --- M src/mainboard/google/dedede/Makefile.inc M src/mainboard/google/dedede/spd/Makefile.inc M src/mainboard/google/dedede/variants/waddledee/Makefile.inc M src/mainboard/google/dedede/variants/waddledoo/Makefile.inc D src/mainboard/google/dedede/variants/wheelie/Makefile.inc 5 files changed, 2 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/41881/1
diff --git a/src/mainboard/google/dedede/Makefile.inc b/src/mainboard/google/dedede/Makefile.inc index 9af93dd..591c4fc 100644 --- a/src/mainboard/google/dedede/Makefile.inc +++ b/src/mainboard/google/dedede/Makefile.inc @@ -19,4 +19,5 @@
VARIANT_DIR:=$(call strip_quotes,$(CONFIG_VARIANT_DIR)) subdirs-y += variants/$(VARIANT_DIR) +subdirs-y += variants/$(VARIANT_DIR)/memory 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 24c3465..886460c 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/$(MEM_TYPE)/$(f).spd.hex)
# 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 1813377..eda535c 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 11bbbd6..eda535c 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 6c8c913..0000000 --- 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
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Marco Chen, Aamir Bohra, Aaron Durbin, Karthik Ramasubramanian,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/41881
to look at the new patch set (#2).
Change subject: mb/google/dedede: Switch to using auto-generated SPDs ......................................................................
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 furquan@google.com --- M src/mainboard/google/dedede/Makefile.inc M src/mainboard/google/dedede/spd/Makefile.inc M src/mainboard/google/dedede/variants/waddledee/Makefile.inc M src/mainboard/google/dedede/variants/waddledoo/Makefile.inc D src/mainboard/google/dedede/variants/wheelie/Makefile.inc 5 files changed, 2 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/41881/2
Nick Vaccaro has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41881 )
Change subject: mb/google/dedede: Switch to using auto-generated SPDs ......................................................................
Patch Set 2:
jfyi, this CL didn't cherry-pick cleanly for me : both modified: ../dedede/variants/waddledee/Makefile.inc
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41881 )
Change subject: mb/google/dedede: Switch to using auto-generated SPDs ......................................................................
Patch Set 2:
Patch Set 2:
jfyi, this CL didn't cherry-pick cleanly for me : both modified: ../dedede/variants/waddledee/Makefile.inc
I had pulled in ToT before pushing this CL. Is your tree synced to the latest?
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41881 )
Change subject: mb/google/dedede: Switch to using auto-generated SPDs ......................................................................
Patch Set 3: Code-Review+2
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Marco Chen, Aamir Bohra, Aaron Durbin, Karthik Ramasubramanian,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/41881
to look at the new patch set (#4).
Change subject: mb/google/dedede: Switch to using auto-generated SPDs ......................................................................
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 furquan@google.com --- M src/mainboard/google/dedede/Makefile.inc M src/mainboard/google/dedede/spd/Makefile.inc M src/mainboard/google/dedede/variants/waddledee/Makefile.inc M src/mainboard/google/dedede/variants/waddledoo/Makefile.inc D src/mainboard/google/dedede/variants/wheelie/Makefile.inc 5 files changed, 2 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/41881/4
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Marco Chen, Aamir Bohra, Aaron Durbin, Karthik Ramasubramanian,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/41881
to look at the new patch set (#8).
Change subject: mb/google/dedede: Switch to using auto-generated SPDs ......................................................................
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 furquan@google.com --- M src/mainboard/google/dedede/Makefile.inc M src/mainboard/google/dedede/spd/Makefile.inc M src/mainboard/google/dedede/variants/waddledee/Makefile.inc M src/mainboard/google/dedede/variants/waddledoo/Makefile.inc D src/mainboard/google/dedede/variants/wheelie/Makefile.inc 5 files changed, 2 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/41881/8
Nick Vaccaro has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41881 )
Change subject: mb/google/dedede: Switch to using auto-generated SPDs ......................................................................
Patch Set 9: Code-Review+1
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41881 )
Change subject: mb/google/dedede: Switch to using auto-generated SPDs ......................................................................
Patch Set 9:
(1 comment)
https://review.coreboot.org/c/coreboot/+/41881/9/src/mainboard/google/dedede... File src/mainboard/google/dedede/spd/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/41881/9/src/mainboard/google/dedede... PS9, Line 6: $(f).spd.hex just $(f). The surprising thing is build does not fail. It continues on with an empty spd.bin
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Nick Vaccaro, Marco Chen, Aamir Bohra, Aaron Durbin, Karthik Ramasubramanian,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/41881
to look at the new patch set (#10).
Change subject: mb/google/dedede: Switch to using auto-generated SPDs ......................................................................
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 furquan@google.com --- M src/mainboard/google/dedede/Makefile.inc M src/mainboard/google/dedede/spd/Makefile.inc M src/mainboard/google/dedede/variants/waddledee/Makefile.inc M src/mainboard/google/dedede/variants/waddledoo/Makefile.inc D src/mainboard/google/dedede/variants/wheelie/Makefile.inc 5 files changed, 2 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/41881/10
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41881 )
Change subject: mb/google/dedede: Switch to using auto-generated SPDs ......................................................................
Patch Set 10:
(1 comment)
https://review.coreboot.org/c/coreboot/+/41881/9/src/mainboard/google/dedede... File src/mainboard/google/dedede/spd/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/41881/9/src/mainboard/google/dedede... PS9, Line 6: $(f).spd.hex
just $(f). The surprising thing is build does not fail. It continues on with an empty spd. […]
Done
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41881 )
Change subject: mb/google/dedede: Switch to using auto-generated SPDs ......................................................................
Patch Set 10:
(1 comment)
https://review.coreboot.org/c/coreboot/+/41881/10/src/mainboard/google/deded... File src/mainboard/google/dedede/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/41881/10/src/mainboard/google/deded... PS10, Line 16: subdirs-y += spd Couple more changes: 1) GENERIC_SPD_BIN enabled in Kconfig has to be disabled. With that enabled, currently the build rules in src/lib/Makefile.inc (commit -335781ad53c) are taking effect which are pretty much the same as the build rules in spd/Makefile.inc
2) This has to be moved after the line subdirs-y += variants/$(VARIANT_DIR)/memory because the SPD_SOURCES are defined only in the other makefile. Without SPD_SOURCES getting defined, the rules to build spd.bin are not applied.
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Nick Vaccaro, Marco Chen, Aamir Bohra, Aaron Durbin, Karthik Ramasubramanian,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/41881
to look at the new patch set (#11).
Change subject: mb/google/dedede: Switch to using auto-generated SPDs ......................................................................
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 furquan@google.com --- M src/mainboard/google/dedede/Makefile.inc M src/mainboard/google/dedede/spd/Makefile.inc M src/mainboard/google/dedede/variants/waddledee/Makefile.inc M src/mainboard/google/dedede/variants/waddledoo/Makefile.inc D src/mainboard/google/dedede/variants/wheelie/Makefile.inc 5 files changed, 5 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/41881/11
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41881 )
Change subject: mb/google/dedede: Switch to using auto-generated SPDs ......................................................................
Patch Set 11:
(1 comment)
https://review.coreboot.org/c/coreboot/+/41881/10/src/mainboard/google/deded... File src/mainboard/google/dedede/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/41881/10/src/mainboard/google/deded... PS10, Line 16: subdirs-y += spd
Couple more changes: […]
Aah that explains why it didn't fail earlier with the wrong name. Thanks for digging into this Karthik! I think we should be able to use GENERIC_SPD_BIN, but let's do that as follow-up.
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41881 )
Change subject: mb/google/dedede: Switch to using auto-generated SPDs ......................................................................
Patch Set 11: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/41881 )
Change subject: mb/google/dedede: Switch to using auto-generated SPDs ......................................................................
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 furquan@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/41881 Reviewed-by: Karthik Ramasubramanian kramasub@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/dedede/Makefile.inc M src/mainboard/google/dedede/spd/Makefile.inc M src/mainboard/google/dedede/variants/waddledee/Makefile.inc M src/mainboard/google/dedede/variants/waddledoo/Makefile.inc D src/mainboard/google/dedede/variants/wheelie/Makefile.inc 5 files changed, 5 insertions(+), 13 deletions(-)
Approvals: build bot (Jenkins): Verified Karthik Ramasubramanian: Looks good to me, approved
diff --git a/src/mainboard/google/dedede/Makefile.inc b/src/mainboard/google/dedede/Makefile.inc index 76b1af1..cd73bb0 100644 --- a/src/mainboard/google/dedede/Makefile.inc +++ b/src/mainboard/google/dedede/Makefile.inc @@ -12,11 +12,12 @@
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 24c3465..d2bed28 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 1813377..eda535c 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 11bbbd6..eda535c 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 6c8c913..0000000 --- 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
9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41881 )
Change subject: mb/google/dedede: Switch to using auto-generated SPDs ......................................................................
Patch Set 12:
Automatic boot test returned (PASS/FAIL/TOTAL): 4/0/4 Emulation targets: "QEMU x86 q35/ich9" using payload TianoCore : SUCCESS : https://lava.9esec.io/r/5070 "QEMU x86 q35/ich9" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/5069 "QEMU x86 i440fx/piix4" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/5068 "QEMU AArch64" using payload LinuxBoot_u-root_kexec : SUCCESS : https://lava.9esec.io/r/5067
Please note: This test is under development and might not be accurate at all!