mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-03-25 13:29:03 +02:00
xbmk: minor code cleanup (79 character rule)
recent re-factoring lead to certain code lines that exceeded 79 characters in length. we like to avoid this, whenever possible. Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
@@ -68,8 +68,8 @@ extract_partition()
|
|||||||
|
|
||||||
SIZE=$(( $( echo $ROOTP | cut -f4 -d\ | tr -d "B" ) ))
|
SIZE=$(( $( echo $ROOTP | cut -f4 -d\ | tr -d "B" ) ))
|
||||||
|
|
||||||
x_ dd if="${1%.zip}" of="root-a.ext2" bs=1024 skip=$(( $START / 1024 )) \
|
x_ dd if="${1%.zip}" of="root-a.ext2" bs=1024 \
|
||||||
count=$(( $SIZE / 1024 ))
|
skip=$(( $START / 1024 )) count=$(( $SIZE / 1024 ))
|
||||||
|
|
||||||
printf "cd /usr/sbin\ndump chromeos-firmwareupdate %s\nquit" \
|
printf "cd /usr/sbin\ndump chromeos-firmwareupdate %s\nquit" \
|
||||||
"$SHELLBALL" | debugfs "root-a.ext2" || \
|
"$SHELLBALL" | debugfs "root-a.ext2" || \
|
||||||
|
|||||||
@@ -207,7 +207,7 @@ mkcorebootbin_real()
|
|||||||
fi
|
fi
|
||||||
if [ "$payload_seabios" = "y" ] && [ "$payload_uboot" = "arm64" ]; then
|
if [ "$payload_seabios" = "y" ] && [ "$payload_uboot" = "arm64" ]; then
|
||||||
$if_not_dry_build \
|
$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" "$@"
|
"mkcorebootbin_real" "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -24,16 +24,16 @@ appdir="$vendir/app"
|
|||||||
vfix="DO_NOT_FLASH_YET._FIRST,_INJECT_FILES_VIA_INSTRUCTIONS_ON_LIBREBOOT.ORG_"
|
vfix="DO_NOT_FLASH_YET._FIRST,_INJECT_FILES_VIA_INSTRUCTIONS_ON_LIBREBOOT.ORG_"
|
||||||
|
|
||||||
# lbmk-specific extension to the "checkvars" variable (not suitable for cbmk)
|
# 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 \
|
checkvarschk="CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_HAVE_MRC \
|
||||||
CONFIG_LENOVO_TBFW_BIN CONFIG_VGA_BIOS_FILE CONFIG_FSP_M_FILE \
|
CONFIG_HAVE_ME_BIN CONFIG_LENOVO_TBFW_BIN CONFIG_VGA_BIOS_FILE \
|
||||||
CONFIG_FSP_S_FILE CONFIG_KBC1126_FW1 CONFIG_KBC1126_FW2"
|
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)
|
# 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 \
|
checkvarsxbmk="CONFIG_ME_BIN_PATH CONFIG_SMSC_SCH5545_EC_FW_FILE \
|
||||||
CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2_OFFSET CONFIG_FSP_USE_REPO \
|
CONFIG_FSP_FULL_FD CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2_OFFSET \
|
||||||
CONFIG_VGA_BIOS_ID CONFIG_BOARD_DELL_E6400 CONFIG_FSP_S_CBFS \
|
CONFIG_FSP_USE_REPO CONFIG_VGA_BIOS_ID CONFIG_BOARD_DELL_E6400 \
|
||||||
CONFIG_HAVE_REFCODE_BLOB CONFIG_REFCODE_BLOB_FILE CONFIG_FSP_FD_PATH \
|
CONFIG_FSP_S_CBFS CONFIG_HAVE_REFCODE_BLOB CONFIG_REFCODE_BLOB_FILE \
|
||||||
CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE CONFIG_FSP_M_CBFS"
|
CONFIG_FSP_FD_PATH CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE CONFIG_FSP_M_CBFS"
|
||||||
|
|
||||||
# lbmk-specific extensions; general variables
|
# lbmk-specific extensions; general variables
|
||||||
_dest=""
|
_dest=""
|
||||||
@@ -702,7 +702,9 @@ vfile()
|
|||||||
fi
|
fi
|
||||||
elif [ "$nuke" = "nuke" ]; then
|
elif [ "$nuke" = "nuke" ]; then
|
||||||
x_ "$cbfstool" "$rom" remove -n "$cbfsname"
|
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_ rm -f "$xbtmp/refcode"
|
||||||
x_ "$rmodtool" -i "$_dest" -o "$xbtmp/refcode"
|
x_ "$rmodtool" -i "$_dest" -o "$xbtmp/refcode"
|
||||||
x_ "$cbfstool" "$rom" add-stage -f "$xbtmp/refcode" \
|
x_ "$cbfstool" "$rom" add-stage -f "$xbtmp/refcode" \
|
||||||
|
|||||||
Reference in New Issue
Block a user