summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2017-05-10 16:21:03 +0200
committerPatrick Georgi <pgeorgi@google.com>2017-05-11 16:44:46 +0200
commita5fcc2e42776b94c5dbb281589d49a84db601f4e (patch)
tree4df56a1c5614f5985e106a337d3579a51015d30b
parentf63fbdb63ae19bb0cc75ef2f3ab0301e8db4a1da (diff)
downloadcoreboot-a5fcc2e42776b94c5dbb281589d49a84db601f4e.tar.xz
mb/lenovo/x60/t60: Remove `fn_ctrl_swap` option
The EC doesn't support it. Change-Id: Id2964002406a5fcf992f0ffc3627e3f66a2bb13f Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/19654 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
-rw-r--r--src/mainboard/lenovo/t60/cmos.default3
-rw-r--r--src/mainboard/lenovo/t60/cmos.layout2
-rw-r--r--src/mainboard/lenovo/x60/cmos.default3
-rw-r--r--src/mainboard/lenovo/x60/cmos.layout2
4 files changed, 4 insertions, 6 deletions
diff --git a/src/mainboard/lenovo/t60/cmos.default b/src/mainboard/lenovo/t60/cmos.default
index 03b92e3d0f..b22ff414d4 100644
--- a/src/mainboard/lenovo/t60/cmos.default
+++ b/src/mainboard/lenovo/t60/cmos.default
@@ -14,8 +14,7 @@ bluetooth=Enable
wlan=Enable
wwan=Enable
trackpoint=Enable
-fn_ctrl_swap=Disable
sticky_fn=Disable
power_management_beeps=Enable
low_battery_beep=Enable
-gfx_uma_size=8M \ No newline at end of file
+gfx_uma_size=8M
diff --git a/src/mainboard/lenovo/t60/cmos.layout b/src/mainboard/lenovo/t60/cmos.layout
index af788c6bdd..b11852ac06 100644
--- a/src/mainboard/lenovo/t60/cmos.layout
+++ b/src/mainboard/lenovo/t60/cmos.layout
@@ -80,7 +80,7 @@ entries
952 8 h 0 volume
960 1 e 9 first_battery
961 1 e 1 trackpoint
-962 1 e 1 fn_ctrl_swap
+#962 1 r 0 unused
963 1 e 1 sticky_fn
964 1 e 1 power_management_beeps
965 1 e 1 low_battery_beep
diff --git a/src/mainboard/lenovo/x60/cmos.default b/src/mainboard/lenovo/x60/cmos.default
index 4e72734b72..9ed16d0b07 100644
--- a/src/mainboard/lenovo/x60/cmos.default
+++ b/src/mainboard/lenovo/x60/cmos.default
@@ -14,8 +14,7 @@ bluetooth=Enable
wlan=Enable
wwan=Enable
trackpoint=Enable
-fn_ctrl_swap=Disable
sticky_fn=Disable
power_management_beeps=Enable
low_battery_beep=Enable
-gfx_uma_size=8M \ No newline at end of file
+gfx_uma_size=8M
diff --git a/src/mainboard/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout
index ebc6678aa9..76714394eb 100644
--- a/src/mainboard/lenovo/x60/cmos.layout
+++ b/src/mainboard/lenovo/x60/cmos.layout
@@ -78,7 +78,7 @@ entries
951 1 e 1 wwan
952 1 e 1 wlan
953 1 e 1 trackpoint
-954 1 e 1 fn_ctrl_swap
+#954 1 r 0 unused
955 1 e 1 sticky_fn
956 1 e 1 power_management_beeps
959 1 e 1 low_battery_beep