inject.sh: simplify extract_kbc1126ec()

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-05-07 17:08:42 +01:00
parent e3098c61f4
commit a94bd3c093
+5 -8
View File
@@ -150,7 +150,8 @@ extract_intel_me()
set +u +e && fx_ find_me x_ find "$xbmkpwd/$appdir" -type f set +u +e && fx_ find_me x_ find "$xbmkpwd/$appdir" -type f
[ "$ME11bootguard" != "y" ] && x_ mv "$_metmp" "$_me" && return 0 [ "$ME11bootguard" != "y" ] && x_ mv "$_metmp" "$_me" && return 0
( x_ cd src/deguard/ (
x_ cd src/deguard/
x_ ./finalimage.py --delta "data/delta/$ME11delta" --version \ x_ ./finalimage.py --delta "data/delta/$ME11delta" --version \
"$ME11version" --pch "$ME11pch" --sku "$ME11sku" \ "$ME11version" --pch "$ME11pch" --sku "$ME11sku" \
--fake-fpfs data/fpfs/zero --input "$_metmp" --output "$_me" --fake-fpfs data/fpfs/zero --input "$_metmp" --output "$_me"
@@ -181,15 +182,11 @@ extract_archive()
extract_kbc1126ec() extract_kbc1126ec()
{ {
x_ e "$kbc1126_ec_dump" f
( (
x_ cd "$appdir/" x_ cd "$appdir/"
mv Rompaq/68*.BIN ec.bin || : mv Rompaq/68*.BIN ec.bin || unar -D ROM.CAB Rom.bin || unar -D \
if [ ! -f "ec.bin" ]; then Rom.CAB Rom.bin || unar -D 68*.CAB Rom.bin || err "!kbc1126 unar"
unar -D ROM.CAB Rom.bin || unar -D Rom.CAB Rom.bin || \ [ -f "ec.bin" ] || x_ mv Rom.bin ec.bin
unar -D 68*.CAB Rom.bin || err "kbc1126 unar failed"
x_ mv Rom.bin ec.bin
fi
x_ e ec.bin f && x_ "$kbc1126_ec_dump" ec.bin x_ e ec.bin f && x_ "$kbc1126_ec_dump" ec.bin
) || err "$board: can't extract kbc1126 ec firmware - $dontflash" ) || err "$board: can't extract kbc1126 ec firmware - $dontflash"