Update coreboot and enable T60 legacy brightness control

6 files changed, 100 insertions, 45 deletions

diff --git a/DEBLOB b/DEBLOB
index a9f503b6..bb06da80 100755
--- a/DEBLOB
+++ b/DEBLOB
@@ -20,10 +20,10 @@
 #
 
 # CPU microcode
-rm -rf coreboot/src/cpu/intel/model_68x/microcode-617-MU16860c.h coreboot/src/cpu/intel/model_68x/microcode-550-MU168307.h coreboot/src/cpu/intel/model_68x/microcode-618-MU268602.h coreboot/src/cpu/intel/model_68x/microcode-729-MU268310.h coreboot/src/cpu/intel/model_68x/microcode-535-MU16810e.h coreboot/src/cpu/intel/model_68x/microcode-727-MU168313.h coreboot/src/cpu/intel/model_68x/microcode-551-MU168308.h coreboot/src/cpu/intel/model_68x/microcode-536-MU16810f.h coreboot/src/cpu/intel/model_68x/microcode-662-MU168a01.h coreboot/src/cpu/intel/model_68x/microcode-728-MU168314.h coreboot/src/cpu/intel/model_68x/microcode-538-MU168111.h coreboot/src/cpu/intel/model_68x/microcode-611-MU168607.h coreboot/src/cpu/intel/model_68x/microcode-615-MU16860a.h coreboot/src/cpu/intel/model_68x/microcode-534-MU16810d.h coreboot/src/cpu/intel/model_68x/microcode-691-MU168a04.h coreboot/src/cpu/intel/model_68x/microcode-692-MU168a05.h coreboot/src/cpu/intel/model_68x/microcode-612-MU168608.h coreboot/src/cpu/intel/model_68x/microcode-537-MU268110.h coreboot/src/cpu/intel/model_1067x/microcode-m011067660F.h coreboot/src/cpu/intel/model_1067x/microcode-m401067660F.h coreboot/src/cpu/intel/model_1067x/microcode-m441067AA0B.h coreboot/src/cpu/intel/model_1067x/microcode-m101067660F.h coreboot/src/cpu/intel/model_1067x/microcode-m041067660F.h coreboot/src/cpu/intel/model_1067x/microcode-m111067AA0B.h coreboot/src/cpu/intel/model_1067x/microcode-m801067660F.h coreboot/src/cpu/intel/model_1067x/microcode-mA01067AA0B.h coreboot/src/cpu/intel/model_1067x/microcode-m101067770A.h coreboot/src/cpu/intel/model_67x/microcode-540-MU267238.h coreboot/src/cpu/intel/model_67x/microcode-531-MU26732e.h coreboot/src/cpu/intel/model_67x/microcode-293-MU267114.h coreboot/src/cpu/intel/model_67x/microcode-539-MU167210.h coreboot/src/cpu/intel/model_67x/microcode-530-MU16730e.h coreboot/src/cpu/intel/model_65x/microcode-409-MU16522c.h coreboot/src/cpu/intel/model_65x/microcode-423-MU26522b.h coreboot/src/cpu/intel/model_65x/microcode-147-MU16502f.h coreboot/src/cpu/intel/model_65x/microcode-435-MU165141.h coreboot/src/cpu/intel/model_65x/microcode-94-MU265019.h coreboot/src/cpu/intel/model_65x/microcode-411-MU16530c.h coreboot/src/cpu/intel/model_65x/microcode-452-MU165310.h coreboot/src/cpu/intel/model_65x/microcode-412-MU16530d.h coreboot/src/cpu/intel/model_65x/microcode-430-MU165041.h coreboot/src/cpu/intel/model_65x/microcode-433-MU165045.h coreboot/src/cpu/intel/model_65x/microcode-410-MU16522d.h coreboot/src/cpu/intel/model_65x/microcode-407-MU16522a.h coreboot/src/cpu/intel/model_65x/microcode-429-MU165040.h coreboot/src/cpu/intel/model_65x/microcode-146-MU16502e.h coreboot/src/cpu/intel/model_65x/microcode-422-MU26530b.h coreboot/src/cpu/intel/model_65x/microcode-434-MU165140.h coreboot/src/cpu/intel/model_65x/microcode-436-MU165142.h coreboot/src/cpu/intel/model_f1x/microcode-1070-m02f122f.h coreboot/src/cpu/intel/model_f1x/microcode-1069-m04f122e.h coreboot/src/cpu/intel/model_f1x/microcode-1068-m01f122d.h coreboot/src/cpu/intel/model_f1x/microcode-1072-m04f1305.h coreboot/src/cpu/intel/model_6ex/microcode-1869-m806ec59.h coreboot/src/cpu/intel/model_6ex/microcode-1729-m206ec54.h coreboot/src/cpu/intel/model_6ex/microcode-1624-m206e839.h coreboot/src/cpu/intel/model_106cx/microcode-M08106CA107.h coreboot/src/cpu/intel/model_106cx/microcode-M08106C2219.h coreboot/src/cpu/intel/model_106cx/microcode-M04106C2218.h coreboot/src/cpu/intel/model_106cx/microcode-M10106CA107.h coreboot/src/cpu/intel/model_106cx/microcode-M01106C2217.h coreboot/src/cpu/intel/model_106cx/microcode-M04106CA107.h coreboot/src/cpu/intel/model_106cx/microcode-M01106CA107.h coreboot/src/cpu/intel/model_6bx/microcode-737-MU16b11c.h coreboot/src/cpu/intel/model_6bx/microcode-738-MU16b11d.h coreboot/src/cpu/intel/model_6bx/microcode-885-MU16b402.h coreboot/src/cpu/intel/model_6bx/microcode-875-MU16b401.h coreboot/src/cpu/intel/model_206ax/microcode-m12306a9_00000017.h coreboot/src/cpu/intel/model_206ax/microcode-m12206a7_00000028.h coreboot/src/cpu/intel/model_6fx/microcode-m406fbBC.h coreboot/src/cpu/intel/model_6fx/microcode-m206f25c.h coreboot/src/cpu/intel/model_6fx/microcode-m106fbBA.h coreboot/src/cpu/intel/model_6fx/microcode-m106f76a.h coreboot/src/cpu/intel/model_6fx/microcode-m46f6d2.h coreboot/src/cpu/intel/model_6fx/microcode-m206f6d1.h coreboot/src/cpu/intel/model_6fx/microcode-m206fda4.h coreboot/src/cpu/intel/model_6fx/microcode-m16f6d0.h coreboot/src/cpu/intel/model_6fx/microcode-m206fbBA.h coreboot/src/cpu/intel/model_6fx/microcode-m806fda4.h coreboot/src/cpu/intel/model_6fx/microcode-m806fbBA.h coreboot/src/cpu/intel/model_6fx/microcode-m16f25d.h coreboot/src/cpu/intel/model_6fx/microcode-m16fda4.h coreboot/src/cpu/intel/model_6fx/microcode-m016fbBA.h coreboot/src/cpu/intel/model_6fx/microcode-m806fa95.h coreboot/src/cpu/intel/model_6fx/microcode-m086fbBB.h coreboot/src/cpu/intel/model_6fx/microcode-m046fbBC.h coreboot/src/cpu/intel/model_6fx/microcode-m406f76b.h coreboot/src/cpu/intel/model_f4x/microcode-1637-m5cf4a04.h coreboot/src/cpu/intel/model_f4x/microcode-1470-m9df4703.h coreboot/src/cpu/intel/model_f4x/microcode-1735-m01f480c.h coreboot/src/cpu/intel/model_f4x/microcode-1521-m5ff4807.h coreboot/src/cpu/intel/model_f4x/microcode-1466-m02f4116.h coreboot/src/cpu/intel/model_f4x/microcode-1471-mbdf4117.h coreboot/src/cpu/intel/model_f4x/microcode-1462-mbdf4903.h coreboot/src/cpu/intel/model_f4x/microcode-1460-m9df4305.h coreboot/src/cpu/intel/model_f4x/microcode-1469-m9df4406.h coreboot/src/cpu/intel/model_f4x/microcode-1498-m5df4a02.h coreboot/src/cpu/intel/model_f4x/microcode-2492-m02f480e.h coreboot/src/cpu/intel/model_6dx/microcode-1355-m206d618.h coreboot/src/cpu/intel/model_f3x/microcode-1467-m0df330c.h coreboot/src/cpu/intel/model_f3x/microcode-1290-m0df320a.h coreboot/src/cpu/intel/model_f3x/microcode-1468-m1df3417.h coreboot/src/cpu/intel/model_69x/microcode-1376-m8069547.h coreboot/src/cpu/intel/model_69x/microcode-1374-m2069507.h coreboot/src/cpu/intel/model_69x/microcode-1373-m1069507.h coreboot/src/cpu/intel/model_f0x/microcode-965-m01f0a13.h coreboot/src/cpu/intel/model_f0x/microcode-966-m04f0a14.h coreboot/src/cpu/intel/model_f0x/microcode-964-m01f0712.h coreboot/src/cpu/intel/model_f0x/microcode-983-m02f0a15.h coreboot/src/cpu/intel/model_f0x/microcode-678-2f0708.h coreboot/src/cpu/intel/model_f2x/microcode-1341-m01f2529.h coreboot/src/cpu/intel/model_f2x/microcode-1101-m02f2738.h coreboot/src/cpu/intel/model_f2x/microcode-1102-m08f2739.h coreboot/src/cpu/intel/model_f2x/microcode-1339-m04f292e.h coreboot/src/cpu/intel/model_f2x/microcode-1100-m04f2737.h coreboot/src/cpu/intel/model_f2x/microcode-1342-m02f252a.h coreboot/src/cpu/intel/model_f2x/microcode-1105-m08f2420.h coreboot/src/cpu/intel/model_f2x/microcode-1107-m10f2421.h coreboot/src/cpu/intel/model_f2x/microcode-1338-m02f292d.h coreboot/src/cpu/intel/model_f2x/microcode-1343-m04f252b.h coreboot/src/cpu/intel/model_f2x/microcode-1340-m08f292f.h coreboot/src/cpu/intel/model_f2x/microcode-1106-m02f241f.h coreboot/src/cpu/intel/model_f2x/microcode-1104-m04f241e.h coreboot/src/cpu/intel/model_f2x/microcode-1336-m02f2610.h coreboot/src/cpu/intel/model_f2x/microcode-1346-m10f252c.h coreboot/src/cpu/intel/model_6xx/microcode-43-B_c6_617.h coreboot/src/cpu/intel/model_6xx/microcode-620-MU26a401.h coreboot/src/cpu/intel/model_6xx/microcode-359-MU166d06.h coreboot/src/cpu/intel/model_6xx/microcode-398-MU166503.h coreboot/src/cpu/intel/model_6xx/microcode-308-MU163336.h coreboot/src/cpu/intel/model_6xx/microcode-153-d2_619.h coreboot/src/cpu/intel/model_6xx/microcode-51-B_c6_616.h coreboot/src/cpu/intel/model_6xx/microcode-566-mu26a003.h coreboot/src/cpu/intel/model_6xx/microcode-400-MU166a0c.h coreboot/src/cpu/intel/model_6xx/microcode-402-MU166d07.h coreboot/src/cpu/intel/model_6xx/microcode-401-MU166a0d.h coreboot/src/cpu/intel/model_6xx/microcode-386-MU16600a.h coreboot/src/cpu/intel/model_6xx/microcode-309-MU163437.h coreboot/src/cpu/intel/model_6xx/microcode-99-B_c6_612.h coreboot/src/cpu/intel/model_6xx/microcode-588-mu26a101.h coreboot/src/cpu/intel/model_6xx/microcode-399-MU166a0b.h coreboot/src/cpu/intel/model_6xx/microcode-358-MU166d05.h coreboot/src/cpu/intel/haswell/microcode-M3240660_ffff000b.h  coreboot/src/cpu/intel/haswell/microcode-M32306c1_ffff000d.h  coreboot/src/cpu/intel/haswell/microcode-M32306c2_ffff0003.h  coreboot/src/cpu/intel/haswell/microcode-M7240650_ffff0007.h  coreboot/src/cpu/intel/haswell/microcode-M7240650_ffff000a.h  coreboot/src/cpu/intel/model_f2x/microcode_m02f2203.h  coreboot/src/cpu/intel/model_2065x/microcode-m9220655_00000003.h  coreboot/src/cpu/amd/model_fxx/microcode_rev_d.h  coreboot/src/cpu/amd/model_fxx/microcode_rev_c.h  coreboot/src/cpu/amd/model_fxx/microcode_rev_e.h coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000d9.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000624_Enc.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch0600050D_Enc.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000425.c coreboot/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMicrocodePatch0600110F_Enc.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000025.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000028.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000101.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch03000002.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000f.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000e.c coreboot/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c coreboot/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000b6.c coreboot/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000098.c coreboot/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000086.c coreboot/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c coreboot/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c coreboot/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbId7001MicrocodePatch.c coreboot/src/cpu/intel/haswell/microcode-M7240651_00000015.h coreboot/src/cpu/intel/haswell/microcode-M32306c3_00000012.h coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c coreboot/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbSmuFirmware.h coreboot/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbSmuFirmware.h coreboot/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbSamuPatchKB.h coreboot/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbSmuFirmwareKB.h coreboot/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/excel925.h coreboot/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbCacWeightsTN.h coreboot/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbSmuFirmwareTN.h coreboot/src/vendorcode/amd/cimx/rd890/HotplugFirmware.h coreboot/src/cpu/amd/model_10xxx/mc_patch_01000086.h coreboot/src/cpu/amd/model_10xxx/mc_patch_01000095.h coreboot/src/cpu/amd/model_10xxx/mc_patch_01000096.h coreboot/src/cpu/amd/model_10xxx/mc_patch_0100009f.h coreboot/src/cpu/amd/model_10xxx/mc_patch_010000b6.h coreboot/src/cpu/amd/model_10xxx/mc_patch_010000bf.h coreboot/src/cpu/amd/model_10xxx/mc_patch_010000c4.h coreboot/src/cpu/dmp/vortex86ex/dmp_kbd_fw_part1.inc coreboot/src/cpu/via/nano/nano_ucode_blob.c coreboot/src/soc/intel/baytrail/microcode/M0C3068_00000808.h coreboot/src/soc/intel/baytrail/microcode/M0C3067_0000031E.h coreboot/src/cpu/intel/model_2065x/microcode-m1220652_0000000d.h
+rm -rf coreboot/src/cpu/intel/model_68x/microcode-617-MU16860c.h coreboot/src/cpu/intel/model_68x/microcode-550-MU168307.h coreboot/src/cpu/intel/model_68x/microcode-618-MU268602.h coreboot/src/cpu/intel/model_68x/microcode-729-MU268310.h coreboot/src/cpu/intel/model_68x/microcode-535-MU16810e.h coreboot/src/cpu/intel/model_68x/microcode-727-MU168313.h coreboot/src/cpu/intel/model_68x/microcode-551-MU168308.h coreboot/src/cpu/intel/model_68x/microcode-536-MU16810f.h coreboot/src/cpu/intel/model_68x/microcode-662-MU168a01.h coreboot/src/cpu/intel/model_68x/microcode-728-MU168314.h coreboot/src/cpu/intel/model_68x/microcode-538-MU168111.h coreboot/src/cpu/intel/model_68x/microcode-611-MU168607.h coreboot/src/cpu/intel/model_68x/microcode-615-MU16860a.h coreboot/src/cpu/intel/model_68x/microcode-534-MU16810d.h coreboot/src/cpu/intel/model_68x/microcode-691-MU168a04.h coreboot/src/cpu/intel/model_68x/microcode-692-MU168a05.h coreboot/src/cpu/intel/model_68x/microcode-612-MU168608.h coreboot/src/cpu/intel/model_68x/microcode-537-MU268110.h coreboot/src/cpu/intel/model_1067x/microcode-m011067660F.h coreboot/src/cpu/intel/model_1067x/microcode-m401067660F.h coreboot/src/cpu/intel/model_1067x/microcode-m441067AA0B.h coreboot/src/cpu/intel/model_1067x/microcode-m101067660F.h coreboot/src/cpu/intel/model_1067x/microcode-m041067660F.h coreboot/src/cpu/intel/model_1067x/microcode-m111067AA0B.h coreboot/src/cpu/intel/model_1067x/microcode-m801067660F.h coreboot/src/cpu/intel/model_1067x/microcode-mA01067AA0B.h coreboot/src/cpu/intel/model_1067x/microcode-m101067770A.h coreboot/src/cpu/intel/model_67x/microcode-540-MU267238.h coreboot/src/cpu/intel/model_67x/microcode-531-MU26732e.h coreboot/src/cpu/intel/model_67x/microcode-293-MU267114.h coreboot/src/cpu/intel/model_67x/microcode-539-MU167210.h coreboot/src/cpu/intel/model_67x/microcode-530-MU16730e.h coreboot/src/cpu/intel/model_65x/microcode-409-MU16522c.h coreboot/src/cpu/intel/model_65x/microcode-423-MU26522b.h coreboot/src/cpu/intel/model_65x/microcode-147-MU16502f.h coreboot/src/cpu/intel/model_65x/microcode-435-MU165141.h coreboot/src/cpu/intel/model_65x/microcode-94-MU265019.h coreboot/src/cpu/intel/model_65x/microcode-411-MU16530c.h coreboot/src/cpu/intel/model_65x/microcode-452-MU165310.h coreboot/src/cpu/intel/model_65x/microcode-412-MU16530d.h coreboot/src/cpu/intel/model_65x/microcode-430-MU165041.h coreboot/src/cpu/intel/model_65x/microcode-433-MU165045.h coreboot/src/cpu/intel/model_65x/microcode-410-MU16522d.h coreboot/src/cpu/intel/model_65x/microcode-407-MU16522a.h coreboot/src/cpu/intel/model_65x/microcode-429-MU165040.h coreboot/src/cpu/intel/model_65x/microcode-146-MU16502e.h coreboot/src/cpu/intel/model_65x/microcode-422-MU26530b.h coreboot/src/cpu/intel/model_65x/microcode-434-MU165140.h coreboot/src/cpu/intel/model_65x/microcode-436-MU165142.h coreboot/src/cpu/intel/model_f1x/microcode-1070-m02f122f.h coreboot/src/cpu/intel/model_f1x/microcode-1069-m04f122e.h coreboot/src/cpu/intel/model_f1x/microcode-1068-m01f122d.h coreboot/src/cpu/intel/model_f1x/microcode-1072-m04f1305.h coreboot/src/cpu/intel/model_6ex/microcode-1869-m806ec59.h coreboot/src/cpu/intel/model_6ex/microcode-1729-m206ec54.h coreboot/src/cpu/intel/model_6ex/microcode-1624-m206e839.h coreboot/src/cpu/intel/model_106cx/microcode-M08106CA107.h coreboot/src/cpu/intel/model_106cx/microcode-M08106C2219.h coreboot/src/cpu/intel/model_106cx/microcode-M04106C2218.h coreboot/src/cpu/intel/model_106cx/microcode-M10106CA107.h coreboot/src/cpu/intel/model_106cx/microcode-M01106C2217.h coreboot/src/cpu/intel/model_106cx/microcode-M04106CA107.h coreboot/src/cpu/intel/model_106cx/microcode-M01106CA107.h coreboot/src/cpu/intel/model_6bx/microcode-737-MU16b11c.h coreboot/src/cpu/intel/model_6bx/microcode-738-MU16b11d.h coreboot/src/cpu/intel/model_6bx/microcode-885-MU16b402.h coreboot/src/cpu/intel/model_6bx/microcode-875-MU16b401.h coreboot/src/cpu/intel/model_206ax/microcode-m12306a9_00000017.h coreboot/src/cpu/intel/model_206ax/microcode-m12206a7_00000028.h coreboot/src/cpu/intel/model_6fx/microcode-m406fbBC.h coreboot/src/cpu/intel/model_6fx/microcode-m206f25c.h coreboot/src/cpu/intel/model_6fx/microcode-m106fbBA.h coreboot/src/cpu/intel/model_6fx/microcode-m106f76a.h coreboot/src/cpu/intel/model_6fx/microcode-m46f6d2.h coreboot/src/cpu/intel/model_6fx/microcode-m206f6d1.h coreboot/src/cpu/intel/model_6fx/microcode-m206fda4.h coreboot/src/cpu/intel/model_6fx/microcode-m16f6d0.h coreboot/src/cpu/intel/model_6fx/microcode-m206fbBA.h coreboot/src/cpu/intel/model_6fx/microcode-m806fda4.h coreboot/src/cpu/intel/model_6fx/microcode-m806fbBA.h coreboot/src/cpu/intel/model_6fx/microcode-m16f25d.h coreboot/src/cpu/intel/model_6fx/microcode-m16fda4.h coreboot/src/cpu/intel/model_6fx/microcode-m016fbBA.h coreboot/src/cpu/intel/model_6fx/microcode-m806fa95.h coreboot/src/cpu/intel/model_6fx/microcode-m086fbBB.h coreboot/src/cpu/intel/model_6fx/microcode-m046fbBC.h coreboot/src/cpu/intel/model_6fx/microcode-m406f76b.h coreboot/src/cpu/intel/model_f4x/microcode-1637-m5cf4a04.h coreboot/src/cpu/intel/model_f4x/microcode-1470-m9df4703.h coreboot/src/cpu/intel/model_f4x/microcode-1735-m01f480c.h coreboot/src/cpu/intel/model_f4x/microcode-1521-m5ff4807.h coreboot/src/cpu/intel/model_f4x/microcode-1466-m02f4116.h coreboot/src/cpu/intel/model_f4x/microcode-1471-mbdf4117.h coreboot/src/cpu/intel/model_f4x/microcode-1462-mbdf4903.h coreboot/src/cpu/intel/model_f4x/microcode-1460-m9df4305.h coreboot/src/cpu/intel/model_f4x/microcode-1469-m9df4406.h coreboot/src/cpu/intel/model_f4x/microcode-1498-m5df4a02.h coreboot/src/cpu/intel/model_f4x/microcode-2492-m02f480e.h coreboot/src/cpu/intel/model_6dx/microcode-1355-m206d618.h coreboot/src/cpu/intel/model_f3x/microcode-1467-m0df330c.h coreboot/src/cpu/intel/model_f3x/microcode-1290-m0df320a.h coreboot/src/cpu/intel/model_f3x/microcode-1468-m1df3417.h coreboot/src/cpu/intel/model_69x/microcode-1376-m8069547.h coreboot/src/cpu/intel/model_69x/microcode-1374-m2069507.h coreboot/src/cpu/intel/model_69x/microcode-1373-m1069507.h coreboot/src/cpu/intel/model_f0x/microcode-965-m01f0a13.h coreboot/src/cpu/intel/model_f0x/microcode-966-m04f0a14.h coreboot/src/cpu/intel/model_f0x/microcode-964-m01f0712.h coreboot/src/cpu/intel/model_f0x/microcode-983-m02f0a15.h coreboot/src/cpu/intel/model_f0x/microcode-678-2f0708.h coreboot/src/cpu/intel/model_f2x/microcode-1341-m01f2529.h coreboot/src/cpu/intel/model_f2x/microcode-1101-m02f2738.h coreboot/src/cpu/intel/model_f2x/microcode-1102-m08f2739.h coreboot/src/cpu/intel/model_f2x/microcode-1339-m04f292e.h coreboot/src/cpu/intel/model_f2x/microcode-1100-m04f2737.h coreboot/src/cpu/intel/model_f2x/microcode-1342-m02f252a.h coreboot/src/cpu/intel/model_f2x/microcode-1105-m08f2420.h coreboot/src/cpu/intel/model_f2x/microcode-1107-m10f2421.h coreboot/src/cpu/intel/model_f2x/microcode-1338-m02f292d.h coreboot/src/cpu/intel/model_f2x/microcode-1343-m04f252b.h coreboot/src/cpu/intel/model_f2x/microcode-1340-m08f292f.h coreboot/src/cpu/intel/model_f2x/microcode-1106-m02f241f.h coreboot/src/cpu/intel/model_f2x/microcode-1104-m04f241e.h coreboot/src/cpu/intel/model_f2x/microcode-1336-m02f2610.h coreboot/src/cpu/intel/model_f2x/microcode-1346-m10f252c.h coreboot/src/cpu/intel/model_6xx/microcode-43-B_c6_617.h coreboot/src/cpu/intel/model_6xx/microcode-620-MU26a401.h coreboot/src/cpu/intel/model_6xx/microcode-359-MU166d06.h coreboot/src/cpu/intel/model_6xx/microcode-398-MU166503.h coreboot/src/cpu/intel/model_6xx/microcode-308-MU163336.h coreboot/src/cpu/intel/model_6xx/microcode-153-d2_619.h coreboot/src/cpu/intel/model_6xx/microcode-51-B_c6_616.h coreboot/src/cpu/intel/model_6xx/microcode-566-mu26a003.h coreboot/src/cpu/intel/model_6xx/microcode-400-MU166a0c.h coreboot/src/cpu/intel/model_6xx/microcode-402-MU166d07.h coreboot/src/cpu/intel/model_6xx/microcode-401-MU166a0d.h coreboot/src/cpu/intel/model_6xx/microcode-386-MU16600a.h coreboot/src/cpu/intel/model_6xx/microcode-309-MU163437.h coreboot/src/cpu/intel/model_6xx/microcode-99-B_c6_612.h coreboot/src/cpu/intel/model_6xx/microcode-588-mu26a101.h coreboot/src/cpu/intel/model_6xx/microcode-399-MU166a0b.h coreboot/src/cpu/intel/model_6xx/microcode-358-MU166d05.h coreboot/src/cpu/intel/haswell/microcode-M3240660_ffff000b.h  coreboot/src/cpu/intel/haswell/microcode-M32306c1_ffff000d.h  coreboot/src/cpu/intel/haswell/microcode-M32306c2_ffff0003.h  coreboot/src/cpu/intel/haswell/microcode-M7240650_ffff0007.h  coreboot/src/cpu/intel/haswell/microcode-M7240650_ffff000a.h  coreboot/src/cpu/intel/model_f2x/microcode_m02f2203.h  coreboot/src/cpu/intel/model_2065x/microcode-m9220655_00000003.h  coreboot/src/cpu/amd/model_fxx/microcode_rev_d.h  coreboot/src/cpu/amd/model_fxx/microcode_rev_c.h  coreboot/src/cpu/amd/model_fxx/microcode_rev_e.h coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000d9.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000624_Enc.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch0600050D_Enc.c coreboot/src/vendorcode/amd/agesa/f15/Proc/CPU/Family/0x15/OR/F15OrMicrocodePatch06000425.c coreboot/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMicrocodePatch0600110F_Enc.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000025.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000028.c coreboot/src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000101.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c6.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c8.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevE/F10MicrocodePatch010000bf.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch03000002.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000f.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x12/F12MicrocodePatch0300000e.c coreboot/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000085.c coreboot/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000b6.c coreboot/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000098.c coreboot/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch01000086.c coreboot/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c4.c coreboot/src/vendorcode/amd/agesa/f10/Proc/CPU/Family/0x10/RevD/F10MicrocodePatch010000c5.c coreboot/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbId7001MicrocodePatch.c coreboot/src/cpu/intel/haswell/microcode-M7240651_00000015.h coreboot/src/cpu/intel/haswell/microcode-M32306c3_00000012.h coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c coreboot/src/vendorcode/amd/agesa/f12/Proc/CPU/Family/0x10/RevC/F10MicrocodePatch010000c7.c coreboot/src/vendorcode/amd/agesa/f12/Proc/GNB/Nb/Family/LN/F12NbSmuFirmware.h coreboot/src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbSmuFirmware.h coreboot/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbSamuPatchKB.h coreboot/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbSmuFirmwareKB.h coreboot/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/excel925.h coreboot/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbCacWeightsTN.h coreboot/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbSmuFirmwareTN.h coreboot/src/vendorcode/amd/cimx/rd890/HotplugFirmware.h coreboot/src/cpu/amd/model_10xxx/mc_patch_01000086.h coreboot/src/cpu/amd/model_10xxx/mc_patch_01000095.h coreboot/src/cpu/amd/model_10xxx/mc_patch_01000096.h coreboot/src/cpu/amd/model_10xxx/mc_patch_0100009f.h coreboot/src/cpu/amd/model_10xxx/mc_patch_010000b6.h coreboot/src/cpu/amd/model_10xxx/mc_patch_010000bf.h coreboot/src/cpu/amd/model_10xxx/mc_patch_010000c4.h coreboot/src/cpu/dmp/vortex86ex/dmp_kbd_fw_part1.inc coreboot/src/cpu/via/nano/nano_ucode_blob.c coreboot/src/soc/intel/baytrail/microcode/M0C3068_00000808.h coreboot/src/soc/intel/baytrail/microcode/M0C3067_0000031E.h coreboot/src/cpu/intel/model_2065x/microcode-m1220652_0000000d.h coreboot/src/soc/intel/baytrail/microcode/M0C30678_00000816.h
 
 # Misunderstood (weird: purpose unknown)
-rm -rf coreboot/src/mainboard/google/slippy/Micron_4KTF25664HZ.spd.hex coreboot/src/mainboard/google/falco/Micron_4KTF25664HZ.spd.hex coreboot/src/mainboard/google/peppy/Micron_4KTF25664HZ.spd.hex coreboot/src/mainboard/google/link/micron_4Gb_1600_1.35v_x16.spd.hex coreboot/src/mainboard/google/rambi/spd/micron_1GiB_dimm_MT41K128M16JT-125.spd.hex coreboot/src/mainboard/google/rambi/spd/micron_2GiB_dimm_MT41K256M16HA-125.spd.hex coreboot/src/mainboard/google/bolt/micron_4Gb_1600_1.35v_x16.spd.hex coreboot/src/mainboard/google/link/samsung_4Gb_1600_1.35v_x16.spd.hex coreboot/src/mainboard/google/link/elpida_4Gb_1600_x16.spd.hex coreboot/src/mainboard/google/slippy/Hynix_HMT425S6AFR6A.spd.hex coreboot/src/mainboard/google/falco/Hynix_HMT425S6AFR6A.spd.hex coreboot/src/mainboard/google/falco/Elpida_EDJ4216EFBG.spd.hex coreboot/src/mainboard/google/rambi/spd/hynix_1GiB_dimm_H5TC2G63FFR-PBA.spd.hex coreboot/src/mainboard/google/rambi/spd/hynix_2GiB_dimm_H5TC4G63AFR-PBA.spd.hex coreboot/src/mainboard/google/bolt/samsung_4Gb_1600_1.35v_x16.spd.hex coreboot/src/mainboard/google/bolt/elpida_4Gb_1600_x16.spd.hex coreboot/src/mainboard/google/peppy/Hynix_HMT425S6AFR6A.spd.hex coreboot/src/mainboard/google/peppy/Elpida_EDJ4216EFBG.spd.hex 
+rm -rf coreboot/src/mainboard/google/slippy/Micron_4KTF25664HZ.spd.hex coreboot/src/mainboard/google/falco/Micron_4KTF25664HZ.spd.hex coreboot/src/mainboard/google/peppy/Micron_4KTF25664HZ.spd.hex coreboot/src/mainboard/google/link/micron_4Gb_1600_1.35v_x16.spd.hex coreboot/src/mainboard/google/rambi/spd/micron_1GiB_dimm_MT41K128M16JT-125.spd.hex coreboot/src/mainboard/google/rambi/spd/micron_2GiB_dimm_MT41K256M16HA-125.spd.hex coreboot/src/mainboard/google/bolt/micron_4Gb_1600_1.35v_x16.spd.hex coreboot/src/mainboard/google/link/samsung_4Gb_1600_1.35v_x16.spd.hex coreboot/src/mainboard/google/link/elpida_4Gb_1600_x16.spd.hex coreboot/src/mainboard/google/slippy/Hynix_HMT425S6AFR6A.spd.hex coreboot/src/mainboard/google/falco/Hynix_HMT425S6AFR6A.spd.hex coreboot/src/mainboard/google/falco/Elpida_EDJ4216EFBG.spd.hex coreboot/src/mainboard/google/rambi/spd/hynix_1GiB_dimm_H5TC2G63FFR-PBA.spd.hex coreboot/src/mainboard/google/rambi/spd/hynix_2GiB_dimm_H5TC4G63AFR-PBA.spd.hex coreboot/src/mainboard/google/bolt/samsung_4Gb_1600_1.35v_x16.spd.hex coreboot/src/mainboard/google/bolt/elpida_4Gb_1600_x16.spd.hex coreboot/src/mainboard/google/peppy/Hynix_HMT425S6AFR6A.spd.hex coreboot/src/mainboard/google/peppy/Elpida_EDJ4216EFBG.spd.hex coreboot/src/mainboard/google/samus/samsung_8Gb.spd.hex coreboot/src/mainboard/google/samus/empty.spd.hex coreboot/src/mainboard/google/samus/elpida_4Gb.spd.hex coreboot/src/mainboard/google/samus/elpida_8Gb.spd.hex coreboot/src/mainboard/google/samus/samsung_4Gb.spd.hex coreboot/src/mainboard/google/falco/Samsung_M471B5674QH0.spd.hex 
 
 # DSDT/SSDT (pre-compiled blobs)
 rm -rf coreboot/src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieAlibSsdt.h coreboot/src/vendorcode/amd/agesa/f12/Proc/GNB/PCIe/Family/LN/F12PcieAlibSsdt.h coreboot/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/AlibSsdtKB.h coreboot/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibSsdtTNFM2.h coreboot/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibSsdtTNFS1.h coreboot/src/northbridge/amd/amdfam10/ssdt.asl coreboot/src/northbridge/amd/agesa/family12/ssdt.asl coreboot/src/northbridge/amd/agesa/family10/ssdt.asl
diff --git a/getcb b/getcb
index a1cbf605..44ace5d9 100755
--- a/getcb
+++ b/getcb
@@ -42,7 +42,7 @@ git clone http://review.coreboot.org/coreboot
 cd coreboot
 
 # reset to previously tested revision
-git reset --hard 23aad4a83c3390dc39f7d1c1f5422f7ac54a80f3
+git reset --hard 9310df8d0351842e7bb9efe3cabc0ff82ec99c53
 
 # Get patches from review.coreboot.org
 # ----------------------------------------------------------------------------------
@@ -53,11 +53,12 @@ git fetch http://review.coreboot.org/coreboot refs/changes/25/6725/3 && git cher
 # lenovo/x60: Enable legacy brightness controls (native graphics)
 git fetch http://review.coreboot.org/coreboot refs/changes/48/7048/4 && git cherry-pick FETCH_HEAD
 
-## Enable T60 native graphics
-# git fetch http://review.coreboot.org/coreboot refs/changes/45/5345/8 && git cherry-pick FETCH_HEAD
-# ^ the above is not needed, because 7050 (see below) uses it
-# lenovo/t60: Enable text mode native gfx init:
-git fetch http://review.coreboot.org/coreboot refs/changes/50/7050/1 && git cherry-pick FETCH_HEAD
+# Enable T60 native graphics
+git fetch http://review.coreboot.org/coreboot refs/changes/45/5345/9 && git cherry-pick FETCH_HEAD
+# Enable text-mode graphics for T60
+git fetch http://review.coreboot.org/coreboot refs/changes/50/7050/2 && git cherry-pick FETCH_HEAD
+# lenovo/t60: Enable legacy brightness controls (native graphics)
+git fetch http://review.coreboot.org/coreboot refs/changes/51/7051/1 && git cherry-pick FETCH_HEAD
 
 # Apply necessary patches (from resources/libreboot/patch/)
 # ---------------------------------------------------------------------------------
diff --git a/resources/libreboot/config/macbook21/config b/resources/libreboot/config/macbook21/config
index 2bb0cb7c..f443f49e 100644
--- a/resources/libreboot/config/macbook21/config
+++ b/resources/libreboot/config/macbook21/config
@@ -123,9 +123,6 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
@@ -153,7 +150,8 @@ CONFIG_ROM_SIZE=0x200000
 CONFIG_MAINBOARD_SERIAL_NUMBER="W8724XXXXXX"
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="MacBook2,1"
 CONFIG_ARCH_X86=y
-# CONFIG_ARCH_ARMV7 is not set
+# CONFIG_ARCH_ARM is not set
+# CONFIG_ARCH_ARM64 is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
@@ -169,11 +167,24 @@ CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 CONFIG_HPET_ADDRESS=0xfed00000
+# CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_ROMSTAGE_ARM is not set
+# CONFIG_ARCH_RAMSTAGE_ARM is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
+# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
 # CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM_V8_64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
@@ -189,8 +200,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 #
 # CONFIG_CPU_ALLWINNER_A10 is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
@@ -267,6 +276,9 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 # SoC
 #
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
+# CONFIG_SOC_QC_IPQ806X is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 
 #
 # Devices
@@ -276,8 +288,6 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -316,6 +326,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
+CONFIG_INTEL_INT15=y
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
@@ -360,7 +371,7 @@ CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x10000
-CONFIG_CONSOLE_CAR_BUFFER_SIZE=0xc00
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -393,6 +404,7 @@ CONFIG_VGA=y
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
 CONFIG_HAVE_PIRQ_TABLE=y
+# CONFIG_PER_DEVICE_ACPI_TABLES is not set
 
 #
 # System tables
@@ -412,9 +424,8 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
+# CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 
diff --git a/resources/libreboot/config/t60/config b/resources/libreboot/config/t60/config
index 395d555a..d2c1c680 100644
--- a/resources/libreboot/config/t60/config
+++ b/resources/libreboot/config/t60/config
@@ -121,9 +121,6 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
@@ -132,6 +129,7 @@ CONFIG_POST_DEVICE=y
 # CONFIG_BOARD_LENOVO_X60 is not set
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
+# CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
@@ -158,7 +156,8 @@ CONFIG_ROM_SIZE=0x200000
 CONFIG_MAINBOARD_SERIAL_NUMBER="L3DKE06"
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="1951FEG"
 CONFIG_ARCH_X86=y
-# CONFIG_ARCH_ARMV7 is not set
+# CONFIG_ARCH_ARM is not set
+# CONFIG_ARCH_ARM64 is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
@@ -174,11 +173,24 @@ CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 CONFIG_HPET_ADDRESS=0xfed00000
+# CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_ROMSTAGE_ARM is not set
+# CONFIG_ARCH_RAMSTAGE_ARM is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
+# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
 # CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM_V8_64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
@@ -194,8 +206,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 #
 # CONFIG_CPU_ALLWINNER_A10 is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
@@ -279,6 +289,9 @@ CONFIG_EC_LENOVO_PMH7=y
 # SoC
 #
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
+# CONFIG_SOC_QC_IPQ806X is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 
 #
 # Devices
@@ -288,8 +301,6 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -329,6 +340,7 @@ CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
+CONFIG_INTEL_INT15=y
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
@@ -373,7 +385,7 @@ CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x10000
-CONFIG_CONSOLE_CAR_BUFFER_SIZE=0xc00
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -406,6 +418,7 @@ CONFIG_VGA=y
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
 CONFIG_HAVE_PIRQ_TABLE=y
+# CONFIG_PER_DEVICE_ACPI_TABLES is not set
 
 #
 # System tables
@@ -425,9 +438,8 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
+# CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 
diff --git a/resources/libreboot/config/x60/config b/resources/libreboot/config/x60/config
index 374a4c23..1757aeb2 100644
--- a/resources/libreboot/config/x60/config
+++ b/resources/libreboot/config/x60/config
@@ -121,9 +121,6 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
@@ -132,6 +129,7 @@ CONFIG_POST_DEVICE=y
 CONFIG_BOARD_LENOVO_X60=y
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
+# CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
@@ -158,7 +156,8 @@ CONFIG_ROM_SIZE=0x200000
 CONFIG_MAINBOARD_SERIAL_NUMBER="L3BH242"
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="1702L8G"
 CONFIG_ARCH_X86=y
-# CONFIG_ARCH_ARMV7 is not set
+# CONFIG_ARCH_ARM is not set
+# CONFIG_ARCH_ARM64 is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
@@ -174,11 +173,24 @@ CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 CONFIG_HPET_ADDRESS=0xfed00000
+# CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_ROMSTAGE_ARM is not set
+# CONFIG_ARCH_RAMSTAGE_ARM is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
+# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
 # CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM_V8_64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
@@ -194,8 +206,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 #
 # CONFIG_CPU_ALLWINNER_A10 is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
@@ -279,6 +289,9 @@ CONFIG_EC_LENOVO_PMH7=y
 # SoC
 #
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
+# CONFIG_SOC_QC_IPQ806X is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 
 #
 # Devices
@@ -288,8 +301,6 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -329,6 +340,7 @@ CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
+CONFIG_INTEL_INT15=y
 # CONFIG_IPMI_KCS is not set
 CONFIG_DRIVERS_LENOVO_WACOM=y
 CONFIG_DIGITIZER_AUTODETECT=y
@@ -376,7 +388,7 @@ CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x10000
-CONFIG_CONSOLE_CAR_BUFFER_SIZE=0xc00
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -409,6 +421,7 @@ CONFIG_VGA=y
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
 CONFIG_HAVE_PIRQ_TABLE=y
+# CONFIG_PER_DEVICE_ACPI_TABLES is not set
 
 #
 # System tables
@@ -428,9 +441,8 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
+# CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 
diff --git a/resources/libreboot/config/x60t/config b/resources/libreboot/config/x60t/config
index 46213436..e5b6f196 100644
--- a/resources/libreboot/config/x60t/config
+++ b/resources/libreboot/config/x60t/config
@@ -129,6 +129,7 @@ CONFIG_POST_DEVICE=y
 CONFIG_BOARD_LENOVO_X60=y
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
+# CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
@@ -155,7 +156,8 @@ CONFIG_ROM_SIZE=0x200000
 CONFIG_MAINBOARD_SERIAL_NUMBER="L3B8281"
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="6364WJ1"
 CONFIG_ARCH_X86=y
-# CONFIG_ARCH_ARMV7 is not set
+# CONFIG_ARCH_ARM is not set
+# CONFIG_ARCH_ARM64 is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
@@ -171,11 +173,24 @@ CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 CONFIG_HPET_ADDRESS=0xfed00000
+# CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_ROMSTAGE_ARM is not set
+# CONFIG_ARCH_RAMSTAGE_ARM is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
+# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
 # CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM_V8_64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
@@ -191,8 +206,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 #
 # CONFIG_CPU_ALLWINNER_A10 is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
@@ -276,6 +289,9 @@ CONFIG_EC_LENOVO_PMH7=y
 # SoC
 #
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
+# CONFIG_SOC_QC_IPQ806X is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 
 #
 # Devices
@@ -324,6 +340,7 @@ CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
+CONFIG_INTEL_INT15=y
 # CONFIG_IPMI_KCS is not set
 CONFIG_DRIVERS_LENOVO_WACOM=y
 # CONFIG_DIGITIZER_AUTODETECT is not set
@@ -371,7 +388,7 @@ CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x10000
-CONFIG_CONSOLE_CAR_BUFFER_SIZE=0xc00
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -404,6 +421,7 @@ CONFIG_VGA=y
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
 CONFIG_HAVE_PIRQ_TABLE=y
+# CONFIG_PER_DEVICE_ACPI_TABLES is not set
 
 #
 # System tables
@@ -424,6 +442,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
+# CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y