From a1357659b2a72c349091a0abd7a0276b4fd6946d Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Thu, 28 Jan 2016 18:03:59 -0500 Subject: Revert "reset x60/t60/macbook21 to older coreboot revisions" This reverts commit 3b56767917dccd59c4af7c289450a053982e984a. --- (limited to 'resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60') diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch deleted file mode 100644 index 691c30d..0000000 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e1a421df8add1b976ee9bd001c88fbc95900e1f3 Mon Sep 17 00:00:00 2001 -From: Vladimir Serbinenko -Date: Thu, 21 Aug 2014 02:25:59 +0200 -Subject: [PATCH 13/22] lenovo/x60: Enable text mode native gfx init - -Change-Id: I3aad96a7034c73e447cf8995473a45ffd3893f3f -Signed-off-by: Vladimir Serbinenko ---- - src/mainboard/lenovo/x60/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig -index 0125d8c..ab4b58e 100644 ---- a/src/mainboard/lenovo/x60/Kconfig -+++ b/src/mainboard/lenovo/x60/Kconfig -@@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy - select HAVE_ACPI_RESUME - select USE_OPTION_TABLE - select MAINBOARD_HAS_NATIVE_VGA_INIT -+ select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG - select H8_DOCK_EARLY_INIT - select DRIVERS_LENOVO_WACOM - select INTEL_EDID --- -1.9.1 - diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0014-lenovo-x60-Enable-legacy-brightness-controls-native-.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0014-lenovo-x60-Enable-legacy-brightness-controls-native-.patch deleted file mode 100644 index 1c5b4b3..0000000 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0014-lenovo-x60-Enable-legacy-brightness-controls-native-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 89f4c7561e486030d867674e4df2978a7260c4a7 Mon Sep 17 00:00:00 2001 -From: Francis Rowe -Date: Sat, 11 Oct 2014 16:43:28 +0100 -Subject: [PATCH 14/22] lenovo/x60: Enable legacy brightness controls (native - graphics) - -Value obtained by reading BLC_PWM_CTL when running the VBIOS (option ROM). - -Change-Id: Id855c4e91fe71fb489739e62fbe99ca22841acd2 -Signed-off-by: Francis Rowe ---- - src/mainboard/lenovo/x60/devicetree.cb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb -index 382ebaf..4e02d3c 100644 ---- a/src/mainboard/lenovo/x60/devicetree.cb -+++ b/src/mainboard/lenovo/x60/devicetree.cb -@@ -25,7 +25,7 @@ chip northbridge/intel/i945 - register "gpu_hotplug" = "0x00000220" - register "gpu_lvds_use_spread_spectrum_clock" = "1" - register "gpu_lvds_is_dual_channel" = "0" -- register "gpu_backlight" = "0x1280128" -+ register "gpu_backlight" = "0x879F879E" - - device cpu_cluster 0 on - chip cpu/intel/socket_mFCPGA478 --- -1.9.1 - diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0015-lenovo-t60-Enable-native-intel-gfx-init.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0015-lenovo-t60-Enable-native-intel-gfx-init.patch deleted file mode 100644 index f54094a..0000000 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0015-lenovo-t60-Enable-native-intel-gfx-init.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5a762600dd0d41c1f1f24dfccea62d9cefb5b3d6 Mon Sep 17 00:00:00 2001 -From: Vladimir Serbinenko -Date: Tue, 4 Mar 2014 18:08:26 +0100 -Subject: [PATCH 15/22] lenovo/t60: Enable native intel gfx init. - -Tested on T60 with intel graphics. - -Change-Id: Id74d0a1315749052e7313135242e6b64862aa5e1 -Signed-off-by: Vladimir Serbinenko ---- - src/mainboard/lenovo/t60/Kconfig | 3 +++ - src/mainboard/lenovo/t60/devicetree.cb | 5 +++++ - 2 files changed, 8 insertions(+) - -diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig -index 0cf19a1..2254185 100644 ---- a/src/mainboard/lenovo/t60/Kconfig -+++ b/src/mainboard/lenovo/t60/Kconfig -@@ -20,8 +20,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy - select CHANNEL_XOR_RANDOMIZATION - select HAVE_ACPI_TABLES - select HAVE_ACPI_RESUME -+ select MAINBOARD_HAS_NATIVE_VGA_INIT - select H8_DOCK_EARLY_INIT - select HAVE_CMOS_DEFAULT -+ select INTEL_EDID -+ - config MAINBOARD_DIR - string - default lenovo/t60 -diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb -index bca0787..a0ee7f9 100644 ---- a/src/mainboard/lenovo/t60/devicetree.cb -+++ b/src/mainboard/lenovo/t60/devicetree.cb -@@ -22,6 +22,11 @@ - - chip northbridge/intel/i945 - -+ register "gpu_hotplug" = "0x00000220" -+ register "gpu_lvds_use_spread_spectrum_clock" = "1" -+ register "gpu_lvds_is_dual_channel" = "1" -+ register "gpu_backlight" = "0x1280128" -+ - device cpu_cluster 0 on - chip cpu/intel/socket_mFCPGA478 - device lapic 0 on end --- -1.9.1 - diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch deleted file mode 100644 index 6aee3ad..0000000 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 875078b081cfe58eaf755bfdd10c743b7207be0f Mon Sep 17 00:00:00 2001 -From: Francis Rowe -Date: Sat, 11 Oct 2014 18:41:35 +0100 -Subject: [PATCH 16/22] lenovo/t60: Enable text mode native gfx init - -Change-Id: Iffd2b1d5f86d4b872f8d39466cbbccd088ef7784 -Signed-off-by: Francis Rowe ---- - src/mainboard/lenovo/t60/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig -index 2254185..52eeda3 100644 ---- a/src/mainboard/lenovo/t60/Kconfig -+++ b/src/mainboard/lenovo/t60/Kconfig -@@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy - select HAVE_ACPI_TABLES - select HAVE_ACPI_RESUME - select MAINBOARD_HAS_NATIVE_VGA_INIT -+ select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG - select H8_DOCK_EARLY_INIT - select HAVE_CMOS_DEFAULT - select INTEL_EDID --- -1.9.1 - diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch deleted file mode 100644 index 7757620..0000000 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 519a5be5914a2949f93f4c2f76b22cf4e6102879 Mon Sep 17 00:00:00 2001 -From: Francis Rowe -Date: Sat, 11 Oct 2014 20:36:10 +0100 -Subject: [PATCH 17/22] lenovo/t60: Enable legacy brightness controls (native - graphics) - -Value obtained by reading BLC_PWM_CTL when running the VBIOS (option ROM). - -Change-Id: I95f634c5071f6d4bdd423819ce4e40985732761c -Signed-off-by: Francis Rowe ---- - src/mainboard/lenovo/t60/devicetree.cb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb -index a0ee7f9..43f570e 100644 ---- a/src/mainboard/lenovo/t60/devicetree.cb -+++ b/src/mainboard/lenovo/t60/devicetree.cb -@@ -25,7 +25,7 @@ chip northbridge/intel/i945 - register "gpu_hotplug" = "0x00000220" - register "gpu_lvds_use_spread_spectrum_clock" = "1" - register "gpu_lvds_is_dual_channel" = "1" -- register "gpu_backlight" = "0x1280128" -+ register "gpu_backlight" = "0x58BF58BE" - - device cpu_cluster 0 on - chip cpu/intel/socket_mFCPGA478 --- -1.9.1 - diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch deleted file mode 100644 index 70bf654..0000000 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch +++ /dev/null @@ -1,95 +0,0 @@ -From a36e204862fc556c7d06cbc9c29f6b0a4df21287 Mon Sep 17 00:00:00 2001 -From: Francis Rowe -Date: Mon, 13 Oct 2014 00:14:53 +0100 -Subject: [PATCH 18/22] NOTFORMERGE: ec/lenovo/h8: - wlan/trackpoint/touchpad/bluetooth/wwan - -Permanently enable them. Ignore configuration made by nvramtool. -Almost every user will want all of these to be enabled, and those -who would like them to be disabled would physically remove the -relevant components from their machine anyway, or just not use -them (in the case of the touchpad or trackpoint). So, why make it -configurable in the first place? All it does is add confusion. - -The mind boggles. - -Change-Id: Ic76ab9ab9c865f30312378e18af58bece6c3260a -Signed-off-by: Francis Rowe ---- - src/ec/lenovo/h8/h8.c | 21 +++++++++++---------- - src/ec/lenovo/pmh7/pmh7.c | 11 ++++------- - 2 files changed, 15 insertions(+), 17 deletions(-) - -diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c -index 13b0483..b688e64 100644 ---- a/src/ec/lenovo/h8/h8.c -+++ b/src/ec/lenovo/h8/h8.c -@@ -245,9 +245,11 @@ static void h8_enable(struct device *dev) - - ec_write(H8_FAN_CONTROL, H8_FAN_CONTROL_AUTO); - -- if (get_option(&val, "wlan") != CB_SUCCESS) -- val = 1; -- h8_wlan_enable(val); -+ // Permanently enable wifi -+ // Intel wifi could be a security risk because it uses firmware. Wlan chip has DMA -+ // and could leak data over a side-channel. Using another manufacturer is recommended. -+ // see http://libreboot.org/docs/index.html#recommended_wifi -+ h8_wlan_enable(1); - - h8_trackpoint_enable(1); - h8_usb_power_enable(1); -@@ -255,14 +257,13 @@ static void h8_enable(struct device *dev) - if (get_option(&val, "volume") == CB_SUCCESS) - ec_write(H8_VOLUME_CONTROL, val); - -- if (get_option(&val, "bluetooth") != CB_SUCCESS) -- val = 1; -- h8_bluetooth_enable(val); -- -- if (get_option(&val, "wwan") != CB_SUCCESS) -- val = 1; -+ // Permanently enable bluetooth. -+ // NOTE: bluetooth is a potential security risk. Physical removal of the bluetooth module is recommended. -+ h8_bluetooth_enable(1); - -- h8_wwan_enable(val); -+ // Permanently enable wwan. -+ // NOTE: wwan is a security risk (remove access plus DMA). Physical removal of both the wwan and sim card is recommended. -+ h8_wwan_enable(1); - - if (conf->has_uwb) { - if (get_option(&val, "uwb") != CB_SUCCESS) -diff --git a/src/ec/lenovo/pmh7/pmh7.c b/src/ec/lenovo/pmh7/pmh7.c -index f67fbda..9cb7149 100644 ---- a/src/ec/lenovo/pmh7/pmh7.c -+++ b/src/ec/lenovo/pmh7/pmh7.c -@@ -106,7 +106,6 @@ static void enable_dev(struct device *dev) - { - struct ec_lenovo_pmh7_config *conf = dev->chip_info; - struct resource *resource; -- u8 val; - - resource = new_resource(dev, EC_LENOVO_PMH7_INDEX); - resource->flags = IORESOURCE_IO | IORESOURCE_FIXED; -@@ -118,13 +117,11 @@ static void enable_dev(struct device *dev) - pmh7_backlight_enable(conf->backlight_enable); - pmh7_dock_event_enable(conf->dock_event_enable); - -- if (get_option(&val, "touchpad") != CB_SUCCESS) -- val = 1; -- pmh7_touchpad_enable(val); -+ // Permanently enable touchpad -+ pmh7_touchpad_enable(1); - -- if (get_option(&val, "trackpoint") != CB_SUCCESS) -- val = 1; -- pmh7_trackpoint_enable(val); -+ // Permanently enable trackpoint -+ pmh7_trackpoint_enable(1); - } - - struct chip_operations ec_lenovo_pmh7_ops = { --- -1.9.1 - -- cgit v0.9.1