From 72b1d087fba3f718959fe909f18dfa9d8be57bdb Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Sun, 16 Oct 2016 23:09:16 +0200 Subject: [PATCH] UPSTREAM: mb/lenovo/x60,t60: Move EC CMOS parameters in checksummed space This allows for defaults to be applied to CMOS parameters when cmos checksum is incorrect. This probably results in changed cmos settings for current users of these targets. BUG=none BRANCH=none TEST=none Change-Id: I28bec2270b9904c310408b15fa5a1fd2ff40a973 Signed-off-by: Patrick Georgi Original-Commit-Id: 84e6881ba5bdba7dc54c82b8f372079191ba4cd8 Original-Change-Id: Ifec0093f4b0dbaa51b96812a041f0eaf5c58ee86 Original-Signed-off-by: Arthur Heymans Original-Reviewed-on: https://review.coreboot.org/17041 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Martin Roth Reviewed-on: https://chromium-review.googlesource.com/437466 --- src/mainboard/lenovo/t60/cmos.layout | 26 ++++++++++++++------------ src/mainboard/lenovo/x60/cmos.layout | 27 ++++++++++++++------------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/mainboard/lenovo/t60/cmos.layout b/src/mainboard/lenovo/t60/cmos.layout index 2cd4e7b7ba..af788c6bdd 100644 --- a/src/mainboard/lenovo/t60/cmos.layout +++ b/src/mainboard/lenovo/t60/cmos.layout @@ -70,7 +70,20 @@ entries # coreboot config options: cpu 944 1 e 2 hyper_threading -#945 7 r 0 unused +#945 3 r 0 unused + +# coreboot config options: ec +948 1 e 1 touchpad +949 1 e 1 bluetooth +950 1 e 1 wwan +951 1 e 1 wlan +952 8 h 0 volume +960 1 e 9 first_battery +961 1 e 1 trackpoint +962 1 e 1 fn_ctrl_swap +963 1 e 1 sticky_fn +964 1 e 1 power_management_beeps +965 1 e 1 low_battery_beep # coreboot config options: check sums 984 16 h 0 check_sum @@ -83,17 +96,6 @@ entries 1048 4 r 0 C0DRT1 1052 4 r 0 C1DRT1 -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 -1073 1 e 1 trackpoint -1074 1 e 1 fn_ctrl_swap -1075 1 e 1 sticky_fn -1076 1 e 1 power_management_beeps -1077 1 e 1 low_battery_beep # ----------------------------------------------------------------- enumerations diff --git a/src/mainboard/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout index 3e316c918c..ebc6678aa9 100644 --- a/src/mainboard/lenovo/x60/cmos.layout +++ b/src/mainboard/lenovo/x60/cmos.layout @@ -70,7 +70,20 @@ entries # coreboot config options: cpu 944 1 e 2 hyper_threading -#945 7 r 0 unused +#945 4 r 0 unused + +# coreboot config options: ec +949 1 e 9 first_battery +950 1 e 1 bluetooth +951 1 e 1 wwan +952 1 e 1 wlan +953 1 e 1 trackpoint +954 1 e 1 fn_ctrl_swap +955 1 e 1 sticky_fn +956 1 e 1 power_management_beeps +959 1 e 1 low_battery_beep +960 8 h 0 volume +968 8 h 0 tft_brightness # coreboot config options: check sums 984 16 h 0 check_sum @@ -82,18 +95,6 @@ entries 1040 8 r 0 RCVENMT 1048 4 r 0 C0DRT1 1052 4 r 0 C1DRT1 - -1064 8 h 0 volume -1072 8 h 0 tft_brightness -1080 1 e 9 first_battery -1081 1 e 1 bluetooth -1082 1 e 1 wwan -1083 1 e 1 wlan -1084 1 e 1 trackpoint -1085 1 e 1 fn_ctrl_swap -1086 1 e 1 sticky_fn -1087 1 e 1 power_management_beeps -1088 1 e 1 low_battery_beep # ----------------------------------------------------------------- enumerations