[coreboot-gerrit] Change in coreboot[master]: mainboard: Use `read_option_X` helpers

[Angel Pons (Code Review)]

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47137 )

Change subject: mainboard: Use `read_option_X` helpers
......................................................................

mainboard: Use `read_option_X` helpers

Change-Id: I9273b90b6a21b8f52fa42d9ff03a9b56eec9fcbf
Signed-off-by: Angel Pons 
---
M src/mainboard/kontron/bsl6/variants/boxer26/romstage.c
M src/mainboard/lenovo/t430s/variants/t430s/romstage.c
M src/mainboard/lenovo/t440p/romstage.c
M src/mainboard/siemens/chili/romstage.c
M src/mainboard/siemens/chili/variants/chili/romstage.c
M src/mainboard/supermicro/x10slm-f/mainboard.c
6 files changed, 6 insertions(+), 15 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/47137/1

diff --git a/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c b/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c
index 9c14d84..20f9126 100644
--- a/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c
+++ b/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c
@@ -14,9 +14,8 @@
    unsigned int i;

for (i = 0; i < 3; ++i) {
-		u8 eth_enable = 1;
    	nvram_var[sizeof(nvram_var) - 2] = '1' + i;
-		get_option(&eth_enable, nvram_var);
+		u8 eth_enable = read_option_u8(nvram_var, 1);
    	if (!eth_enable) {
    		printk(BIOS_INFO, "Disabling ethernet%u.\n", 1 + i);
    		mupd->FspmConfig.PcieRpEnableMask &= ~(1 << (i + 8));
diff --git a/src/mainboard/lenovo/t430s/variants/t430s/romstage.c b/src/mainboard/lenovo/t430s/variants/t430s/romstage.c
index 349d71e..05bd441 100644
--- a/src/mainboard/lenovo/t430s/variants/t430s/romstage.c
+++ b/src/mainboard/lenovo/t430s/variants/t430s/romstage.c
@@ -33,9 +33,7 @@

void mainboard_early_init(int s3resume)
 {
-	u8 enable_peg;
-	if (get_option(&enable_peg, "enable_dual_graphics") != CB_SUCCESS)
-		enable_peg = 0;
+	u8 enable_peg = read_option_u8("enable_dual_graphics", 0);

bool power_en = pmh7_dgpu_power_state();

diff --git a/src/mainboard/lenovo/t440p/romstage.c b/src/mainboard/lenovo/t440p/romstage.c
index 3e5cc0d..3c87a3c 100644
--- a/src/mainboard/lenovo/t440p/romstage.c
+++ b/src/mainboard/lenovo/t440p/romstage.c
@@ -22,9 +22,7 @@

void mb_late_romstage_setup(void)
 {
-	u8 enable_peg;
-	if (get_option(&enable_peg, "enable_dual_graphics") != CB_SUCCESS)
-		enable_peg = 0;
+	u8 enable_peg = read_option_u8("enable_dual_graphics", 0);

bool power_en = pmh7_dgpu_power_state();

diff --git a/src/mainboard/siemens/chili/romstage.c b/src/mainboard/siemens/chili/romstage.c
index c1ec7e4..c940521 100644
--- a/src/mainboard/siemens/chili/romstage.c
+++ b/src/mainboard/siemens/chili/romstage.c
@@ -18,7 +18,6 @@

void mainboard_memory_init_params(FSPM_UPD *memupd)
 {
-	uint8_t vtd = 1;
    const struct cnl_mb_cfg cfg = {
    	.spd = {
    		[0] = { READ_SMBUS, { 0x50 << 1 } },
@@ -34,7 +33,7 @@
    memupd->FspmConfig.EccSupport = 1;
    memupd->FspmConfig.UserBd = BOARD_TYPE_MOBILE;

-	get_option(&vtd, "vtd");
+	const uint8_t vtd = read_option_u8("vtd", 1);
    memupd->FspmTestConfig.VtdDisable = !vtd;
    get_option(&memupd->FspmConfig.HyperThreading, "hyper_threading");

diff --git a/src/mainboard/siemens/chili/variants/chili/romstage.c b/src/mainboard/siemens/chili/variants/chili/romstage.c
index ebffc8d3..ae863cc 100644
--- a/src/mainboard/siemens/chili/variants/chili/romstage.c
+++ b/src/mainboard/siemens/chili/variants/chili/romstage.c
@@ -8,9 +8,8 @@

void variant_romstage_params(FSPM_UPD *const mupd)
 {
-	uint8_t eth_enable = 1;
+	const uint8_t eth_enable = read_option_u8("ethernet1", 1);

-	get_option(&eth_enable, "ethernet1");
    if (!eth_enable) {
    	printk(BIOS_DEBUG, "Disabling ethernet1.\n");
    	mupd->FspmConfig.PcieRpEnableMask &= ~(1 << 5);
diff --git a/src/mainboard/supermicro/x10slm-f/mainboard.c b/src/mainboard/supermicro/x10slm-f/mainboard.c
index 2f20606..428f61a 100644
--- a/src/mainboard/supermicro/x10slm-f/mainboard.c
+++ b/src/mainboard/supermicro/x10slm-f/mainboard.c
@@ -30,9 +30,7 @@

static void mainboard_enable(struct device *dev)
 {
-	u8 hide = 0;
-
-	if (get_option(&hide, "hide_ast2400") == CB_SUCCESS && hide)
+	if (read_option_u8("hide_ast2400", false))
    	hide_ast2400();
 }