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>
This commit is contained in:
Frans Hendriks 2019-10-02 09:27:56 +02:00 committed by Patrick Georgi
parent 258f52b520
commit b3d597b1dd
2 changed files with 3 additions and 12 deletions

View File

@ -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

View File

@ -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");