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

roms: simplify main() again 

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit6-merge1
Leah Rowe 2024-06-14 14:19:44 +01:00
parent eb9a688ee3
commit f626b25db3
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
script/roms
View File

@ -29,18 +29,16 @@ eval "$(setvars "" $v boards opt_k targets serprog_boards_dir)"
main() main()
{ {
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
[ "$1" = "list" ] && eval "x_ ls -1 config/coreboot; return 0"
[ "$1" = "serprog" ] && eval "shift 1; mkserprog $@; return 0"
if [ "$1" = "-k" ]; then if [ "$1" = "-k" ]; then
[ $# -lt 2 ] && $err "$1: option not specified" [ $# -lt 2 ] && $err "$1: option not specified"
opt_k="$2" opt_k="$2"; continue
elif [ "$1" = "serprog" ]; then
shift 1; handle_serprog $@; return 0
elif [ "$1" = "list" ]; then
x_ ls -1 config/coreboot; return 0
else
[ "$1" = "all" ] && shift && continue
boards="$1 $boards"
shift && continue
fi fi
[ "$1" = "all" ] && shift && continue
boards="$1 $boards"; shift 1
done done
[ -n "$boards" ] || boards="$(ls -1 config/coreboot)" || \ [ -n "$boards" ] || boards="$(ls -1 config/coreboot)" || \
@ -50,18 +48,13 @@ main()
handle_coreboot_target "$x"; continue handle_coreboot_target "$x"; continue
done done
x="directories"
[ "$xbmk_release" = "y" ] && x="archives (remember the inject command)"
[ -z "$targets" ] && $err "No ROM images were compiled" [ -z "$targets" ] && $err "No ROM images were compiled"
printf "\nROM images available in these %s:\n" "$x" eval "printf \"\\n\\n$targets\\n\\n\"n"
eval "printf \"$targets\""
printf "^^ ROM images available in these %s.\n\n" "$x"
printf "DO NOT flash images from elf/ - please use bin/ instead.\n" printf "DO NOT flash images from elf/ - please use bin/ instead.\n"
} }
handle_serprog() mkserprog()
{ {
[ -z "${1+x}" ] && badcmd [ -z "${1+x}" ] && badcmd
[ "$1" != "rp2040" ] && [ "$1" != "stm32" ] && $err "bad command" [ "$1" != "rp2040" ] && [ "$1" != "stm32" ] && $err "bad command"
@ -131,9 +124,9 @@ handle_coreboot_target()
build_target_mainboard build_target_mainboard
[ -d "bin/$board" ] || return 0 [ -d "bin/$board" ] || return 0
[ "$xbmk_release" = "y" ] || targets="* bin/$board\n$targets" [ "$xbmk_release" = "y" ] || targets="* Check: bin/$board\n$targets"
[ "$xbmk_release" = "y" ] && mkrom_tarball "bin/$board" && \ [ "$xbmk_release" = "y" ] && mkrom_tarball "bin/$board" && \
targets="* bin/${relname}_$board.tar.xz\n$targets"; return 0 targets="* Check: bin/${relname}_$board.tar.xz\n$targets"; return 0
} }
configure_target() configure_target()