summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/machine/qemuppc.conf2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.0.bb2
-rwxr-xr-xscripts/runqemu7
-rwxr-xr-xscripts/runqemu-internal16
5 files changed, 12 insertions, 17 deletions
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf
index bcc408f4de..48eecb73b6 100644
--- a/meta/conf/machine/qemuppc.conf
+++ b/meta/conf/machine/qemuppc.conf
@@ -5,7 +5,7 @@
5require conf/machine/include/qemu.inc 5require conf/machine/include/qemu.inc
6require conf/machine/include/tune-ppc603e.inc 6require conf/machine/include/tune-ppc603e.inc
7 7
8KERNEL_IMAGETYPE = "zImage" 8KERNEL_IMAGETYPE = "vmlinux"
9 9
10SERIAL_CONSOLE = "115200 ttyS0" 10SERIAL_CONSOLE = "115200 ttyS0"
11 11
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index c8983c405c..c6bf4465b2 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
16 16
17SRCREV_machine ?= "bcf4107c7f22d10952618a2ad146e6149d240cd2" 17SRCREV_machine ?= "bcf4107c7f22d10952618a2ad146e6149d240cd2"
18SRCREV_machine_qemuppc ?= "1e5511ea2cb5f150ffce86071035a81c0499494b" 18SRCREV_machine_qemuppc ?= "1e5511ea2cb5f150ffce86071035a81c0499494b"
19SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c" 19SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"
20 20
21PR = "r1" 21PR = "r1"
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index 921c258c63..e624b48bc2 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "10e808d1c304b14cf42903fd637f239766b78476"
18SRCREV_machine_qemux86 ?= "e04f9f8e564c60b1ce907d64074c18730f8dab4e" 18SRCREV_machine_qemux86 ?= "e04f9f8e564c60b1ce907d64074c18730f8dab4e"
19SRCREV_machine_qemux86-64 ?= "53c2fa060d34e9a0b59e19398aeebbe73f24d89b" 19SRCREV_machine_qemux86-64 ?= "53c2fa060d34e9a0b59e19398aeebbe73f24d89b"
20SRCREV_machine ?= "fe80c1e343bf8f038328a612cef7f821d7ec8dbf" 20SRCREV_machine ?= "fe80c1e343bf8f038328a612cef7f821d7ec8dbf"
21SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c" 21SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"
22 22
23PR = "r2" 23PR = "r2"
24PV = "${LINUX_VERSION}+git${SRCPV}" 24PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/scripts/runqemu b/scripts/runqemu
index bed6a2948e..ac5facfa21 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -262,7 +262,7 @@ QEMUARM_DEFAULT_FSTYPE=ext3
262QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin 262QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin
263QEMUMIPS_DEFAULT_FSTYPE=ext3 263QEMUMIPS_DEFAULT_FSTYPE=ext3
264 264
265QEMUPPC_DEFAULT_KERNEL=zImage-qemuppc.bin 265QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin
266QEMUPPC_DEFAULT_FSTYPE=ext3 266QEMUPPC_DEFAULT_FSTYPE=ext3
267 267
268AKITA_DEFAULT_KERNEL=zImage-akita.bin 268AKITA_DEFAULT_KERNEL=zImage-akita.bin
@@ -365,11 +365,6 @@ if [ -z "$FSTYPE" ]; then
365 fi 365 fi
366fi 366fi
367 367
368if [ "$FSTYPE" = "nfs" -a "$MACHINE" = "qemuppc" ]; then
369 echo "Error: usermode NFS boot is not available for qemuppc."
370 exit 1
371fi
372
373# FSTYPE is now set for all cases 368# FSTYPE is now set for all cases
374 369
375# Handle cases where a ROOTFS type is given instead of a filename, e.g. 370# Handle cases where a ROOTFS type is given instead of a filename, e.g.
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 2968ed939c..c55619baa5 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -389,13 +389,13 @@ fi
389 389
390if [ "$MACHINE" = "qemuppc" ]; then 390if [ "$MACHINE" = "qemuppc" ]; then
391 QEMU=qemu-system-ppc 391 QEMU=qemu-system-ppc
392 MACHINE_SUBTYPE=prep 392 MACHINE_SUBTYPE=mac99
393 CPU_SUBTYPE=603e 393 CPU_SUBTYPE=G4
394 BIOS=powerpc_rom.bin 394 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
395 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -nographic" 395 QEMU_NETWORK_CMD="-net nic,model=pcnet $QEMU_TAP_CMD"
396 if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then 396 if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
397 KERNCMDLINE="root=/dev/hda rw console=ttyS0 3 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 397 KERNCMDLINE="root=/dev/hda rw console=ttyS0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
398 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" 398 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
399 fi 399 fi
400 if [ "$FSTYPE" = "nfs" ]; then 400 if [ "$FSTYPE" = "nfs" ]; then
401 if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then 401 if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then
@@ -403,8 +403,8 @@ if [ "$MACHINE" = "qemuppc" ]; then
403 cleanup 403 cleanup
404 return 404 return
405 fi 405 fi
406 KERNCMDLINE="root=/dev/nfs console=ttyS0 3 nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 406 KERNCMDLINE="root=/dev/nfs console=ttyS0 nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
407 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -no-reboot $QEMU_UI_OPTIONS" 407 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -no-reboot $QEMU_UI_OPTIONS"
408 fi 408 fi
409fi 409fi
410 410