[coreboot-gerrit] Change in coreboot[master]: Add disable SPD option to coreboot menuconfig.

[Micha? ?ygowski (Code Review)]

Micha? ?ygowski has uploaded this change for review. ( https://review.coreboot.org/21632

Change subject: Add disable SPD option to coreboot menuconfig.
......................................................................

Add disable SPD option to coreboot menuconfig.

Running memtest86+ with RAM SPD retrieval on mainboards and
chipsets that do not support retrieving SPD info leads to
unexpected behaviours or freezes platforms (e.g. APU2). This
option allows to run Memtest86+ on such platforms.

Change-Id: I72774f296bb977ddb7aedd77ccbd6f1ad6b30916
Signed-off-by: Michał Żygowski 
---
M payloads/Kconfig
M payloads/external/Makefile.inc
M payloads/external/Memtest86Plus/Makefile
3 files changed, 13 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/21632/1

diff --git a/payloads/Kconfig b/payloads/Kconfig
index bb9348b..b8f8b5c 100644
--- a/payloads/Kconfig
+++ b/payloads/Kconfig
@@ -109,6 +109,15 @@
      non-reproducible, as it can fetch different code each time.
 endchoice

+config MEMTEST_SPD
+	bool "Disable retrieving SPD info"
+	depends on MEMTEST_SECONDARY_PAYLOAD
+	help
+	  Disables retrieving RAM SPD info in Memtest86+.
+
+	  Some chipsets and mainboards does not support this feature and it
+	  should be disabled in Memtest86+ to avoid unwanted behaviour.
+
 config NVRAMCUI_SECONDARY_PAYLOAD
    bool "Load nvramcui as a secondary payload"
    default n
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 0a9b3d6..bcd5911 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -201,6 +201,7 @@
    	AS="$(AS_x86_32)" \
    	CONFIG_MEMTEST_MASTER=$(CONFIG_MEMTEST_MASTER) \
    	CONFIG_MEMTEST_STABLE=$(CONFIG_MEMTEST_STABLE) \
+		CONFIG_MEMTEST_SPD=$(CONFIG_MEMTEST_SPD) \
    	$(MEMTEST_SERIAL_OPTIONS) \
    	MFLAGS= MAKEFLAGS=

diff --git a/payloads/external/Memtest86Plus/Makefile b/payloads/external/Memtest86Plus/Makefile
index 2136495..a8fd7cf 100644
--- a/payloads/external/Memtest86Plus/Makefile
+++ b/payloads/external/Memtest86Plus/Makefile
@@ -43,7 +43,9 @@

build: checkout
    echo "    MAKE       $(project_name) $(NAME-y)"
-	$(MAKE) -C $(project_dir) all
+	if [ "$(CONFIG_MEMTEST_SPD)" = "y" ]; then \
+		$(MAKE) -C $(project_dir) CB_NOSPD=1 all; \
+	else    $(MAKE) -C $(project_dir) all; fi

clean:
    test -d $(project_dir) && $(MAKE) -C $(project_dir) clean || exit 0