download/coreboot: add notes for when updating coreboot-libre

1 files changed, 40 insertions, 26 deletions

diff --git a/resources/scripts/helpers/download/coreboot b/resources/scripts/helpers/download/coreboot
index c4c9566d..c6fe377f 100755
--- a/resources/scripts/helpers/download/coreboot
+++ b/resources/scripts/helpers/download/coreboot
@@ -81,75 +81,88 @@ git reset --hard e19c8b0091022ae3f490601aed0c290cd5171b79
 # igd.asl re-write is merged: this means other patches need rebasing, and a *lot* of testing is needed:
 # the merged patch is here: http://review.coreboot.org/#/c/7472/
 
+# PATCHES TO ADD:
+# http://review.coreboot.org/#/c/10431/
+
 # ----
 
 printf "Downloading patches for T400 (hybrid graphics and other fixes)"
-# git fetch http://review.coreboot.org/coreboot refs/changes/31/9331/7 && git checkout FETCH_HEAD
-git am "../resources/libreboot/patch/0001-src-southbridge-intel-i82801ix-Add-GPIO-register-loc.patch"
-git am "../resources/libreboot/patch/0002-northbridge-intel-gm45-gma-Add-backlight-control-reg.patch"
-git am "../resources/libreboot/patch/0003-northbridge-intel-gm45-gma-Minor-cleanup.patch"
-git am "../resources/libreboot/patch/0004-southbridge-intel-common-spi-Add-Flash-lockdown-opti.patch"
-git am "../resources/libreboot/patch/0005-mainboard-lenovo-x200-Use-defines-from-southbridge-f.patch"
-git am "../resources/libreboot/patch/0006-mainboard-lenovo-x200-Add-power_on_after_fail-NVRAM-.patch" # NOTE: look into ensuring that it is disabled.
-git am "../resources/libreboot/patch/0007-mainboards-lenovo-Copy-X200-board-to-T400-for-future.patch"
-git am "../resources/libreboot/patch/0008-mainboards-lenovo-t400-Enable-serial-debug-option-fo.patch"
-git am "../resources/libreboot/patch/0009-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch"
-git am "../resources/libreboot/patch/0010-mainboard-lenovo-t400-Add-initial-ATPX-ACPI-implemen.patch"
-git am "../resources/libreboot/patch/0011-mainboard-lenovo-t400-Increase-backlight-frequency-t.patch"
+# git fetch http://review.coreboot.org/coreboot refs/changes/31/9331/7 && git checkout FETCH_HEAD # NOTE: re-include (rebase)
+git am "../resources/libreboot/patch/0001-src-southbridge-intel-i82801ix-Add-GPIO-register-loc.patch" # NOTE: merged in coreboot master (no longer needed here)
+git am "../resources/libreboot/patch/0002-northbridge-intel-gm45-gma-Add-backlight-control-reg.patch" # NOTE: merged in coreboot master (no longer needed here)
+git am "../resources/libreboot/patch/0003-northbridge-intel-gm45-gma-Minor-cleanup.patch" # NOTE: merged in coreboot master (no longer needed here)
+git am "../resources/libreboot/patch/0004-southbridge-intel-common-spi-Add-Flash-lockdown-opti.patch" # NOTE: re-include (rebase)
+git am "../resources/libreboot/patch/0005-mainboard-lenovo-x200-Use-defines-from-southbridge-f.patch" # NOTE: merged in coreboot master (no longer needed here)
+git am "../resources/libreboot/patch/0006-mainboard-lenovo-x200-Add-power_on_after_fail-NVRAM-.patch" # NOTE: merged in coreboot master (no longer needed here). look into ensuring that it is disabled.
+git am "../resources/libreboot/patch/0007-mainboards-lenovo-Copy-X200-board-to-T400-for-future.patch" # NOTE: merged in coreboot master (no longer needed here)
+git am "../resources/libreboot/patch/0008-mainboards-lenovo-t400-Enable-serial-debug-option-fo.patch" # NOTE: re-include (rebase)
+git am "../resources/libreboot/patch/0009-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch" # NOTE: re-include (rebase)
+git am "../resources/libreboot/patch/0010-mainboard-lenovo-t400-Add-initial-ATPX-ACPI-implemen.patch" # NOTE: merged in coreboot master (no longer needed here)
+git am "../resources/libreboot/patch/0011-mainboard-lenovo-t400-Increase-backlight-frequency-t.patch" # NOTE: re-include (rebase)
 
 # Downloads these patches:
-# http://review.coreboot.org/#/c/9318/
-# http://review.coreboot.org/#/c/9330/
-# http://review.coreboot.org/#/c/9329/
-# http://review.coreboot.org/#/c/9370/
-# http://review.coreboot.org/#/c/9321/
-# http://review.coreboot.org/#/c/9332/
-# http://review.coreboot.org/#/c/9316
-# http://review.coreboot.org/#/c/9317/
-# http://review.coreboot.org/#/c/9319
-# http://review.coreboot.org/#/c/9320/
-# http://review.coreboot.org/#/c/9331/
+# http://review.coreboot.org/#/c/9318/ - NOTE: merged in coreboot master (no longer needed here)
+# http://review.coreboot.org/#/c/9330/ - NOTE; merged in coreboot master (no longer needed here)
+# http://review.coreboot.org/#/c/9329/ - NOTE: merged in coreboot master (no longer needed here)
+# http://review.coreboot.org/#/c/9370/ - NOTE: re-include (rebase)
+# http://review.coreboot.org/#/c/9321/ - NOTE: merged in coreboot master (no longer needed here)
+# http://review.coreboot.org/#/c/9332/ - NOTE: merged in coreboot master (no longer needed here)
+# http://review.coreboot.org/#/c/9316 - NOTE: merged in coreboot master (no longer needed here)
+# http://review.coreboot.org/#/c/9317/ - NOTE: re-include (rebase)
+# http://review.coreboot.org/#/c/9319 - NOTE: re-include (rebase)
+# http://review.coreboot.org/#/c/9320/ - NOTE: merged in coreboot master (no longer needed here)
+# http://review.coreboot.org/#/c/9331/ - NOTE: re-include (rebase)
 
 # Related - hard-code enable integrated-only GPU (GM45):
 # git fetch http://review.coreboot.org/coreboot refs/changes/90/10090/2 && git cherry-pick FETCH_HEAD
-git am "../resources/libreboot/patch/0012-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch"
+git am "../resources/libreboot/patch/0012-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch" # NOTE: re-include (re-base)
 
 # ----
 
+# NOTE: re-base (has merge conflicts with master):
 printf "Text mode patch for X60 native graphics (main patch already merged in coreboot. See 6723 on coreboot gerrit)\n"
 # git fetch http://review.coreboot.org/coreboot refs/changes/25/6725/3 && git cherry-pick FETCH_HEAD
 git am "../resources/libreboot/patch/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch"
 
+# NOTE: re-base (has merge conflicts with master):
 printf "lenovo/x60: Enable legacy brightness controls (native graphics)\n"
 # git fetch http://review.coreboot.org/coreboot refs/changes/48/7048/4 && git cherry-pick FETCH_HEAD
 git am "../resources/libreboot/patch/0014-lenovo-x60-Enable-legacy-brightness-controls-native-.patch"
 
+# NOTE: re-base (has merge conflicts with master):
 printf "Enable T60 native graphics\n"
 # git fetch http://review.coreboot.org/coreboot refs/changes/45/5345/9 && git cherry-pick FETCH_HEAD
 git am "../resources/libreboot/patch/0015-lenovo-t60-Enable-native-intel-gfx-init.patch"
 
+# NOTE: re-base (has merge conflicts with master):
 printf "Enable text-mode graphics for T60\n"
 # git fetch http://review.coreboot.org/coreboot refs/changes/50/7050/2 && git cherry-pick FETCH_HEAD
 git am "../resources/libreboot/patch/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch"
 
+# NOTE: re-base (has merge conflicts with master):
 printf "lenovo/t60: Enable legacy brightness controls (native graphics)\n"
 # git fetch http://review.coreboot.org/coreboot refs/changes/51/7051/1 && git cherry-pick FETCH_HEAD
 git am "../resources/libreboot/patch/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch"
 
+# NOTE: re-base (has merge conflicts with master):
 printf "ec/lenovo/h8: permanently enable wifi/trackpoint/touchpad/bluetooth/wwan\n"
 # git fetch http://review.coreboot.org/coreboot refs/changes/58/7058/7 && git cherry-pick FETCH_HEAD
 git am "../resources/libreboot/patch/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch"
 
+# NOTE: re-base (has merge conflicts with master):
 # printf "i945: permanently set tft_brightness to 0xff. this fixes the issue with X60 and 'scrolling' backlight\n"
 # git fetch http://review.coreboot.org/coreboot refs/changes/61/7561/2 && git cherry-pick FETCH_HEAD
 # The patch was accidentally merged in coreboot. See 
 # http://review.coreboot.org/#/c/8697/ for the revert commit. rebase 7561 and re-include it in
 # libreboot, once 8697 is merged in coreboot.
 
+# NOTE: re-base (has merge conflicts with master):
+# NOTE: update it with git commit -a --amend -s --author="Steve Shenton <sgsit@libreboot.org>"
 printf "northbridge/gm45/raminit.c: enable GS45 high-perf (i.e. add X200S support to libreboot)\n"
 # git fetch http://review.coreboot.org/coreboot refs/changes/86/7786/1 && git cherry-pick FETCH_HEAD
 git am "../resources/libreboot/patch/0019-NOTFORMERGE-northbridge-gm45-raminit.c-enable-GS45-h.patch"
 
+# NOTE: re-base (has merge conflicts with master):
 printf "fix uneven backlight on X200 (when setting brightness low)\n"
 # git fetch http://review.coreboot.org/coreboot refs/changes/79/7979/1 && git cherry-pick FETCH_HEAD
 git am "../resources/libreboot/patch/0020-gm45-fix-uneven-backlight-native-gfx-init.patch"
@@ -158,12 +171,13 @@ printf "ThinkPad R400 support (clone of the T400)\n"
 # git fetch http://review.coreboot.org/coreboot refs/changes/93/8393/3 && git cherry-pick FETCH_HEAD
 git am "../resources/libreboot/patch/0021-lenovo-r400-Add-clone-of-Lenovo-T400.patch"
 
+# NOTE: re-base (has merge conflicts with master):
 printf "ThinkPad T500 (depends on T400 patch)\n"
 # git fetch http://review.coreboot.org/coreboot refs/changes/81/9181/2 && git cherry-pick FETCH_HEAD
 git am "../resources/libreboot/patch/0022-New-mainboard-Lenovo-T500.patch"
+# NOTE: IMPORTANT!!!!! ---> http://review.coreboot.org/#/c/10545 is the new patch
 
-# BACKPORTED
-# This was merged in master, but this is an older revision. For now, simply backport it (X200 digitizer patch)
+# NOTE: merged in coreboot master (no longer needed here)
 printf "ThinkPad X200 Tablet digitizer patch (backported)\n"
 # git fetch http://review.coreboot.org/coreboot refs/changes/08/10208/4 && git cherry-pick FETCH_HEAD
 git am "../resources/libreboot/patch/0023-lenovo-x200-Enable-wacom-digitizer-support-for-x200t.patch"