refactor

29 files changed, 509 insertions, 304 deletions

diff --git a/resources/coreboot/patch/DEBLOB b/resources/coreboot/patch/DEBLOB
new file mode 100755
index 0000000..f5e2245
--- /dev/null
+++ b/resources/coreboot/patch/DEBLOB
@@ -0,0 +1,300 @@
+#!/bin/bash
+
+#  DEBLOB script: deblobs the version of coreboot used for this release.
+#
+#	Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+set -u -e -v
+
+# ---------------------
+# CPU microcode updates
+# ---------------------
+rm -f \
+"src/cpu/intel/model_68x/microcode-617-MU16860c.h" \
+"src/cpu/intel/model_68x/microcode-550-MU168307.h" \
+"src/cpu/intel/model_68x/microcode-618-MU268602.h" \
+"src/cpu/intel/model_68x/microcode-729-MU268310.h" \
+"src/cpu/intel/model_68x/microcode-535-MU16810e.h" \
+"src/cpu/intel/model_68x/microcode-727-MU168313.h" \
+"src/cpu/intel/model_68x/microcode-551-MU168308.h" \
+"src/cpu/intel/model_68x/microcode-536-MU16810f.h" \
+"src/cpu/intel/model_68x/microcode-662-MU168a01.h" \
+"src/cpu/intel/model_68x/microcode-728-MU168314.h" \
+"src/cpu/intel/model_68x/microcode-538-MU168111.h" \
+"src/cpu/intel/model_68x/microcode-611-MU168607.h" \
+"src/cpu/intel/model_68x/microcode-615-MU16860a.h" \
+"src/cpu/intel/model_68x/microcode-534-MU16810d.h" \
+"src/cpu/intel/model_68x/microcode-691-MU168a04.h" \
+"src/cpu/intel/model_68x/microcode-692-MU168a05.h" \
+"src/cpu/intel/model_68x/microcode-612-MU168608.h" \
+"src/cpu/intel/model_68x/microcode-537-MU268110.h" \
+"src/cpu/intel/model_1067x/microcode-m011067660F.h" \
+"src/cpu/intel/model_1067x/microcode-m401067660F.h" \
+"src/cpu/intel/model_1067x/microcode-m441067AA0B.h" \
+"src/cpu/intel/model_1067x/microcode-m101067660F.h" \
+"src/cpu/intel/model_1067x/microcode-m041067660F.h" \
+"src/cpu/intel/model_1067x/microcode-m111067AA0B.h" \
+"src/cpu/intel/model_1067x/microcode-m801067660F.h" \
+"src/cpu/intel/model_1067x/microcode-mA01067AA0B.h" \
+"src/cpu/intel/model_1067x/microcode-m101067770A.h" \
+"src/cpu/intel/model_67x/microcode-540-MU267238.h" \
+"src/cpu/intel/model_67x/microcode-531-MU26732e.h" \
+"src/cpu/intel/model_67x/microcode-293-MU267114.h" \
+"src/cpu/intel/model_67x/microcode-539-MU167210.h" \
+"src/cpu/intel/model_67x/microcode-530-MU16730e.h" \
+"src/cpu/intel/model_65x/microcode-409-MU16522c.h" \
+"src/cpu/intel/model_65x/microcode-423-MU26522b.h" \
+"src/cpu/intel/model_65x/microcode-147-MU16502f.h" \
+"src/cpu/intel/model_65x/microcode-435-MU165141.h" \
+"src/cpu/intel/model_65x/microcode-94-MU265019.h" \
+"src/cpu/intel/model_65x/microcode-411-MU16530c.h" \
+"src/cpu/intel/model_65x/microcode-452-MU165310.h" \
+"src/cpu/intel/model_65x/microcode-412-MU16530d.h" \
+"src/cpu/intel/model_65x/microcode-430-MU165041.h" \
+"src/cpu/intel/model_65x/microcode-433-MU165045.h" \
+"src/cpu/intel/model_65x/microcode-410-MU16522d.h" \
+"src/cpu/intel/model_65x/microcode-407-MU16522a.h" \
+"src/cpu/intel/model_65x/microcode-429-MU165040.h" \
+"src/cpu/intel/model_65x/microcode-146-MU16502e.h" \
+"src/cpu/intel/model_65x/microcode-422-MU26530b.h" \
+"src/cpu/intel/model_65x/microcode-434-MU165140.h" \
+"src/cpu/intel/model_65x/microcode-436-MU165142.h" \
+"src/cpu/intel/model_f1x/microcode-1070-m02f122f.h" \
+"src/cpu/intel/model_f1x/microcode-1069-m04f122e.h" \
+"src/cpu/intel/model_f1x/microcode-1068-m01f122d.h" \
+"src/cpu/intel/model_f1x/microcode-1072-m04f1305.h" \
+"src/cpu/intel/model_6ex/microcode-1869-m806ec59.h" \
+"src/cpu/intel/model_6ex/microcode-1729-m206ec54.h" \
+"src/cpu/intel/model_6ex/microcode-1624-m206e839.h" \
+"src/cpu/intel/model_106cx/microcode-M08106CA107.h" \
+"src/cpu/intel/model_106cx/microcode-M08106C2219.h" \
+"src/cpu/intel/model_106cx/microcode-M04106C2218.h" \
+"src/cpu/intel/model_106cx/microcode-M10106CA107.h" \
+"src/cpu/intel/model_106cx/microcode-M01106C2217.h" \
+"src/cpu/intel/model_106cx/microcode-M04106CA107.h" \
+"src/cpu/intel/model_106cx/microcode-M01106CA107.h" \
+"src/cpu/intel/model_6bx/microcode-737-MU16b11c.h" \
+"src/cpu/intel/model_6bx/microcode-738-MU16b11d.h" \
+"src/cpu/intel/model_6bx/microcode-885-MU16b402.h" \
+"src/cpu/intel/model_6bx/microcode-875-MU16b401.h" \
+"src/cpu/intel/model_206ax/microcode-m12306a9_00000017.h" \
+"src/cpu/intel/model_206ax/microcode-m12206a7_00000028.h" \
+"src/cpu/intel/model_6fx/microcode-m406fbBC.h" \
+"src/cpu/intel/model_6fx/microcode-m206f25c.h" \
+"src/cpu/intel/model_6fx/microcode-m106fbBA.h" \
+"src/cpu/intel/model_6fx/microcode-m106f76a.h" \
+"src/cpu/intel/model_6fx/microcode-m46f6d2.h" \
+"src/cpu/intel/model_6fx/microcode-m206f6d1.h" \
+"src/cpu/intel/model_6fx/microcode-m206fda4.h" \
+"src/cpu/intel/model_6fx/microcode-m16f6d0.h" \
+"src/cpu/intel/model_6fx/microcode-m206fbBA.h" \
+"src/cpu/intel/model_6fx/microcode-m806fda4.h" \
+"src/cpu/intel/model_6fx/microcode-m806fbBA.h" \
+"src/cpu/intel/model_6fx/microcode-m16f25d.h" \
+"src/cpu/intel/model_6fx/microcode-m16fda4.h" \
+"src/cpu/intel/model_6fx/microcode-m016fbBA.h" \
+"src/cpu/intel/model_6fx/microcode-m806fa95.h" \
+"src/cpu/intel/model_6fx/microcode-m086fbBB.h" \
+"src/cpu/intel/model_6fx/microcode-m046fbBC.h" \
+"src/cpu/intel/model_6fx/microcode-m406f76b.h" \
+"src/cpu/intel/model_f4x/microcode-1637-m5cf4a04.h" \
+"src/cpu/intel/model_f4x/microcode-1470-m9df4703.h" \
+"src/cpu/intel/model_f4x/microcode-1735-m01f480c.h" \
+"src/cpu/intel/model_f4x/microcode-1521-m5ff4807.h" \
+"src/cpu/intel/model_f4x/microcode-1466-m02f4116.h" \
+"src/cpu/intel/model_f4x/microcode-1471-mbdf4117.h" \
+"src/cpu/intel/model_f4x/microcode-1462-mbdf4903.h" \
+"src/cpu/intel/model_f4x/microcode-1460-m9df4305.h" \
+"src/cpu/intel/model_f4x/microcode-1469-m9df4406.h" \
+"src/cpu/intel/model_f4x/microcode-1498-m5df4a02.h" \
+"src/cpu/intel/model_f4x/microcode-2492-m02f480e.h" \
+"src/cpu/intel/model_6dx/microcode-1355-m206d618.h" \
+"src/cpu/intel/model_f3x/microcode-1467-m0df330c.h" \
+"src/cpu/intel/model_f3x/microcode-1290-m0df320a.h" \
+"src/cpu/intel/model_f3x/microcode-1468-m1df3417.h" \
+"src/cpu/intel/model_69x/microcode-1376-m8069547.h" \
+"src/cpu/intel/model_69x/microcode-1374-m2069507.h" \
+"src/cpu/intel/model_69x/microcode-1373-m1069507.h" \
+"src/cpu/intel/model_f0x/microcode-965-m01f0a13.h" \
+"src/cpu/intel/model_f0x/microcode-966-m04f0a14.h" \
+"src/cpu/intel/model_f0x/microcode-964-m01f0712.h" \
+"src/cpu/intel/model_f0x/microcode-983-m02f0a15.h" \
+"src/cpu/intel/model_f0x/microcode-678-2f0708.h" \
+"src/cpu/intel/model_f2x/microcode-1341-m01f2529.h" \
+"src/cpu/intel/model_f2x/microcode-1101-m02f2738.h" \
+"src/cpu/intel/model_f2x/microcode-1102-m08f2739.h" \
+"src/cpu/intel/model_f2x/microcode-1339-m04f292e.h" \
+"src/cpu/intel/model_f2x/microcode-1100-m04f2737.h" \
+"src/cpu/intel/model_f2x/microcode-1342-m02f252a.h" \
+"src/cpu/intel/model_f2x/microcode-1105-m08f2420.h" \
+"src/cpu/intel/model_f2x/microcode-1107-m10f2421.h" \
+"src/cpu/intel/model_f2x/microcode-1338-m02f292d.h" \
+"src/cpu/intel/model_f2x/microcode-1343-m04f252b.h" \
+"src/cpu/intel/model_f2x/microcode-1340-m08f292f.h" \
+"src/cpu/intel/model_f2x/microcode-1106-m02f241f.h" \
+"src/cpu/intel/model_f2x/microcode-1104-m04f241e.h" \
+"src/cpu/intel/model_f2x/microcode-1336-m02f2610.h" \
+"src/cpu/intel/model_f2x/microcode-1346-m10f252c.h" \
+"src/cpu/intel/model_6xx/microcode-43-B_c6_617.h" \
+"src/cpu/intel/model_6xx/microcode-620-MU26a401.h" \
+"src/cpu/intel/model_6xx/microcode-359-MU166d06.h" \
+"src/cpu/intel/model_6xx/microcode-398-MU166503.h" \
+"src/cpu/intel/model_6xx/microcode-308-MU163336.h" \
+"src/cpu/intel/model_6xx/microcode-153-d2_619.h" \
+"src/cpu/intel/model_6xx/microcode-51-B_c6_616.h" \
+"src/cpu/intel/model_6xx/microcode-566-mu26a003.h" \
+"src/cpu/intel/model_6xx/microcode-400-MU166a0c.h" \
+"src/cpu/intel/model_6xx/microcode-402-MU166d07.h" \
+"src/cpu/intel/model_6xx/microcode-401-MU166a0d.h" \
+"src/cpu/intel/model_6xx/microcode-386-MU16600a.h" \
+"src/cpu/intel/model_6xx/microcode-309-MU163437.h" \
+"src/cpu/intel/model_6xx/microcode-99-B_c6_612.h" \
+"src/cpu/intel/model_6xx/microcode-588-mu26a101.h" \
+"src/cpu/intel/model_6xx/microcode-399-MU166a0b.h" \
+"src/cpu/intel/model_6xx/microcode-358-MU166d05.h" \
+"src/cpu/intel/haswell/microcode-M3240660_ffff000b.h" \
+"src/cpu/intel/haswell/microcode-M32306c1_ffff000d.h" \
+"src/cpu/intel/haswell/microcode-M32306c2_ffff0003.h" \
+"src/cpu/intel/haswell/microcode-M7240650_ffff0007.h" \
+"src/cpu/intel/haswell/microcode-M7240650_ffff000a.h" \
+"src/cpu/intel/model_f2x/microcode_m02f2203.h" \
+"src/cpu/intel/model_2065x/microcode-m9220655_00000003.h" \
+"src/cpu/amd/model_fxx/microcode_rev_d.h" \
+"src/cpu/amd/model_fxx/microcode_rev_c.h" \
+"src/cpu/amd/model_fxx/microcode_rev_e.h" \
+"src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c" \
+"src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c" \
+"src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c" \
+"src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c" \
+"src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000d9.c" \
+"src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c" \
+"src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c" \
+"src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000624_Enc.c" \
+"src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch0600050D_Enc.c" \
+"src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000425.c" \
+"src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMicrocodePatch0600110F_Enc.c" \
+"src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c" \
+"src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c" \
+"src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c" \
+"src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c" \
+"src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c" \
+"src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c" \
+"src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c" \
+"src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B.c" \
+"src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000025.c" \
+"src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A.c" \
+"src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000028.c" \
+"src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000101.c" \
+"src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c" \
+"src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c" \
+"src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c" \
+"src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c" \
+"src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c" \
+"src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c" \
+"src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch03000002.c" \
+"src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000f.c" \
+"src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000e.c" \
+"src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c" \
+"src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000b6.c" \
+"src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000098.c" \
+"src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000086.c" \
+"src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c" \
+"src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c" \
+"src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbId7001MicrocodePatch.c" \
+"src/cpu/intel/haswell/microcode-M7240651_00000015.h" \
+"src/cpu/intel/haswell/microcode-M32306c3_00000012.h" \
+"src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbSmuFirmware.h" \
+"src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbSmuFirmware.h" \
+"src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbSamuPatchKB.h" \
+"src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbSmuFirmwareKB.h" \
+"src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/excel925.h" \
+"src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbCacWeightsTN.h" \
+"src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbSmuFirmwareTN.h" \
+"src/vendorcode/amd/cimx/rd890/HotplugFirmware.h" \
+"src/cpu/amd/model_10xxx/mc_patch_01000086.h" \
+"src/cpu/amd/model_10xxx/mc_patch_01000095.h" \
+"src/cpu/amd/model_10xxx/mc_patch_01000096.h" \
+"src/cpu/amd/model_10xxx/mc_patch_0100009f.h" \
+"src/cpu/amd/model_10xxx/mc_patch_010000b6.h" \
+"src/cpu/amd/model_10xxx/mc_patch_010000bf.h" \
+"src/cpu/amd/model_10xxx/mc_patch_010000c4.h" \
+"src/cpu/dmp/vortex86ex/dmp_kbd_fw_part1.inc" \
+"src/cpu/via/nano/nano_ucode_blob.c" \
+"src/soc/intel/baytrail/microcode/M0C3067_0000031E.h" \
+"src/cpu/intel/model_2065x/microcode-m1220652_0000000d.h" \
+"src/soc/intel/baytrail/microcode/M0C30678_00000816.h" \
+"src/soc/intel/broadwell/microcode/microcode-M7240651_0000001C.h" \
+"src/soc/intel/broadwell/microcode/microcode-MF2306D2_FFFF0009.h" \
+"src/soc/intel/broadwell/microcode/microcode-MC0306D3_FFFF0010.h" \
+"src/soc/intel/broadwell/microcode/microcode-MC0306D4_0000000D.h"
+
+# --------------------------------------
+# Misunderstood (weird: purpose unknown)
+# --------------------------------------
+rm -f \
+"src/mainboard/google/slippy/Micron_4KTF25664HZ.spd.hex" \
+"src/mainboard/google/falco/Micron_4KTF25664HZ.spd.hex" \
+"src/mainboard/google/peppy/Micron_4KTF25664HZ.spd.hex" \
+"src/mainboard/google/link/micron_4Gb_1600_1.35v_x16.spd.hex" \
+"src/mainboard/google/rambi/spd/micron_1GiB_dimm_MT41K128M16JT-125.spd.hex" \
+"src/mainboard/google/rambi/spd/micron_2GiB_dimm_MT41K256M16HA-125.spd.hex" \
+"src/mainboard/google/bolt/micron_4Gb_1600_1.35v_x16.spd.hex" \
+"src/mainboard/google/link/samsung_4Gb_1600_1.35v_x16.spd.hex" \
+"src/mainboard/google/link/elpida_4Gb_1600_x16.spd.hex" \
+"src/mainboard/google/slippy/Hynix_HMT425S6AFR6A.spd.hex" \
+"src/mainboard/google/falco/Hynix_HMT425S6AFR6A.spd.hex" \
+"src/mainboard/google/falco/Elpida_EDJ4216EFBG.spd.hex" \
+"src/mainboard/google/rambi/spd/hynix_1GiB_dimm_H5TC2G63FFR-PBA.spd.hex" \
+"src/mainboard/google/rambi/spd/hynix_2GiB_dimm_H5TC4G63AFR-PBA.spd.hex" \
+"src/mainboard/google/bolt/samsung_4Gb_1600_1.35v_x16.spd.hex" \
+"src/mainboard/google/bolt/elpida_4Gb_1600_x16.spd.hex" \
+"src/mainboard/google/peppy/Hynix_HMT425S6AFR6A.spd.hex" \
+"src/mainboard/google/peppy/Elpida_EDJ4216EFBG.spd.hex" \
+"src/mainboard/google/samus/samsung_8Gb.spd.hex" \
+"src/mainboard/google/samus/empty.spd.hex" \
+"src/mainboard/google/samus/elpida_4Gb.spd.hex" \
+"src/mainboard/google/samus/elpida_8Gb.spd.hex" \
+"src/mainboard/google/samus/samsung_4Gb.spd.hex" \
+"src/mainboard/google/falco/Samsung_M471B5674QH0.spd.hex"
+
+# -------------------------------------
+# DSDT/SSDT (pre-coreboot/compiled blobs)
+# -------------------------------------
+rm -f \
+"src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieAlibSsdt.h" \
+"src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieAlibSsdt.h" \
+"src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/AlibSsdtKB.h" \
+"src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibSsdtTNFM2.h" \
+"src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibSsdtTNFS1.h" \
+"src/northbridge/amd/agesa/family12/ssdt.asl"
+
+# -----------------------------------------------------------
+# southbridge nvidia/sis (unknown purpose, looks like a blob)
+# -----------------------------------------------------------
+rm -f \
+"src/southbridge/nvidia/mcp55/early_setup_ss.h" \
+"src/southbridge/nvidia/ck804/early_setup_ss.h" \
+"src/southbridge/sis/sis966/early_setup_ss.h"
+
+# ---------------------------
+# northbridge intel (raminit)
+# ---------------------------
+rm -f \
+"src/northbridge/intel/nehalem/raminit_tables.c" \
+"src/northbridge/intel/sandybridge/raminit_patterns.h"
+
+cd ../
diff --git a/resources/flashrom/patch/flashchips.c_lenovobios_macronix b/resources/flashrom/patch/flashchips_lenovobios_macronix.c
index 81b927f..81b927f 100644
--- a/resources/flashrom/patch/flashchips.c_lenovobios_macronix
+++ b/resources/flashrom/patch/flashchips_lenovobios_macronix.c
diff --git a/resources/flashrom/patch/flashchips.c_lenovobios_sst b/resources/flashrom/patch/flashchips_lenovobios_sst.c
index 9662e0d..9662e0d 100644
--- a/resources/flashrom/patch/flashchips.c_lenovobios_sst
+++ b/resources/flashrom/patch/flashchips_lenovobios_sst.c
diff --git a/resources/flashrom/patch/flashchips.c_normal b/resources/flashrom/patch/flashchips_normal.c
index 377232a..377232a 100644
--- a/resources/flashrom/patch/flashchips.c_normal
+++ b/resources/flashrom/patch/flashchips_normal.c
diff --git a/resources/grub/font/.gitignore b/resources/grub/font/.gitignore
new file mode 100644
index 0000000..45fdc41
--- /dev/null
+++ b/resources/grub/font/.gitignore
@@ -0,0 +1 @@
+/dejavusansmono.pf2
diff --git a/resources/grub/font/COPYING b/resources/grub/font/COPYING
deleted file mode 100644
index db00082..0000000
--- a/resources/grub/font/COPYING
+++ /dev/null
@@ -1,3 +0,0 @@
-dejavusansmono.pf2 is generated from "DeJavu Sans Mono" font. 
-Check ../../../dejavu-fonts-ttf-2.34 for the copyright information of that project.
-(it's in libreboot_src if you downloaded the libreboot_bin archive. See ../../../docs/RELEASE.html to find where to get it)
diff --git a/resources/grub/font/dejavusansmono.pf2 b/resources/grub/font/dejavusansmono.pf2
deleted file mode 100644
index 9ba557e..0000000
--- a/resources/grub/font/dejavusansmono.pf2
+++ /dev/null
diff --git a/resources/libreboot/config/.gitignore b/resources/libreboot/config/.gitignore
new file mode 100644
index 0000000..a223c72
--- /dev/null
+++ b/resources/libreboot/config/.gitignore
@@ -0,0 +1 @@
+/*_vesafb_config
diff --git a/resources/libreboot/config/COPYING b/resources/libreboot/config/COPYING
index 6813883..be89c06 100644
--- a/resources/libreboot/config/COPYING
+++ b/resources/libreboot/config/COPYING
@@ -1,7 +1,7 @@
 These files:
- * macbook21config
- * t60config
- * x60config
- * x60tconfig
+ * macbook21_txtmode_config
+ * t60_txtmode_config
+ * x60_txtmode_config
+ * x60t_txtmode_config
 
 Are released to the public domain.
diff --git a/resources/libreboot/config/macbook21/config b/resources/libreboot/config/macbook21_txtmode_config
index 2d98acf..2d98acf 100644
--- a/resources/libreboot/config/macbook21/config
+++ b/resources/libreboot/config/macbook21_txtmode_config
diff --git a/resources/libreboot/config/t60/config b/resources/libreboot/config/t60_txtmode_config
index cb4c92d..cb4c92d 100644
--- a/resources/libreboot/config/t60/config
+++ b/resources/libreboot/config/t60_txtmode_config
diff --git a/resources/libreboot/config/x60/config b/resources/libreboot/config/x60_txtmode_config
index 9ff95c4..9ff95c4 100644
--- a/resources/libreboot/config/x60/config
+++ b/resources/libreboot/config/x60_txtmode_config
diff --git a/resources/libreboot/config/x60t/config b/resources/libreboot/config/x60t_txtmode_config
index 14ad5be..14ad5be 100644
--- a/resources/libreboot/config/x60t/config
+++ b/resources/libreboot/config/x60t_txtmode_config
diff --git a/resources/utilities/README-i945-pwm b/resources/utilities/README-i945-pwm
deleted file mode 100644
index 4098635..0000000
--- a/resources/utilities/README-i945-pwm
+++ /dev/null
@@ -1,4 +0,0 @@
-git clone git://git.mtjm.eu/i945-pwm.git
-^ is where i945-pwm came from. 
-
-The usual git commands apply.
diff --git a/resources/utilities/grub-assemble/gen.txtmode.sh b/resources/utilities/grub-assemble/gen.txtmode.sh
deleted file mode 100755
index 1906f77..0000000
--- a/resources/utilities/grub-assemble/gen.txtmode.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.  This file is offered as-is,
-# without any warranty.
-
-set -u -e -v
-
-# TODO: Fail (and clean up) if GRUB isn't actually built. Error checking.
-
-# This is where GRUB is expected to be (outside of the grub-assemble, instead in main checkout)
-grubdir="../../../grub"
-
-source "modules.conf"
-
-# Generate the grub.elf
-$grubdir/grub-mkstandalone \
-  --grub-mkimage=$grubdir/grub-mkimage \
-  -O i386-coreboot \
-  -o grub_txtmode.elf \
-  -d $grubdir/grub-core/ \
-  --fonts= --themes= --locales=  \
-  --modules="$grub_modules" \
-  --install-modules="$grub_install_modules" \
-  /boot/grub/grub.cfg="../../../resources/grub/config/grub_memdisk.cfg" \
-  /memtest="../../../memtest86+-5.01/memtest" \
-  /invaders.exec="../../../grubinvaders/invaders.exec" \
-  $(./grub_memdisk_keymap) \
-
diff --git a/resources/utilities/grub-assemble/gen.vesafb.sh b/resources/utilities/grub-assemble/gen.vesafb.sh
deleted file mode 100755
index 627c7d4..0000000
--- a/resources/utilities/grub-assemble/gen.vesafb.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.  This file is offered as-is,
-# without any warranty.
-
-set -u -e -v
-
-# TODO: Fail (and clean up) if GRUB isn't actually built. Error checking.
-
-# This is where GRUB is expected to be (outside of the grub-assemble, instead in main checkout)
-grubdir="../../../grub"
-
-source "modules.conf"
-
-# Generate the grub.elf
-$grubdir/grub-mkstandalone \
-  --grub-mkimage=$grubdir/grub-mkimage \
-  -O i386-coreboot \
-  -o grub_vesafb.elf \
-  -d $grubdir/grub-core/ \
-  --fonts= --themes= --locales=  \
-  --modules="$grub_modules" \
-  --install-modules="$grub_install_modules" \
-  /boot/grub/grub.cfg="../../../resources/grub/config/grub_memdisk.cfg" \
-  /background.jpg="../../../resources/grub/background/background.jpg" \
-  /dejavusansmono.pf2="../../../resources/grub/font/dejavusansmono.pf2" \
-  $(./grub_memdisk_keymap) \
diff --git a/resources/utilities/grub-assemble/grub_memdisk_keymap b/resources/utilities/grub-assemble/grub_memdisk_keymap
deleted file mode 100755
index 2ef0113..0000000
--- a/resources/utilities/grub-assemble/grub_memdisk_keymap
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-#
-#  lists keymaps
-#
-#	Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-set -u -e -v
-
-for keymap in $(ls keymap/original)
-do
-	printf "/boot/grub/layouts/$keymap.gkb=keymap/$keymap.gkb "
-done
diff --git a/resources/utilities/grub-assemble/keymap/.gitignore b/resources/utilities/grub-assemble/keymap/.gitignore
new file mode 100644
index 0000000..3af3335
--- /dev/null
+++ b/resources/utilities/grub-assemble/keymap/.gitignore
@@ -0,0 +1,2 @@
+/list.mk
+/*.gkb
diff --git a/resources/utilities/grub-assemble/keymap/COPYING b/resources/utilities/grub-assemble/keymap/COPYING
index 1a47bfa..ec12dba 100644
--- a/resources/utilities/grub-assemble/keymap/COPYING
+++ b/resources/utilities/grub-assemble/keymap/COPYING
@@ -1,13 +1,7 @@
 Look at ../../../docs/index.html under the "GRUB2 payload" section to see
-how the following files were generated:
+how the files in ./original/ were generated.
 
- * dvorak.gkb
- * ukdvorak
- * ukdvorak.gkb
- * ukqwerty
- * ukqwerty.gkb
- * usdvorak
- * usqwerty
- * usqwerty.gkb
+The *.gkb files based off of them are generated by the Makefile at the
+root of libreboot.
 
-The files listed above are made available in the public domain (the information in them is public knowledge. copyright is pointless). Use them as you wish.
+The files listed above are made available in the public domain (the information in them is public knowledge; copyright is pointless). Use them as you wish.
diff --git a/resources/utilities/grub-assemble/keymap/frazerty.gkb b/resources/utilities/grub-assemble/keymap/frazerty.gkb
deleted file mode 100644
index c048cec..0000000
--- a/resources/utilities/grub-assemble/keymap/frazerty.gkb
+++ /dev/null
diff --git a/resources/utilities/grub-assemble/keymap/frdvbepo.gkb b/resources/utilities/grub-assemble/keymap/frdvbepo.gkb
deleted file mode 100644
index c90b37c..0000000
--- a/resources/utilities/grub-assemble/keymap/frdvbepo.gkb
+++ /dev/null
diff --git a/resources/utilities/grub-assemble/keymap/itqwerty.gkb b/resources/utilities/grub-assemble/keymap/itqwerty.gkb
deleted file mode 100644
index f247cd1..0000000
--- a/resources/utilities/grub-assemble/keymap/itqwerty.gkb
+++ /dev/null
diff --git a/resources/utilities/grub-assemble/keymap/svenska.gkb b/resources/utilities/grub-assemble/keymap/svenska.gkb
deleted file mode 100644
index ec627db..0000000
--- a/resources/utilities/grub-assemble/keymap/svenska.gkb
+++ /dev/null
diff --git a/resources/utilities/grub-assemble/keymap/ukdvorak.gkb b/resources/utilities/grub-assemble/keymap/ukdvorak.gkb
deleted file mode 100644
index c793cae..0000000
--- a/resources/utilities/grub-assemble/keymap/ukdvorak.gkb
+++ /dev/null
diff --git a/resources/utilities/grub-assemble/keymap/ukqwerty.gkb b/resources/utilities/grub-assemble/keymap/ukqwerty.gkb
deleted file mode 100644
index 8e5ff29..0000000
--- a/resources/utilities/grub-assemble/keymap/ukqwerty.gkb
+++ /dev/null
diff --git a/resources/utilities/grub-assemble/keymap/usdvorak.gkb b/resources/utilities/grub-assemble/keymap/usdvorak.gkb
deleted file mode 100644
index 41301ef..0000000
--- a/resources/utilities/grub-assemble/keymap/usdvorak.gkb
+++ /dev/null
diff --git a/resources/utilities/grub-assemble/keymap/usqwerty.gkb b/resources/utilities/grub-assemble/keymap/usqwerty.gkb
deleted file mode 100644
index 5fb78d3..0000000
--- a/resources/utilities/grub-assemble/keymap/usqwerty.gkb
+++ /dev/null
diff --git a/resources/utilities/grub-assemble/modules.conf b/resources/utilities/grub-assemble/modules.conf
index 4bc1650..8380c23 100644
--- a/resources/utilities/grub-assemble/modules.conf
+++ b/resources/utilities/grub-assemble/modules.conf
@@ -1,202 +1,200 @@
 # Install modules (installed, but not automatically loaded)
-grub_install_modules=" \
-adler32 \
-all_video \
-archelp \
-ata \
-backtrace \
-bitmap \
-bitmap_scale \
-cmp \
-cpio_be \
-cpio \
-cpuid \
-crc64 \
-cs5536 \
-div_test \
-efiemu \
-elf \
-eval \
-exfat \
-extcmd \
-file \
-fshelp \
-gettext \
-gfxmenu \
-gptsync \
-gzio \
-hashsum \
-hexdump \
-http \
-linux16 \
-loadenv \
-lzopio \
-mda_text \
-mmap \
-mpi \
-msdospart \
-multiboot2 \
-multiboot \
-nativedisk \
-net \
-newc \
-ntfscomp \
-ntfs \
-odc \
-offsetio \
-parttool \
-priority_queue \
-procfs \
-progress \
-read \
-relocator \
-scsi \
-search_fs_file \
-search_fs_uuid \
-search_label \
-search \
-setjmp \
-setpci \
-sleep \
-squash4 \
-tar \
-terminfo \
-testload \
-testspeed \
-tftp \
-time \
-trig \
-tr \
-true \
-udf \
-ufs1_be \
-ufs1 \
-ufs2 \
-usbserial_common \
-usbserial_ftdi \
-usbserial_pl2303 \
-usbserial_usbdebug \
-usbtest \
-video_colors \
-videotest_checksum \
-xzio \
-"
+grub_install_modules = \
+	adler32 \
+	all_video \
+	archelp \
+	ata \
+	backtrace \
+	bitmap \
+	bitmap_scale \
+	cmp \
+	cpio_be \
+	cpio \
+	cpuid \
+	crc64 \
+	cs5536 \
+	div_test \
+	efiemu \
+	elf \
+	eval \
+	exfat \
+	extcmd \
+	file \
+	fshelp \
+	gettext \
+	gfxmenu \
+	gptsync \
+	gzio \
+	hashsum \
+	hexdump \
+	http \
+	linux16 \
+	loadenv \
+	lzopio \
+	mda_text \
+	mmap \
+	mpi \
+	msdospart \
+	multiboot2 \
+	multiboot \
+	nativedisk \
+	net \
+	newc \
+	ntfscomp \
+	ntfs \
+	odc \
+	offsetio \
+	parttool \
+	priority_queue \
+	procfs \
+	progress \
+	read \
+	relocator \
+	scsi \
+	search_fs_file \
+	search_fs_uuid \
+	search_label \
+	search \
+	setjmp \
+	setpci \
+	sleep \
+	squash4 \
+	tar \
+	terminfo \
+	testload \
+	testspeed \
+	tftp \
+	time \
+	trig \
+	tr \
+	true \
+	udf \
+	ufs1_be \
+	ufs1 \
+	ufs2 \
+	usbserial_common \
+	usbserial_ftdi \
+	usbserial_pl2303 \
+	usbserial_usbdebug \
+	usbtest \
+	video_colors \
+	videotest_checksum \
+	xzio
 
 # Modules (and always loaded)
-grub_modules=" \
-acpi \
-ahci \
-at_keyboard \
-boot \
-cat \
-cbfs \
-cbls \
-cbtime \
-chain \
-cmosdump \
-cmostest \
-cbmemc \
-crypto \
-cryptodisk \
-configfile \
-datehook \
-date \
-datetime \
-diskfilter \
-disk \
-echo \
-ext2 \
-ehci \
-fat \
-halt \
-help \
-iorw \
-iso9660 \
-keystatus \
-linux \
-loopback \
-ls \
-lsacpi \
-lsmmap \
-lspci \
-luks \
-lvm \
-memdisk \
-minicmd \
-memrw \
-morse \
-normal \
-ohci \
-part_gpt \
-part_msdos \
-password \
-password_pbkdf2 \
-pbkdf2 \
-pcidump \
-pci \
-play \
-probe \
-reboot \
-serial \
-terminal \
-test \
-usb_keyboard \
-usbms \
-uhci \
-gcry_arcfour \
-gcry_blowfish \
-gcry_camellia \
-gcry_cast5 \
-gcry_crc \
-gcry_des \
-gcry_dsa \
-gcry_idea \
-gcry_md4 \
-gcry_md5 \
-gcry_rfc2268 \
-gcry_rijndael \
-gcry_rmd160 \
-gcry_rsa \
-gcry_seed \
-gcry_serpent \
-gcry_sha1 \
-gcry_sha256 \
-gcry_sha512 \
-gcry_tiger \
-gcry_twofish \
-gcry_whirlpool \
-hdparm \
-regexp \
-spkmodem \
-syslinuxcfg \
-usb \
-verify \
-videoinfo \
-videotest \
-xfs \
-btrfs \
-zfs \
-sfs \
-romfs \
-reiserfs \
-nilfs2 \
-minix_be \
-minix3_be \
-minix3 \
-minix2_be \
-minix2 \
-minix \
-jfs \
-hfsplus \
-hfs \
-bfs \
-afs \
-affs \
-gfxmenu \
-gfxterm_background \
-gfxterm_menu \
-jpeg \
-png \
-tga \
-pata \
-"
+grub_modules = \
+	acpi \
+	ahci \
+	at_keyboard \
+	boot \
+	cat \
+	cbfs \
+	cbls \
+	cbtime \
+	chain \
+	cmosdump \
+	cmostest \
+	cbmemc \
+	crypto \
+	cryptodisk \
+	configfile \
+	datehook \
+	date \
+	datetime \
+	diskfilter \
+	disk \
+	echo \
+	ext2 \
+	ehci \
+	fat \
+	halt \
+	help \
+	iorw \
+	iso9660 \
+	keystatus \
+	linux \
+	loopback \
+	ls \
+	lsacpi \
+	lsmmap \
+	lspci \
+	luks \
+	lvm \
+	memdisk \
+	minicmd \
+	memrw \
+	morse \
+	normal \
+	ohci \
+	part_gpt \
+	part_msdos \
+	password \
+	password_pbkdf2 \
+	pbkdf2 \
+	pcidump \
+	pci \
+	play \
+	probe \
+	reboot \
+	serial \
+	terminal \
+	test \
+	usb_keyboard \
+	usbms \
+	uhci \
+	gcry_arcfour \
+	gcry_blowfish \
+	gcry_camellia \
+	gcry_cast5 \
+	gcry_crc \
+	gcry_des \
+	gcry_dsa \
+	gcry_idea \
+	gcry_md4 \
+	gcry_md5 \
+	gcry_rfc2268 \
+	gcry_rijndael \
+	gcry_rmd160 \
+	gcry_rsa \
+	gcry_seed \
+	gcry_serpent \
+	gcry_sha1 \
+	gcry_sha256 \
+	gcry_sha512 \
+	gcry_tiger \
+	gcry_twofish \
+	gcry_whirlpool \
+	hdparm \
+	regexp \
+	spkmodem \
+	syslinuxcfg \
+	usb \
+	verify \
+	videoinfo \
+	videotest \
+	xfs \
+	btrfs \
+	zfs \
+	sfs \
+	romfs \
+	reiserfs \
+	nilfs2 \
+	minix_be \
+	minix3_be \
+	minix3 \
+	minix2_be \
+	minix2 \
+	minix \
+	jfs \
+	hfsplus \
+	hfs \
+	bfs \
+	afs \
+	affs \
+	gfxmenu \
+	gfxterm_background \
+	gfxterm_menu \
+	jpeg \
+	png \
+	tga \
+	pata
diff --git a/resources/utilities/i945-pwm b/resources/utilities/i945-pwm
deleted file mode 160000
-Subproject d88c8b290b9473e071d24cd3b97f4a091ee398c