summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVladimir Serbinenko <phcoder@gmail.com>2014-01-11 03:45:53 +0100
committerVladimir Serbinenko <phcoder@gmail.com>2014-01-12 18:03:56 +0100
commit8e7e5254e4088d78f03b2a413721ba687e09b19c (patch)
tree5617c69595a31f8b0ce6fa7f9883819137bfd969 /src
parentadd3f7fda27eb93636b473471d17f985f14cbb8d (diff)
downloadcoreboot-8e7e5254e4088d78f03b2a413721ba687e09b19c.tar.xz
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@gmail.com> Reviewed-on: http://review.coreboot.org/4652 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Diffstat (limited to 'src')
-rw-r--r--src/ec/lenovo/h8/h8.c6
-rw-r--r--src/mainboard/lenovo/t60/cmos.layout1
-rw-r--r--src/mainboard/lenovo/x201/cmos.default1
-rw-r--r--src/mainboard/lenovo/x201/cmos.layout1
-rw-r--r--src/mainboard/lenovo/x60/cmos.default1
-rw-r--r--src/mainboard/lenovo/x60/cmos.layout1
6 files changed, 10 insertions, 1 deletions
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index 0c80d49d82..48f0cba6be 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 8f0e2be13c..9017405bba 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 c14e1446ef..c0c0d38cdd 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 bf78aafbd2..0f8cfa73e2 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 663fe5c3b8..adbafb54ed 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 4898180c39..b15f03b65b 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