summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2014-10-11 14:38:15 (EDT)
committer Francis Rowe <info@gluglug.org.uk>2014-10-11 14:40:01 (EDT)
commitc693f448a94e78263f5efc963371cb5be80a0bf2 (patch)
treed920d82f50d03d0cf76fb6f3d4e43e0f9e4c61b1
parent0d86072052ebe7770cd576ab8953f92ec6a5c722 (diff)
downloadlibreboot-c693f448a94e78263f5efc963371cb5be80a0bf2.zip
libreboot-c693f448a94e78263f5efc963371cb5be80a0bf2.tar.gz
libreboot-c693f448a94e78263f5efc963371cb5be80a0bf2.tar.bz2
getcb: Remove patch instructions for ACPI brightness on i945.
The patch (6731 on review.coreboot.org) was bogus (needs re-writing). The next commit will put libreboot back on legacy brightness controls instead.
-rwxr-xr-xgetcb16
-rw-r--r--resources/libreboot/patch/0001_t60_6731_6_extension_acpi_brightness.git.diff12
2 files changed, 1 insertions, 27 deletions
diff --git a/getcb b/getcb
index 350bb28..21ee490 100755
--- a/getcb
+++ b/getcb
@@ -47,12 +47,6 @@ git reset --hard 23aad4a83c3390dc39f7d1c1f5422f7ac54a80f3
# Get patches from review.coreboot.org
# ----------------------------------------------------------------------------------
-## Backlight controls on i945 (X60/T60/macbook21)
-# git fetch http://review.coreboot.org/coreboot refs/changes/31/6731/7 && git cherry-pick FETCH_HEAD
-# ^ the above is not needed, because 7049 (see below) uses it
-# ACPI brighness fix: fix uneven backlight on i945 targets:
-git fetch http://review.coreboot.org/coreboot refs/changes/49/7049/1 && git cherry-pick FETCH_HEAD
-
# Text mode patch for X60 native graphics (main patch already merged in coreboot. See 6723 on coreboot gerrit)
git fetch http://review.coreboot.org/coreboot refs/changes/25/6725/3 && git cherry-pick FETCH_HEAD
@@ -65,15 +59,7 @@ git fetch http://review.coreboot.org/coreboot refs/changes/50/7050/1 && git cher
# Apply necessary patches (from resources/libreboot/patch/)
# ---------------------------------------------------------------------------------
-# copy all the patches here for this release
-cp ../resources/libreboot/patch/0001_t60_6731_6_extension_acpi_brightness.git.diff .
-
-# Cleanup patch for T60 ACPI backlight controls, based on 6731/6 from coreboot gerrit site (review.coreboot.org)
-# Won't commit to coreboot for this release, since 6731 is currently -2'd in gerrit (on 20140824) and will be improved.
-git apply 0001_t60_6731_6_extension_acpi_brightness.git.diff
-
-# delete the copies of the patches (not needed anymore)
-rm -rf 0001_t60_6731_6_extension_acpi_brightness.git.diff
+# no diffs needed at the moment
# Run coreboot-libre deblob scripts
# ---------------------------------------------------------------------------------
diff --git a/resources/libreboot/patch/0001_t60_6731_6_extension_acpi_brightness.git.diff b/resources/libreboot/patch/0001_t60_6731_6_extension_acpi_brightness.git.diff
deleted file mode 100644
index 4e36a6c..0000000
--- a/resources/libreboot/patch/0001_t60_6731_6_extension_acpi_brightness.git.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb
-index 54b7da3..f187bfb 100644
---- a/src/mainboard/lenovo/t60/devicetree.cb
-+++ b/src/mainboard/lenovo/t60/devicetree.cb
-@@ -25,7 +25,6 @@ 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