diff options
Diffstat (limited to 'src/mainboard/kontron')
| -rw-r--r-- | src/mainboard/kontron/986lcd-m/mainboard.c | 3 | ||||
| -rw-r--r-- | src/mainboard/kontron/bsl6/romstage.c | 3 | ||||
| -rw-r--r-- | src/mainboard/kontron/bsl6/variants/boxer26/romstage.c | 3 | ||||
| -rw-r--r-- | src/mainboard/kontron/ktqm77/mainboard.c | 9 |
4 files changed, 8 insertions, 10 deletions
diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c index 9aed0cdf2f..f13731bcf2 100644 --- a/src/mainboard/kontron/986lcd-m/mainboard.c +++ b/src/mainboard/kontron/986lcd-m/mainboard.c @@ -136,11 +136,10 @@ static void mainboard_init(void *chip_info) struct device *dev; for (i = 1; i <= 3; i++) { - int ethernet_disable = 0; char cmos_option_name[] = "ethernetx"; snprintf(cmos_option_name, sizeof(cmos_option_name), "ethernet%01d", i); - get_option(ðernet_disable, cmos_option_name); + int ethernet_disable = get_int_option(cmos_option_name, 0); if (!ethernet_disable) continue; printk(BIOS_DEBUG, "Disabling Ethernet NIC #%d\n", i); diff --git a/src/mainboard/kontron/bsl6/romstage.c b/src/mainboard/kontron/bsl6/romstage.c index 0cb7b06375..c5cba4d02c 100644 --- a/src/mainboard/kontron/bsl6/romstage.c +++ b/src/mainboard/kontron/bsl6/romstage.c @@ -38,7 +38,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd) memory_params->DqPinsInterleaved = true; - get_option(&memory_params->HyperThreading, "hyper_threading"); + const uint8_t ht = get_int_option("hyper_threading", memory_params->HyperThreading); + memory_params->HyperThreading = ht; variant_memory_init_params(mupd); } diff --git a/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c b/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c index f1409e0b42..d352522e90 100644 --- a/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c +++ b/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c @@ -13,9 +13,8 @@ void variant_memory_init_params(FSPM_UPD *const mupd) unsigned int i; for (i = 0; i < 3; ++i) { - u8 eth_enable = 1; nvram_var[sizeof(nvram_var) - 2] = '1' + i; - get_option(ð_enable, nvram_var); + u8 eth_enable = get_int_option(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/kontron/ktqm77/mainboard.c b/src/mainboard/kontron/ktqm77/mainboard.c index 95e639adcd..2d5063a694 100644 --- a/src/mainboard/kontron/ktqm77/mainboard.c +++ b/src/mainboard/kontron/ktqm77/mainboard.c @@ -149,17 +149,16 @@ static void mainboard_enable(struct device *dev) /* Install custom int15 handler for VGA OPROM */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif - - unsigned int disable = 0; - if ((get_option(&disable, "ethernet1") == CB_SUCCESS) && disable) { + unsigned int disable = get_int_option("ethernet1", 0); + if (disable) { struct device *nic = pcidev_on_root(0x1c, 2); if (nic) { printk(BIOS_DEBUG, "DISABLE FIRST NIC!\n"); nic->enabled = 0; } } - disable = 0; - if ((get_option(&disable, "ethernet2") == CB_SUCCESS) && disable) { + disable = get_int_option("ethernet2", 0); + if (disable) { struct device *nic = pcidev_on_root(0x1c, 3); if (nic) { printk(BIOS_DEBUG, "DISABLE SECOND NIC!\n"); |