diff options
Diffstat (limited to 'scripts/runqemu-internal')
| -rwxr-xr-x | scripts/runqemu-internal | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index d021442..2decec5 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -353,7 +353,8 @@ if [ "$FSTYPE" = "nfs" ]; then NFSRUNNING="true" fi -if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" \ +if [ "$MACHINE" = "qemuarm" \ + -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" \ -o "$MACHINE" = "vexpressa9" ]; then QEMU=qemu-system-arm if [ "$MACHINE" = "vexpressa9" ]; then @@ -367,12 +368,16 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarm if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then if [ "$MACHINE" = "vexpressa9" ]; then KERN_root="root=/dev/mmcblk0 vmalloc=384MB" - QEMU_root="-sd $ROOTFS" + QEMU_root="-sd $ROOTFS -dtb $DTB" else KERN_root="root=/dev/sda" QEMU_root="-hda $ROOTFS" fi - KERNCMDLINE="${KERN_root} rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off" + _TTY="" + if [ "x${NO_GRAPHIC}" != "xyes" ]; then + _TTY="console=tty" + fi + KERNCMDLINE="${KERN_root} rw console=ttyAMA0,115200 $_TTY $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off" QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} ${QEMU_root} -no-reboot $QEMU_UI_OPTIONS" elif [ "$FSTYPE" = "nfs" ]; then if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then @@ -574,10 +579,6 @@ if [ "$MACHINE" = "qemush4" ]; then fi fi -if [ "${FSTYPE:0:3}" = "ext" ]; then - KERNCMDLINE="$KERNCMDLINE rootfstype=$FSTYPE" -fi - if [ "$MACHINE" = "akita" ]; then QEMU=qemu-system-arm if [ "$FSTYPE" = "jffs2" ]; then |