summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFrans Hendriks <fhendriks@eltan.com>2019-10-02 09:27:56 +0200
committerPatrick Georgi <pgeorgi@google.com>2019-10-04 16:25:17 +0000
commitb3d597b1dddcacbae58115273a9b85c971eb830a (patch)
treecdd802081492f25970d5d17e04ba4b3a9b9e9287 /src
parent258f52b5203cb40b671b0d4f8b2d2eba5fa02668 (diff)
downloadcoreboot-b3d597b1dddcacbae58115273a9b85c971eb830a.tar.xz
mb/facebook/fbg1701: Remove ONBOARD_MICRON_MEM
ONBOARD_MICRON_MEM and ONBOARD_SAMSUNG_MEM are available. These are used to determine if Samsung or Micron onboard memory is assembled. This can not detected run-time. Choice is replaced by one config. 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 <fhendriks@eltan.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/35742 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/facebook/fbg1701/Kconfig13
-rw-r--r--src/mainboard/facebook/fbg1701/romstage.c2
2 files changed, 3 insertions, 12 deletions
diff --git a/src/mainboard/facebook/fbg1701/Kconfig b/src/mainboard/facebook/fbg1701/Kconfig
index 402165d00a..0aa4acc75d 100644
--- a/src/mainboard/facebook/fbg1701/Kconfig
+++ b/src/mainboard/facebook/fbg1701/Kconfig
@@ -31,21 +31,12 @@ config BOARD_SPECIFIC_OPTIONS
select INTEL_GMA_HAVE_VBT
select GENERIC_SPD_BIN
-choice
- prompt "Onboard memory manufacturer"
- default ONBOARD_MICRON_MEM
-
config ONBOARD_SAMSUNG_MEM
- bool "Samsung"
+ bool "Onboard memory manufacturer 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 d6b475c918..879cc9a9b0 100644
--- a/src/mainboard/facebook/fbg1701/romstage.c
+++ b/src/mainboard/facebook/fbg1701/romstage.c
@@ -35,7 +35,7 @@ void mainboard_memory_init_params(struct romstage_params *params,
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");