From 8df313c4d6607181576471e08d7e909c9c0f33e9 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Mon, 11 Aug 2014 09:00:00 -0400
Subject: Libreboot release 6 beta 5.

- build: added 'luks', 'lvm', 'cmosdump' and 'cmostest' to the list of
  modules for grub.elf
- Documentation: added pics showing T60 unbricking (still need to
  write a tutorial)
- build: include cmos.layout
  (coreboot/src/mainboard/manufacturer/model/cmos.layout) files in
  libreboot_bin
- Documentation: added ../docs/howtos/x60tablet_unbrick.html
- Documentation: added ../docs/howtos/t60_unbrick.html
- Documentation: added ../docs/howtos/t60_lcd_15.html
- Documentation: added ../docs/howtos/t60_security.html
- Documentation: added ../docs/howtos/t60_heatsink.html
- Documentation: Renamed RELEASE.html to release.html
- Documentation: removed pcmcia reference in x60_security.html (it's
  cardbus)
- Documentation: added preliminary information about randomized seal
  (for physical intrusion detection) in x60_security.html and
  t60_security.html
- Documentation: added preliminary information about
  preventing/mitigating cold-boot attack in x60_security.html and
  t60_security.html
- Documentation: added info to ../docs/index.html#macbook21 warning
  about issues with macbook21
- Documentation: X60/T60: added information about checking custom
  ROM's using dd to see whether or not the top 64K region is
  duplicated below top or not. Advise caution about this in the
  tutorial that deals with flashing on top of Lenovo BIOS, citing the
  correct dd commands necessary if it is confirmed that the ROM has
  not been applied with dd yet. (in the case that the user compiled
  their own ROM's from libreboot, without using the build scripts, or
  if they forgot to use dd, etc).
- Split resources/libreboot/patch/gitdiff into separate patch files
  (getcb script updated to accomodate this change).
- Re-added .git files to bucts
- Fixed the oversight where macbook21_firstflash wasn't included in
  binary archives
---
(limited to 'getcb')

diff --git a/getcb b/getcb
index b1e8e3d..88ced5c 100755
--- a/getcb
+++ b/getcb
@@ -121,18 +121,32 @@ git add src/drivers/lenovo
 
 # apply fix for 3D on kernel 3.12+ for X60/T60 on the new native graphics code (5320/9), 
 # based on manually merging 5927/11 and 5932/5 (which fix the 3D on kernel 3.12+ on X60 for the *old* replay code) from review.coreboot.org
-# apply fix for backlight controls for T60 and X60, based on docs/i945_backlight.html
+# apply fix for backlight controls for T60 and X60, based on docs/future/index.html#x60_native_notes and docs/future/index.html#t60_native_notes
 # apply fix for IR/digitizer on X60/T60 and X60 Tablet (respectively), based on manually merging 5243/17, 5242/17 and 5239/19 from review.coreboot.org
 # (see notes above)
 
-# copy the gitdiff into coreboot directory
-cp ../resources/libreboot/patch/gitdiff .
-
-# apply it!
-git apply gitdiff
-
-# remove the copy (not needed anymore)
-rm -rf gitdiff
+# the changes are in separate patches under resources/libreboot/patch/
+
+# copy the patches into coreboot directory
+cp ../resources/libreboot/patch/*.diff .
+
+# apply the "git diff" patches
+git apply 0000_x60t_digitizer_irda.git.diff
+git apply 0001_i945_3dfix.git.diff
+rm -rf 0000_x60t_digitizer_irda.git.diff
+rm -rf 0001_i945_3dfix.git.diff
+# apply non-git diff: X60 backlight controls
+mv 0002_x60_backlight.diff src/mainboard/lenovo/x60
+cd src/mainboard/lenovo/x60
+patch devicetree.cb < 0002_x60_backlight.diff
+rm -rf 0002_x60_backlight.diff
+cd ../../../../
+# apply non-git diff: T60 backlight controls
+mv 0003_t60_backlight.diff src/mainboard/lenovo/t60
+cd src/mainboard/lenovo/t60
+patch devicetree.cb < 0003_t60_backlight.diff
+rm -rf 0003_t60_backlight.diff
+cd ../../../../
 
 # Run coreboot-libre deblob scripts
 # ---------------------------------------------------------------------------------
--
cgit v0.9.1