diff options
| -rw-r--r-- | include/mrc.sh | 4 | ||||
| -rw-r--r-- | include/rom.sh | 2 | ||||
| -rw-r--r-- | include/tree.sh | 2 | ||||
| -rw-r--r-- | include/vendor.sh | 20 |
4 files changed, 15 insertions, 13 deletions
diff --git a/include/mrc.sh b/include/mrc.sh index 9d4566be..f1e31fa7 100644 --- a/include/mrc.sh +++ b/include/mrc.sh @@ -68,8 +68,8 @@ extract_partition() SIZE=$(( $( echo $ROOTP | cut -f4 -d\ | tr -d "B" ) )) - x_ dd if="${1%.zip}" of="root-a.ext2" bs=1024 skip=$(( $START / 1024 )) \ - count=$(( $SIZE / 1024 )) + x_ dd if="${1%.zip}" of="root-a.ext2" bs=1024 \ + skip=$(( $START / 1024 )) count=$(( $SIZE / 1024 )) printf "cd /usr/sbin\ndump chromeos-firmwareupdate %s\nquit" \ "$SHELLBALL" | debugfs "root-a.ext2" || \ diff --git a/include/rom.sh b/include/rom.sh index 8cb0f318..6f0e3529 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -207,7 +207,7 @@ mkcorebootbin_real() fi if [ "$payload_seabios" = "y" ] && [ "$payload_uboot" = "arm64" ]; then $if_not_dry_build \ - err "$target: U-Boot arm and SeaBIOS/GRUB both enabled" \ + err "$target: U-Boot arm / SeaBIOS/GRUB both enabled" \ "mkcorebootbin_real" "$@" fi diff --git a/include/tree.sh b/include/tree.sh index cb406233..2020c450 100644 --- a/include/tree.sh +++ b/include/tree.sh @@ -52,7 +52,7 @@ forcepull="" trees() { - flags="f:b:m:u:c:x:s:l:n:d:" + flags="f:F:b:m:u:c:x:s:l:n:d:" while getopts $flags option do diff --git a/include/vendor.sh b/include/vendor.sh index 7fb4d9ea..761f9250 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -24,16 +24,16 @@ appdir="$vendir/app" vfix="DO_NOT_FLASH_YET._FIRST,_INJECT_FILES_VIA_INSTRUCTIONS_ON_LIBREBOOT.ORG_" # lbmk-specific extension to the "checkvars" variable (not suitable for cbmk) -checkvarschk="CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \ - CONFIG_LENOVO_TBFW_BIN CONFIG_VGA_BIOS_FILE CONFIG_FSP_M_FILE \ - CONFIG_FSP_S_FILE CONFIG_KBC1126_FW1 CONFIG_KBC1126_FW2" +checkvarschk="CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_HAVE_MRC \ + CONFIG_HAVE_ME_BIN CONFIG_LENOVO_TBFW_BIN CONFIG_VGA_BIOS_FILE \ + CONFIG_FSP_M_FILE CONFIG_FSP_S_FILE CONFIG_KBC1126_FW1 CONFIG_KBC1126_FW2" # lbmk-specific extensions to the "checkvars" variable (not suitable for cbmk) -checkvarsxbmk="CONFIG_ME_BIN_PATH CONFIG_SMSC_SCH5545_EC_FW_FILE CONFIG_FSP_FULL_FD \ - CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2_OFFSET CONFIG_FSP_USE_REPO \ - CONFIG_VGA_BIOS_ID CONFIG_BOARD_DELL_E6400 CONFIG_FSP_S_CBFS \ - CONFIG_HAVE_REFCODE_BLOB CONFIG_REFCODE_BLOB_FILE CONFIG_FSP_FD_PATH \ - CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE CONFIG_FSP_M_CBFS" +checkvarsxbmk="CONFIG_ME_BIN_PATH CONFIG_SMSC_SCH5545_EC_FW_FILE \ + CONFIG_FSP_FULL_FD CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2_OFFSET \ + CONFIG_FSP_USE_REPO CONFIG_VGA_BIOS_ID CONFIG_BOARD_DELL_E6400 \ + CONFIG_FSP_S_CBFS CONFIG_HAVE_REFCODE_BLOB CONFIG_REFCODE_BLOB_FILE \ + CONFIG_FSP_FD_PATH CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE CONFIG_FSP_M_CBFS" # lbmk-specific extensions; general variables _dest="" @@ -702,7 +702,9 @@ vfile() fi elif [ "$nuke" = "nuke" ]; then x_ "$cbfstool" "$rom" remove -n "$cbfsname" - elif [ "$blobtype" = "stage" ]; then # the only stage we handle is refcode + elif [ "$blobtype" = "stage" ]; then + # the only stage we handle is refcode + x_ rm -f "$xbtmp/refcode" x_ "$rmodtool" -i "$_dest" -o "$xbtmp/refcode" x_ "$cbfstool" "$rom" add-stage -f "$xbtmp/refcode" \ |