libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

blobutil/extract: minor code style cleanup

fsdg20230625
Leah Rowe 2023-05-14 09:57:34 +01:00
parent 009bf3b67f
commit a35f0b650a
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
resources/scripts/blobs/extract
View File

@ -12,6 +12,9 @@ vendor_rom=""
cbdir="coreboot/default" cbdir="coreboot/default"
cbcfgsdir="resources/coreboot" cbcfgsdir="resources/coreboot"
ifdtool="${cbdir}/util/ifdtool/ifdtool" ifdtool="${cbdir}/util/ifdtool/ifdtool"
mecleaner="me_cleaner/me_cleaner.py"
me7updateparser="resources/blobs/me7_update_parser.py"
boarddir="" boarddir=""
CONFIG_HAVE_MRC="" CONFIG_HAVE_MRC=""
@ -101,7 +104,8 @@ extract_blobs()
rm -f flashregion*.bin 2> /dev/null rm -f flashregion*.bin 2> /dev/null
if [ -f ${_ifd_destination} ]; then if [ -f ${_ifd_destination} ]; then
printf "gbe, ifd, and me extracted to ${_me_destination%/*}\n" printf "gbe, ifd, and me extracted to %s\n" \
${_me_destination%/*}
else else
printf "WARNING: Intel firmware descriptor could not " printf "WARNING: Intel firmware descriptor could not "
printf "be extracted with modified me\n" printf "be extracted with modified me\n"
@ -111,11 +115,13 @@ extract_blobs()
extract_blob_intel_me() extract_blob_intel_me()
{ {
printf "extracting clean ime and modified ifd\n" printf "extracting clean ime and modified ifd\n"
./me_cleaner/me_cleaner.py -D ${_ifd_destination} \
-M ${_me_destination} ${vendor_rom} -t -r -S || \ ${mecleaner} -D ${_ifd_destination} \
./resources/blobs/me7_update_parser.py -M ${_me_destination} ${vendor_rom} -t -r -S \
-O ${_me_destination} ${vendor_rom} \ || ${me7updateparser} \
|| fail 'me_cleaner failed to extract blobs from rom' -O ${_me_destination} ${vendor_rom} \
|| fail \
"me_cleaner failed to extract blobs from rom"
} }
extract_blob_intel_gbe_nvm() extract_blob_intel_gbe_nvm()