diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-05-18 19:20:42 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-05-18 19:20:42 +0100 |
| commit | 34dac6da99bd79ec75e63997aaebbf5de2debbe8 (patch) | |
| tree | 6d035b3598f5be2271d1ee64804094a690323d26 /include/mrc.sh | |
| parent | b8d7959ef62b51122d467defa4f61b514a8317db (diff) | |
| parent | 2702a43a86d51aba2123d620ce2f383d8fc41311 (diff) | |
Merge branch 'master' into 25.06_branch25.06_branch
Diffstat (limited to 'include/mrc.sh')
| -rw-r--r-- | include/mrc.sh | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/include/mrc.sh b/include/mrc.sh index a132f574..775831f8 100644 --- a/include/mrc.sh +++ b/include/mrc.sh @@ -6,16 +6,9 @@ eval "`setvars "" MRC_url MRC_url_bkup MRC_hash MRC_board SHELLBALL`" -extract_mrc() -{ - extract_shellball - x_ "$cbfstool" "$appdir/"bios.bin extract -n mrc.bin \ - -f "$_pre_dest" -r RO_SECTION -} - extract_refcode() { - extract_shellball + extract_mrc # cbfstool after coreboot 4.13 changed the stage file attribute scheme, # and refcode is extracted from an image using the old scheme. we use @@ -33,7 +26,7 @@ extract_refcode() x_ mv "$appdir/ref" "$_pre_dest" } -extract_shellball() +extract_mrc() { chkvars "MRC_board" "CONFIG_MRC_FILE" SHELLBALL="chromeos-firmwareupdate-$MRC_board" @@ -42,7 +35,10 @@ extract_shellball() x_ cd "$appdir" extract_partition "${MRC_url##*/}" extract_archive "$SHELLBALL" . - ) || err "mrc download/extract failure"; : + ) || err "mrc download/extract failure" + + x_ "$cbfstool" "$appdir/"bios.bin extract -n mrc.bin \ + -f "${_pre_dest%/*}/mrc.bin" -r RO_SECTION } extract_partition() |