From 88dcb3179b4b78a2376609577ae4dd4327fb59c7 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Mon, 26 Apr 2021 17:10:28 +0200 Subject: src: Retype option API to use unsigned integers The CMOS option system does not support negative integers. Thus, retype and rename the option API functions to reflect this. Change-Id: Id3480e5cfc0ec90674def7ef0919e0b7ac5b19b3 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/52672 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Rudolph Reviewed-by: Nico Huber Reviewed-by: Felix Singer --- src/mainboard/kontron/986lcd-m/early_init.c | 2 +- src/mainboard/kontron/986lcd-m/mainboard.c | 16 ++++++++-------- src/mainboard/kontron/bsl6/romstage.c | 2 +- src/mainboard/kontron/bsl6/variants/boxer26/romstage.c | 2 +- src/mainboard/kontron/ktqm77/mainboard.c | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/mainboard/kontron') diff --git a/src/mainboard/kontron/986lcd-m/early_init.c b/src/mainboard/kontron/986lcd-m/early_init.c index ff3babb45e..5bed24bec7 100644 --- a/src/mainboard/kontron/986lcd-m/early_init.c +++ b/src/mainboard/kontron/986lcd-m/early_init.c @@ -15,7 +15,7 @@ void mainboard_lpc_decode(void) { int lpt_en = 0; - if (get_int_option("lpt", 0)) + if (get_uint_option("lpt", 0)) lpt_en = LPT_LPC_EN; /* enable LPT */ pci_update_config16(PCI_DEV(0, 0x1f, 0), LPC_EN, ~LPT_LPC_EN, lpt_en); diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c index f13731bcf2..f621f9bd7c 100644 --- a/src/mainboard/kontron/986lcd-m/mainboard.c +++ b/src/mainboard/kontron/986lcd-m/mainboard.c @@ -46,15 +46,15 @@ struct temperature temperatures[] = { static void hwm_setup(void) { - int cpufan_control = 0, sysfan_control = 0; - int cpufan_speed = 0, sysfan_speed = 0; - int cpufan_temperature = 0, sysfan_temperature = 0; + unsigned int cpufan_control = 0, sysfan_control = 0; + unsigned int cpufan_speed = 0, sysfan_speed = 0; + unsigned int cpufan_temperature = 0, sysfan_temperature = 0; - cpufan_control = get_int_option("cpufan_cruise_control", FAN_CRUISE_CONTROL_DISABLED); - cpufan_speed = get_int_option("cpufan_speed", FAN_SPEED_5625); + cpufan_control = get_uint_option("cpufan_cruise_control", FAN_CRUISE_CONTROL_DISABLED); + cpufan_speed = get_uint_option("cpufan_speed", FAN_SPEED_5625); - sysfan_control = get_int_option("sysfan_cruise_control", FAN_CRUISE_CONTROL_DISABLED); - sysfan_speed = get_int_option("sysfan_speed", FAN_SPEED_5625); + sysfan_control = get_uint_option("sysfan_cruise_control", FAN_CRUISE_CONTROL_DISABLED); + sysfan_speed = get_uint_option("sysfan_speed", FAN_SPEED_5625); nuvoton_hwm_select_bank(hwm_base, 0); pnp_write_hwm5_index(hwm_base, 0x59, 0x20); /* Diode Selection */ @@ -139,7 +139,7 @@ static void mainboard_init(void *chip_info) char cmos_option_name[] = "ethernetx"; snprintf(cmos_option_name, sizeof(cmos_option_name), "ethernet%01d", i); - int ethernet_disable = get_int_option(cmos_option_name, 0); + unsigned int ethernet_disable = get_uint_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 c5cba4d02c..f38734c25c 100644 --- a/src/mainboard/kontron/bsl6/romstage.c +++ b/src/mainboard/kontron/bsl6/romstage.c @@ -38,7 +38,7 @@ void mainboard_memory_init_params(FSPM_UPD *mupd) memory_params->DqPinsInterleaved = true; - const uint8_t ht = get_int_option("hyper_threading", memory_params->HyperThreading); + const uint8_t ht = get_uint_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 d352522e90..1985d4ec18 100644 --- a/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c +++ b/src/mainboard/kontron/bsl6/variants/boxer26/romstage.c @@ -14,7 +14,7 @@ void variant_memory_init_params(FSPM_UPD *const mupd) for (i = 0; i < 3; ++i) { nvram_var[sizeof(nvram_var) - 2] = '1' + i; - u8 eth_enable = get_int_option(nvram_var, 1); + u8 eth_enable = get_uint_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 2d5063a694..f8ef53834f 100644 --- a/src/mainboard/kontron/ktqm77/mainboard.c +++ b/src/mainboard/kontron/ktqm77/mainboard.c @@ -149,7 +149,7 @@ static void mainboard_enable(struct device *dev) /* Install custom int15 handler for VGA OPROM */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif - unsigned int disable = get_int_option("ethernet1", 0); + unsigned int disable = get_uint_option("ethernet1", 0); if (disable) { struct device *nic = pcidev_on_root(0x1c, 2); if (nic) { @@ -157,7 +157,7 @@ static void mainboard_enable(struct device *dev) nic->enabled = 0; } } - disable = get_int_option("ethernet2", 0); + disable = get_uint_option("ethernet2", 0); if (disable) { struct device *nic = pcidev_on_root(0x1c, 3); if (nic) { -- cgit v1.2.3