diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-05-07 17:08:42 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-05-07 17:08:42 +0100 |
| commit | a94bd3c0939fac05a902af2cce2cf862ecdf9200 (patch) | |
| tree | fc00213d5b91192e33f2f3d5cb0d547481b050ef /include | |
| parent | e3098c61f43575650628fc4e6f7e1693c44ac337 (diff) | |
inject.sh: simplify extract_kbc1126ec()
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/inject.sh | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/include/inject.sh b/include/inject.sh index e64c304e..c0b4409f 100644 --- a/include/inject.sh +++ b/include/inject.sh @@ -150,7 +150,8 @@ extract_intel_me() set +u +e && fx_ find_me x_ find "$xbmkpwd/$appdir" -type f [ "$ME11bootguard" != "y" ] && x_ mv "$_metmp" "$_me" && return 0 - ( x_ cd src/deguard/ + ( + x_ cd src/deguard/ x_ ./finalimage.py --delta "data/delta/$ME11delta" --version \ "$ME11version" --pch "$ME11pch" --sku "$ME11sku" \ --fake-fpfs data/fpfs/zero --input "$_metmp" --output "$_me" @@ -181,15 +182,11 @@ extract_archive() extract_kbc1126ec() { - x_ e "$kbc1126_ec_dump" f ( x_ cd "$appdir/" - mv Rompaq/68*.BIN ec.bin || : - if [ ! -f "ec.bin" ]; then - unar -D ROM.CAB Rom.bin || unar -D Rom.CAB Rom.bin || \ - unar -D 68*.CAB Rom.bin || err "kbc1126 unar failed" - x_ mv Rom.bin ec.bin - fi + mv Rompaq/68*.BIN ec.bin || unar -D ROM.CAB Rom.bin || unar -D \ + Rom.CAB Rom.bin || unar -D 68*.CAB Rom.bin || err "!kbc1126 unar" + [ -f "ec.bin" ] || x_ mv Rom.bin ec.bin x_ e ec.bin f && x_ "$kbc1126_ec_dump" ec.bin ) || err "$board: can't extract kbc1126 ec firmware - $dontflash" |