Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4054
-gerrit
commit d46b40440e6d7a824cd6611099264558e981adce
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Wed Nov 13 18:31:24 2013 +0100
Make H8 work by default
Currently H8 skips important init if unable to access CMOS config.
Change default to enable all features to have a sane system without
using CMOS config.
Change-Id: I94f39d9d2b4044d60f0cd7b7700bc8629e99201c
Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com>
---
src/ec/lenovo/h8/h8.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index 9ffdfc1..ca34fb6 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -150,16 +150,17 @@ static void h8_enable(device_t dev)
if (!get_option(&val, "volume"))
ec_write(H8_VOLUME_CONTROL, val);
+ if (get_option(&val, "bluetooth"))
+ val = 1;
+ h8_bluetooth_enable(val);
- if (!get_option(&val, "bluetooth"))
- h8_bluetooth_enable(val);
+ if (get_option(&val, "first_battery"))
+ val = 1;
- if (!get_option(&val, "first_battery")) {
- tmp = ec_read(H8_CONFIG3);
- tmp &= ~(1 << 4);
- tmp |= (val & 1)<< 4;
- ec_write(H8_CONFIG3, tmp);
- }
+ tmp = ec_read(H8_CONFIG3);
+ tmp &= ~(1 << 4);
+ tmp |= (val & 1) << 4;
+ ec_write(H8_CONFIG3, tmp);
h8_set_audio_mute(0);
}
Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4057
-gerrit
commit 8803b804709f91950581bfcb15844f2682a8e5db
Author: Paul Menzel <paulepanter(a)users.sourceforge.net>
Date: Wed Nov 13 23:05:23 2013 +0100
Lenovo T60/X60: cmos.layout: Replace tabulators with spaces for consistency
Change-Id: Iec0abae8a4b18ac737e9ebb3eac219182729be0f
Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
---
src/mainboard/lenovo/t60/cmos.layout | 2 +-
src/mainboard/lenovo/x60/cmos.layout | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mainboard/lenovo/t60/cmos.layout b/src/mainboard/lenovo/t60/cmos.layout
index 7539b60..670c515 100644
--- a/src/mainboard/lenovo/t60/cmos.layout
+++ b/src/mainboard/lenovo/t60/cmos.layout
@@ -108,7 +108,7 @@ entries
1052 4 r 0 C1DRT1
1060 1 e 1 touchpad
-1061 1 e 1 bluetooth
+1061 1 e 1 bluetooth
1064 8 h 0 volume
1072 1 e 9 first_battery
# -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout
index ab51a84..8d18525 100644
--- a/src/mainboard/lenovo/x60/cmos.layout
+++ b/src/mainboard/lenovo/x60/cmos.layout
@@ -110,7 +110,7 @@ entries
1064 8 h 0 volume
1072 8 h 0 tft_brightness
1080 1 e 9 first_battery
-1081 1 e 1 bluetooth
+1081 1 e 1 bluetooth
# -----------------------------------------------------------------
enumerations
Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4054
-gerrit
commit c98fa4120a8e0ac0df41415195a0bd6f276814a7
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Wed Nov 13 18:31:24 2013 +0100
ec/lenovo/h8: Enable devices by default
Currently H8 skips important init if it is unable to access CMOS config.
Change the defaults to enable all features to have a sane system when
using a system without CMOS config.
Change-Id: I94f39d9d2b4044d60f0cd7b7700bc8629e99201c
Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com>
---
src/ec/lenovo/h8/h8.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index efbb907..62b9f4b 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -158,19 +158,21 @@ static void h8_enable(device_t dev)
if (!get_option(&val, "volume"))
ec_write(H8_VOLUME_CONTROL, val);
-
- if (!get_option(&val, "bluetooth"))
- h8_bluetooth_enable(val);
+ if (get_option(&val, "bluetooth"))
+ val = 1;
+ h8_bluetooth_enable(val);
if (!get_option(&val, "wwan"))
- h8_wwan_enable(val);
+ val = 1
+ h8_wwan_enable(val);
- if (!get_option(&val, "first_battery")) {
- tmp = ec_read(H8_CONFIG3);
- tmp &= ~(1 << 4);
- tmp |= (val & 1)<< 4;
- ec_write(H8_CONFIG3, tmp);
- }
+ if (get_option(&val, "first_battery"))
+ val = 1;
+
+ tmp = ec_read(H8_CONFIG3);
+ tmp &= ~(1 << 4);
+ tmp |= (val & 1) << 4;
+ ec_write(H8_CONFIG3, tmp);
h8_set_audio_mute(0);
}