[coreboot-gerrit] Change in coreboot[master]: mb/facebook/fbg1701: Remove ONBOARD_MICRON_MEM

[Frans Hendriks (Code Review)]

Frans Hendriks has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35742 )

Change subject: mb/facebook/fbg1701: Remove ONBOARD_MICRON_MEM
......................................................................

mb/facebook/fbg1701: Remove ONBOARD_MICRON_MEM

Config ONBOARD_MICRON_MEM and ONBOARD_SAMSUNG_MEM are available.
These configs are used to determine if Samsung or Micron onboard memory is
assembled. This can not detected run-time.

One CONFIG value will be enough to determine if Samsung memory is assembled.
Only oldest HW revision contains Samsung module, so set CONFIG_ONBOARD_SAMSUNG memory
to default No.

BUG=N/A
TEST=Boot and verified on Facebook FBG-1701

Change-Id: Id65e92bd4b8d4fe3a6b87dec9bf77e3a62e1be96
Signed-off-by: Frans Hendriks 
---
M src/mainboard/facebook/fbg1701/Kconfig
M src/mainboard/facebook/fbg1701/romstage.c
2 files changed, 2 insertions(+), 11 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/35742/1

diff --git a/src/mainboard/facebook/fbg1701/Kconfig b/src/mainboard/facebook/fbg1701/Kconfig
index ce90758..066008e 100644
--- a/src/mainboard/facebook/fbg1701/Kconfig
+++ b/src/mainboard/facebook/fbg1701/Kconfig
@@ -31,21 +31,12 @@
    select INTEL_GMA_HAVE_VBT
    select GENERIC_SPD_BIN

-choice
-	prompt "Onboard memory manufacturer"
-	default ONBOARD_MICRON_MEM
-
 config ONBOARD_SAMSUNG_MEM
    bool "Samsung"
+	default n
    help
      Samsung K4B8G1646D memory

-config ONBOARD_MICRON_MEM
-	bool "Micron"
-	help
-	  Micron MT41K512M16HA memory
-endchoice
-
 config MAINBOARD_DIR
    string
    default facebook/fbg1701
diff --git a/src/mainboard/facebook/fbg1701/romstage.c b/src/mainboard/facebook/fbg1701/romstage.c
index e2e37d6..7b68914 100644
--- a/src/mainboard/facebook/fbg1701/romstage.c
+++ b/src/mainboard/facebook/fbg1701/romstage.c
@@ -31,7 +31,7 @@
    struct region_device spd_rdev;
    u8 spd_index = 0;

-	if (CONFIG(ONBOARD_MICRON_MEM))
+	if (!CONFIG(ONBOARD_SAMSUNG_MEM))
    	spd_index = 1;
    if (get_spd_cbfs_rdev(&spd_rdev, spd_index) < 0)
    	die("spd.bin not found\n");