[coreboot-gerrit] New patch to review for coreboot: 057a38b H8: make wlan CMOS option

Vladimir Serbinenko (phcoder@gmail.com) gerrit at coreboot.org
Sat Jan 11 03:46:23 CET 2014


Vladimir Serbinenko (phcoder at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4652

-gerrit

commit 057a38b7ba853fa31e24c7af7e1241658950e8a4
Author: Vladimir Serbinenko <phcoder at gmail.com>
Date:   Sat Jan 11 03:45:53 2014 +0100

    H8: make wlan CMOS option
    
    To stay in line with wwan and bluetooth.
    
    Change-Id: Iafe2dc97fc2aec5c2ad1834659b796a6b079c1bc
    Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
---
 src/ec/lenovo/h8/h8.c                  | 6 +++++-
 src/mainboard/lenovo/t60/cmos.layout   | 1 +
 src/mainboard/lenovo/x201/cmos.default | 1 +
 src/mainboard/lenovo/x201/cmos.layout  | 3 ++-
 src/mainboard/lenovo/x60/cmos.default  | 2 ++
 src/mainboard/lenovo/x60/cmos.layout   | 1 +
 6 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index c25903a..8b0ca20 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -174,7 +174,11 @@ static void h8_enable(device_t dev)
 	ec_write(0x1f, conf->eventf_enable);
 
 	ec_write(H8_FAN_CONTROL, H8_FAN_CONTROL_AUTO);
-	h8_wlan_enable(1);
+
+	if (get_option(&val, "wlan") != CB_SUCCESS)
+		val = 1;
+	h8_wlan_enable(val);
+
 	h8_trackpoint_enable(conf->trackpoint_enable);
 	h8_usb_power_enable(1);
 
diff --git a/src/mainboard/lenovo/t60/cmos.layout b/src/mainboard/lenovo/t60/cmos.layout
index a179752..d5f3dbf 100644
--- a/src/mainboard/lenovo/t60/cmos.layout
+++ b/src/mainboard/lenovo/t60/cmos.layout
@@ -110,6 +110,7 @@ entries
 1060         1       e       1        touchpad
 1061         1       e       1        bluetooth
 1062         1       e       1        wwan
+1063         1       e       1        wlan
 1064         8       h       0        volume
 1072         1       e       9        first_battery
 # -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/x201/cmos.default b/src/mainboard/lenovo/x201/cmos.default
index 4577e70..a6d8ed1 100644
--- a/src/mainboard/lenovo/x201/cmos.default
+++ b/src/mainboard/lenovo/x201/cmos.default
@@ -8,4 +8,5 @@ volume=0x3
 first_battery=Primary
 bluetooth=Enable
 wwan=Enable
+wlan=Enable
 touchpad=Enable
diff --git a/src/mainboard/lenovo/x201/cmos.layout b/src/mainboard/lenovo/x201/cmos.layout
index 3959178..db58edf 100644
--- a/src/mainboard/lenovo/x201/cmos.layout
+++ b/src/mainboard/lenovo/x201/cmos.layout
@@ -90,7 +90,8 @@ entries
 412         1       e       1        bluetooth
 413         1       e       1        wwan
 414         1       e       1        touchpad
-#415        569     r       0        unused
+415         1       e       1        wlan
+#416        568     r       0        unused
 
 # coreboot config options: check sums
 984         16       h       0        check_sum
diff --git a/src/mainboard/lenovo/x60/cmos.default b/src/mainboard/lenovo/x60/cmos.default
index 5d82ff0..96d0922 100644
--- a/src/mainboard/lenovo/x60/cmos.default
+++ b/src/mainboard/lenovo/x60/cmos.default
@@ -12,3 +12,5 @@ volume=0x3
 tft_brightness=0xff
 first_battery=Primary
 bluetooth=Enable
+wlan=Enable
+wwan=Enable
\ No newline at end of file
diff --git a/src/mainboard/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout
index 45bb95a..730c63e 100644
--- a/src/mainboard/lenovo/x60/cmos.layout
+++ b/src/mainboard/lenovo/x60/cmos.layout
@@ -112,6 +112,7 @@ entries
 1080         1       e       9        first_battery
 1081         1       e       1        bluetooth
 1082         1       e       1        wwan
+1083         1       e       1        wwan
 # -----------------------------------------------------------------
 
 enumerations



More information about the coreboot-gerrit mailing list