Vladimir Serbinenko (phcoder@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4654
-gerrit
commit 1f152706fb3eca393ea9d96824e8c4a7c09bef87 Author: Vladimir Serbinenko phcoder@gmail.com Date: Sat Jan 11 04:22:35 2014 +0100
H8: Make trackpoint enable a CMOS option.
To be consistent with touchpad counterpart.
Change-Id: I72d09b41b964f80a81fbf409ef69dd368834a3e2 Signed-off-by: Vladimir Serbinenko phcoder@gmail.com --- src/ec/lenovo/h8/h8.c | 5 ++++- 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 | 3 ++- src/mainboard/lenovo/x60/cmos.layout | 1 + 6 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c index 090acf2..ece0d45 100644 --- a/src/ec/lenovo/h8/h8.c +++ b/src/ec/lenovo/h8/h8.c @@ -179,7 +179,10 @@ static void h8_enable(device_t dev) val = 1; h8_wlan_enable(val);
- h8_trackpoint_enable(1); + if (get_option(&val, "trackpoint") != CB_SUCCESS) + val = 1; + h8_trackpoint_enable(val); + h8_usb_power_enable(1);
if (get_option(&val, "volume") == CB_SUCCESS) diff --git a/src/mainboard/lenovo/t60/cmos.layout b/src/mainboard/lenovo/t60/cmos.layout index d5f3dbf..7d65c97 100644 --- a/src/mainboard/lenovo/t60/cmos.layout +++ b/src/mainboard/lenovo/t60/cmos.layout @@ -113,6 +113,7 @@ entries 1063 1 e 1 wlan 1064 8 h 0 volume 1072 1 e 9 first_battery +1073 1 e 1 trackpoint # -----------------------------------------------------------------
enumerations diff --git a/src/mainboard/lenovo/x201/cmos.default b/src/mainboard/lenovo/x201/cmos.default index a6d8ed1..b04bb1c 100644 --- a/src/mainboard/lenovo/x201/cmos.default +++ b/src/mainboard/lenovo/x201/cmos.default @@ -10,3 +10,4 @@ bluetooth=Enable wwan=Enable wlan=Enable touchpad=Enable +trackpoint=Enable diff --git a/src/mainboard/lenovo/x201/cmos.layout b/src/mainboard/lenovo/x201/cmos.layout index db58edf..2836403 100644 --- a/src/mainboard/lenovo/x201/cmos.layout +++ b/src/mainboard/lenovo/x201/cmos.layout @@ -91,7 +91,8 @@ entries 413 1 e 1 wwan 414 1 e 1 touchpad 415 1 e 1 wlan -#416 568 r 0 unused +416 1 e 1 trackpoint +#417 567 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 96d0922..33df716 100644 --- a/src/mainboard/lenovo/x60/cmos.default +++ b/src/mainboard/lenovo/x60/cmos.default @@ -13,4 +13,5 @@ tft_brightness=0xff first_battery=Primary bluetooth=Enable wlan=Enable -wwan=Enable \ No newline at end of file +wwan=Enable +trackpoint=Enable diff --git a/src/mainboard/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout index 13df7a5..69178a4 100644 --- a/src/mainboard/lenovo/x60/cmos.layout +++ b/src/mainboard/lenovo/x60/cmos.layout @@ -113,6 +113,7 @@ entries 1081 1 e 1 bluetooth 1082 1 e 1 wwan 1083 1 e 1 wlan +1084 1 e 1 trackpoint # -----------------------------------------------------------------
enumerations
-
Vladimir Serbinenko