Change in coreboot[master]: mb/facebook/fbg1701: Remove ONBOARD_SAMSUNG_MEM

[Frans Hendriks (Code Review)]

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

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

mb/facebook/fbg1701: Remove ONBOARD_SAMSUNG_MEM

CONFIG_ONBOARD_SAMSUMG_MEM was used to force Samsung memory.

CPLD returns different values for every board revision. Use this value to determine
the memory type.

BUG = N/A
TEST = Boot Facebook FBG1701 Rev 1.0 - 1.4

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

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/54/59754/1

diff --git a/src/mainboard/facebook/fbg1701/Kconfig b/src/mainboard/facebook/fbg1701/Kconfig
index e6e2e47..0efb7e8 100644
--- a/src/mainboard/facebook/fbg1701/Kconfig
+++ b/src/mainboard/facebook/fbg1701/Kconfig
@@ -47,12 +47,6 @@

endif # VBOOT

-config ONBOARD_SAMSUNG_MEM
-	bool "Onboard memory manufacturer Samsung"
-	default n
-	help
-	  Samsung K4B8G1646D memory
-
 config MAINBOARD_DIR
    default "facebook/fbg1701"

diff --git a/src/mainboard/facebook/fbg1701/romstage.c b/src/mainboard/facebook/fbg1701/romstage.c
index fd005a6..650d526 100644
--- a/src/mainboard/facebook/fbg1701/romstage.c
+++ b/src/mainboard/facebook/fbg1701/romstage.c
@@ -20,11 +20,21 @@
 {
    u8 spd_index = 0;

-	if (!CONFIG(ONBOARD_SAMSUNG_MEM)) {
-		if (cpld_read_pcb_version() <= 7)
-			spd_index = 1;
-		else
-			spd_index = 2;
+	switch (cpld_read_pcb_version()) {
+	case 0:	/* intentional fallthrough */
+	case 1:	/* intentional fallthrough */
+	case 2:	/* intentional fallthrough */
+	case 3:	/* intentional fallthrough */
+	case 4:	/* intentional fallthrough */
+	case 5:
+		break;
+	case 6:	/* intentional fallthrough */
+	case 7:
+		spd_index = 1;
+		break;
+	default:
+		spd_index = 2;
+		break;
    }

memory_params->PcdMemoryTypeEnable = MEM_DDR3;