Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

boot-utils: Only allow '--use-cbl-qemu' with s390 #36

Merged
merged 1 commit into from
Feb 22, 2021
Merged

boot-utils: Only allow '--use-cbl-qemu' with s390 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ Optional parameters:
not be long enough for a kernel to boot so this allows that timeout
to be configured. Takes the value passed to timeout (e.g. 30s or 4m).

--use-cbl-qemu (only relevant with '-a riscv' or '-a s390'):
Certain distribution versions of qemu-system-riscv have an issue
with shutting down. This was fixed in QEMU upstream so an upstream
binary is provided in case you are affected by it.

--use-cbl-qemu (only relevant with '-a s390'):
s390 only boots with patches that are available in QEMU master. It
could take a while for those patches to make it to various
distribution versions of qemu-system-s390.
Expand Down
2 changes: 1 addition & 1 deletion boot-qemu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ function setup_qemu_args() {
esac
;;
esac
if ${USE_CBL_QEMU:-false} && [[ ${ARCH} = "riscv" || ${ARCH} = "s390" ]]; then
if ${USE_CBL_QEMU:-false} && [[ ${ARCH} = "s390" ]]; then
QEMU_BINARIES=${BASE}/qemu-binaries

green "Downloading or updating qemu-binaries..."
Expand Down