[coreboot-gerrit] Patch set updated for coreboot: 2e0b917 ec/lenovo/h8: make wlan config a CMOS option

[Vladimir Serbinenko (phcoder@gmail.com)]

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 2e0b917724323b6b42843fde1f2dbe2fbbb0f27b
Author: Vladimir Serbinenko <phcoder at gmail.com>
Date:   Sat Jan 11 03:45:53 2014 +0100

    ec/lenovo/h8: make wlan config a 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  | 1 +
 src/mainboard/lenovo/x60/cmos.default  | 1 +
 src/mainboard/lenovo/x60/cmos.layout   | 1 +
 6 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index 0c80d49..48f0cba 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -211,7 +211,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 8f0e2be..9017405 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
 1074         1       e       1        fn_ctrl_swap
diff --git a/src/mainboard/lenovo/x201/cmos.default b/src/mainboard/lenovo/x201/cmos.default
index c14e144..c0c0d38 100644
--- a/src/mainboard/lenovo/x201/cmos.default
+++ b/src/mainboard/lenovo/x201/cmos.default
@@ -8,6 +8,7 @@ volume=0x3
 first_battery=Primary
 bluetooth=Enable
 wwan=Enable
+wlan=Enable
 touchpad=Enable
 fn_ctrl_swap=Disable
 sticky_fn=Disable
diff --git a/src/mainboard/lenovo/x201/cmos.layout b/src/mainboard/lenovo/x201/cmos.layout
index bf78aaf..0f8cfa7 100644
--- a/src/mainboard/lenovo/x201/cmos.layout
+++ b/src/mainboard/lenovo/x201/cmos.layout
@@ -90,6 +90,7 @@ entries
 412         1       e       1        bluetooth
 413         1       e       1        wwan
 414         1       e       1        touchpad
+415         1       e       1        wlan
 417         1       e       1        fn_ctrl_swap
 418         1       e       1        sticky_fn
 419         1       e       1        power_management_beeps
diff --git a/src/mainboard/lenovo/x60/cmos.default b/src/mainboard/lenovo/x60/cmos.default
index 663fe5c..adbafb5 100644
--- a/src/mainboard/lenovo/x60/cmos.default
+++ b/src/mainboard/lenovo/x60/cmos.default
@@ -12,6 +12,7 @@ volume=0x3
 tft_brightness=0xff
 first_battery=Primary
 bluetooth=Enable
+wlan=Enable
 fn_ctrl_swap=Disable
 sticky_fn=Disable
 power_management_beeps=Enable
diff --git a/src/mainboard/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout
index 4898180..b15f03b 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        wlan
 1085         1       e       1        fn_ctrl_swap
 1086         1       e       1        sticky_fn
 1087         1       e       1        power_management_beeps