From 68acafd7dc18f23707c95c90e871395ded81f84b Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Thu, 20 Mar 2014 12:35:33 -0700 Subject: runqemu: Add option for custom BIOS directory Add support to specify a directory for custom BIOS, VGA BIOS and keymaps as supported by qemu (-L option). Even though this can be done through qemuparams, having this option provides better user experience by not having to specify a long and cluttered path along with other qemuparams that the user might want to specify. This new options assumes first that the path provided is relative to OECORE_NATIVE_SYSROOT and will check whether it exists before proceeding. If not, it will treat the provided path as absolute. This provides the user flexibility to use BIOS binaries generated inside or outside the OE build environment. (From OE-Core rev: d302f5683dd736ac4cd4b601a046d22000d41e68) Signed-off-by: Ricardo Neri Signed-off-by: Richard Purdie --- scripts/runqemu | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'scripts') diff --git a/scripts/runqemu b/scripts/runqemu index 573def151f..e270274a97 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -150,6 +150,9 @@ while true; do SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0" SERIALSTDIO="1" ;; + "biosdir="*) + CUSTOMBIOSDIR="${arg##biosdir=}" + ;; "qemuparams="*) SCRIPT_QEMU_EXTRA_OPT="${arg##qemuparams=}" @@ -484,5 +487,21 @@ if [ ! -f "$INTERNAL_SCRIPT" -o ! -r "$INTERNAL_SCRIPT" ]; then INTERNAL_SCRIPT=`which runqemu-internal` fi +# Specify directory for BIOS, VGA BIOS and keymaps +if [ ! -z "$CUSTOMBIOSDIR" ]; then + if [ -d "$OECORE_NATIVE_SYSROOT/$CUSTOMBIOSDIR" ]; then + echo "Assuming biosdir is $OECORE_NATIVE_SYSROOT/$CUSTOMBIOSDIR" + SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -L $OECORE_NATIVE_SYSROOT/$CUSTOMBIOSDIR" + else + if [ ! -d "$CUSTOMBIOSDIR" ]; then + echo "Custom BIOS directory not found. Tried: $CUSTOMBIOSDIR" + echo "and $OECORE_NATIVE_SYSROOT/$CUSTOMBIOSDIR" + exit 1; + fi + echo "Assuming biosdir is $CUSTOMBIOSDIR" + SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -L $CUSTOMBIOSDIR" + fi +fi + . $INTERNAL_SCRIPT exit $? -- cgit v1.2.3-54-g00ecf