coreboot-libre: provide better blob categorization

1 files changed, 64 insertions, 24 deletions

diff --git a/resources/utilities/coreboot-libre/deblob b/resources/utilities/coreboot-libre/deblob
index d4e39141..26fb75fa 100755
--- a/resources/utilities/coreboot-libre/deblob
+++ b/resources/utilities/coreboot-libre/deblob
@@ -29,23 +29,40 @@ printf "Deleting blobs in coreboot\n"
 cd coreboot/
 
 # ---------------------
-# CPU microcode updates
-# note: sed -r '/src\/cpu\intel\/.*\/microcode/d' -i resources/utilities/coreboot-libre/deblob
-# sed --in-english 'remove lines containing "src/cpu/intel/.*/microcode" from the file called resources/utilities/coreboot-libre/deblob"
-# src/cpu/intel/*/microcode*.h is removed from a later coreboot:
-# see --> http://review.coreboot.org/gitweb?p=coreboot.git;a=commit;h=5818da262dc0ce56bb1d5439b6d139bc08c25554&utm_source=anzwix
-# remove them from this script on the next coreboot update
+# Intel SoC (broadwell): CPU microcode updates
 # ---------------------
 rm -f \
-"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" \
-"src/soc/intel/baytrail/microcode/M0C3067_0000031E.h" \
+"src/soc/intel/broadwell/microcode/microcode-MC0306D4_0000000D.h"
+
+# ---------------------
+# Intel SoC (baytrail): CPU microcode updates
+# ---------------------
+rm -f \
+"src/soc/intel/baytrail/microcode/M0C30678_00000816.h" \
+"src/soc/intel/baytrail/microcode/M0C3067_0000031E.h"
+
+# ---------------------
+# AMD: CPU microcode updates
+# ---------------------
+rm -f \
 "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/cpu/amd/model_10xxx/mc_patch_01000095.h" \
+"src/cpu/amd/model_10xxx/mc_patch_01000096.h" \
+"src/cpu/amd/model_10xxx/mc_patch_010000d9.h" \
+"src/cpu/amd/model_10xxx/mc_patch_010000dc.h" \
+"src/cpu/amd/model_10xxx/mc_patch_010000db.h" \
+"src/cpu/amd/model_10xxx/mc_patch_010000c7.h" \
+"src/cpu/amd/model_10xxx/mc_patch_010000c8.h"
+
+# ---------------------
+# AMD: CPU microcode updates
+# ---------------------
+rm -f \
 "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" \
@@ -83,24 +100,47 @@ rm -f \
 "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/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000029.c" \
+"src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000119.c"
+
+# ---------------------
+# VIA (nano): CPU microcode updates
+# ---------------------
+rm -f \
+"src/cpu/via/nano/nano_ucode_blob.c"
+
+# -------------------------------------
+# AMD AGESA: SMU firmware
+# -------------------------------------
+rm -f \
 "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/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000029.c" \
-"src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000119.c" \
-"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_01000095.h" \
-"src/cpu/amd/model_10xxx/mc_patch_01000096.h" \
-"src/cpu/amd/model_10xxx/mc_patch_010000d9.h" \
-"src/cpu/amd/model_10xxx/mc_patch_010000dc.h" \
-"src/cpu/amd/model_10xxx/mc_patch_010000db.h" \
-"src/cpu/amd/model_10xxx/mc_patch_010000c7.h" \
-"src/cpu/amd/model_10xxx/mc_patch_010000c8.h" \
-"src/cpu/via/nano/nano_ucode_blob.c"
+"src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbSmuFirmwareTN.h"
+
+# -------------------------------------
+# AMD vendorcode: SCS Binary
+# -------------------------------------
+rm -f \
+"src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/excel925.h"
+
+# -------------------------------------
+# AMD vendorcode: GNB CAC weights table <-- TODO: Is this really a blob? Does it really need to be deleted by libreboot?
+# -------------------------------------
+rm -f \
+"src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbCacWeightsTN.h"
+
+# -------------------------------------
+# AMD vendorcode: SAMU firmware
+# -------------------------------------
+rm -f \
+"src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbSamuPatchKB.h"
+
+# -------------------------------------
+# AMD vendorcode: Hotplug firmware
+# -------------------------------------
+rm -f \
+"src/vendorcode/amd/cimx/rd890/HotplugFirmware.h"
 
 # -------------------------------------
 # keyboard controller firmware (8051 assembly)