From b3d597b1dddcacbae58115273a9b85c971eb830a Mon Sep 17 00:00:00 2001 From: Frans Hendriks Date: Wed, 2 Oct 2019 09:27:56 +0200 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/35742 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Rudolph --- src/mainboard/facebook/fbg1701/Kconfig | 13 ++----------- src/mainboard/facebook/fbg1701/romstage.c | 2 +- 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");