aboutsummaryrefslogtreecommitdiffstats
path: root/src/southbridge
diff options
context:
space:
mode:
Diffstat (limited to 'src/southbridge')
-rw-r--r--src/southbridge/amd/sb600/sata.c6
-rw-r--r--src/southbridge/intel/i82801dx/lpc.c4
-rw-r--r--src/southbridge/intel/i82801gx/lpc.c4
-rw-r--r--src/southbridge/intel/i82801ix/lpc.c4
4 files changed, 8 insertions, 10 deletions
diff --git a/src/southbridge/amd/sb600/sata.c b/src/southbridge/amd/sb600/sata.c
index 2ff718230..34ac0aca5 100644
--- a/src/southbridge/amd/sb600/sata.c
+++ b/src/southbridge/amd/sb600/sata.c
@@ -119,10 +119,8 @@ static void sata_init(struct device *dev)
pci_write_config8(dev, 0x40, byte);
// 1 means IDE, 0 means AHCI
- if (get_option(&i, "sata_mode") != CB_SUCCESS) {
- // no cmos option
- i = CONFIG_SATA_MODE;
- }
+ i = CONFIG_SATA_MODE;
+ get_option(&i, "sata_mode");
printk(BIOS_INFO, "%s: setting sata mode = %s\n", __func__, (i == SATA_MODE_IDE)?"ide":"ahci" );
dword = pci_read_config32(dev, 0x8);
diff --git a/src/southbridge/intel/i82801dx/lpc.c b/src/southbridge/intel/i82801dx/lpc.c
index 83d617897..2f3db86b2 100644
--- a/src/southbridge/intel/i82801dx/lpc.c
+++ b/src/southbridge/intel/i82801dx/lpc.c
@@ -116,8 +116,8 @@ static void i82801dx_power_options(device_t dev)
*
* If the option is not existent (Laptops), use MAINBOARD_POWER_ON.
*/
- if (get_option(&pwr_on, "power_on_after_fail") != CB_SUCCESS)
- pwr_on = MAINBOARD_POWER_ON;
+ pwr_on = MAINBOARD_POWER_ON;
+ get_option(&pwr_on, "power_on_after_fail");
reg8 = pci_read_config8(dev, GEN_PMCON_3);
reg8 &= 0xfe;
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index cbc010605..b8edfe3fd 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -179,8 +179,8 @@ static void i82801gx_power_options(device_t dev)
*
* If the option is not existent (Laptops), use MAINBOARD_POWER_ON.
*/
- if (get_option(&pwr_on, "power_on_after_fail") != CB_SUCCESS)
- pwr_on = MAINBOARD_POWER_ON;
+ pwr_on = MAINBOARD_POWER_ON;
+ get_option(&pwr_on, "power_on_after_fail");
reg8 = pci_read_config8(dev, GEN_PMCON_3);
reg8 &= 0xfe;
diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index 0ba33d675..4f576c4e3 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -186,8 +186,8 @@ static void i82801ix_power_options(device_t dev)
*
* If the option is not existent (Laptops), use MAINBOARD_POWER_ON.
*/
- if (get_option(&pwr_on, "power_on_after_fail") != CB_SUCCESS)
- pwr_on = MAINBOARD_POWER_ON;
+ pwr_on = MAINBOARD_POWER_ON;
+ get_option(&pwr_on, "power_on_after_fail");
reg8 = pci_read_config8(dev, D31F0_GEN_PMCON_3);
reg8 &= 0xfe;