From 106a89fa2f4eda9ded7fc0295a5d60c032248239 Mon Sep 17 00:00:00 2001
From: Thierry Laurion <insurgo@riseup.net>
Date: Thu, 29 Oct 2020 15:54:52 -0400
Subject: [PATCH] xx20 blobs extraction scripts fixes to neuter, deativate,
 trim ME and output reduced ME under blob dir and modify both ME and BIOS
 regions accordingly to be able to accept CONFIG_CBFS_SIZE=0x750000 defined
 under coreboot configs (attempt to fix #870)

---
 blobs/t420/extract.sh | 3 +--
 blobs/x220/extract.sh | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/blobs/t420/extract.sh b/blobs/t420/extract.sh
index 422924741..883c434a2 100755
--- a/blobs/t420/extract.sh
+++ b/blobs/t420/extract.sh
@@ -55,10 +55,9 @@ cp "$FILE" $bioscopy
 cd "$extractdir"
 $IFDTOOL -x $bioscopy
 cp "$extractdir/flashregion_3_gbe.bin" "$BLOBDIR/gbe.bin"
-$MECLEAN -O "$BLOBDIR/me.bin" -r -t "$extractdir/flashregion_2_intel_me.bin"
+$MECLEAN -r -t -d -O /tmp/unneeded.bin -D "$BLOBDIR/ifd.bin" -M "$BLOBDIR/me.bin" "$extractdir/flashregion_2_intel_me.bin" 
 $IFDTOOL -n "$BLOBDIR/layout.txt" $bioscopy
 $IFDTOOL -x $bioscopy.new
-cp "$extractdir/flashregion_0_flashdescriptor.bin" "$BLOBDIR/ifd.bin"
 
 rm "$bioscopy"
 rm "$bioscopy.new"
diff --git a/blobs/x220/extract.sh b/blobs/x220/extract.sh
index 422924741..812d51664 100755
--- a/blobs/x220/extract.sh
+++ b/blobs/x220/extract.sh
@@ -55,10 +55,9 @@ cp "$FILE" $bioscopy
 cd "$extractdir"
 $IFDTOOL -x $bioscopy
 cp "$extractdir/flashregion_3_gbe.bin" "$BLOBDIR/gbe.bin"
-$MECLEAN -O "$BLOBDIR/me.bin" -r -t "$extractdir/flashregion_2_intel_me.bin"
+$MECLEAN -r -t -d -O /tmp/unneeded.bin -D "$BLOBDIR/ifd.bin" -M "$BLOBDIR/me.bin" "$extractdir/flashregion_2_intel_me.bin"
 $IFDTOOL -n "$BLOBDIR/layout.txt" $bioscopy
 $IFDTOOL -x $bioscopy.new
-cp "$extractdir/flashregion_0_flashdescriptor.bin" "$BLOBDIR/ifd.bin"
 
 rm "$bioscopy"
 rm "$bioscopy.new"