summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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/runqemu-internal2
3 files changed, 3 insertions, 3 deletions
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 145e54802e..9a543ab8b9 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 ?= "f1cc220f4ddf434bf254707c83a45794a63f117f" 17SRCREV_machine ?= "f1cc220f4ddf434bf254707c83a45794a63f117f"
18SRCREV_machine_qemuppc ?= "8bd5b80cb3243dadc9d6c5c09482c49994dff1a8" 18SRCREV_machine_qemuppc ?= "8bd5b80cb3243dadc9d6c5c09482c49994dff1a8"
19SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4" 19SRCREV_meta ?= "665fea1c249b4f335cb1c9a46a9f2c138d611f1a"
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 0b79beec23..10859e7066 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemuppc ?= "53e71af30e30162e17e32b2f57e4481f5bc0573e"
19SRCREV_machine_qemux86 ?= "9e73573b6b227ab2c62e66e63470866d136f8d76" 19SRCREV_machine_qemux86 ?= "9e73573b6b227ab2c62e66e63470866d136f8d76"
20SRCREV_machine_qemux86-64 ?= "3551fd0412965b1f6b0b2f6ba35f7fecdaddb58a" 20SRCREV_machine_qemux86-64 ?= "3551fd0412965b1f6b0b2f6ba35f7fecdaddb58a"
21SRCREV_machine ?= "6f5b11830deba4a6262c8c4abf67e608924f649e" 21SRCREV_machine ?= "6f5b11830deba4a6262c8c4abf67e608924f649e"
22SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4" 22SRCREV_meta ?= "665fea1c249b4f335cb1c9a46a9f2c138d611f1a"
23 23
24PR = "r2" 24PR = "r2"
25PV = "${LINUX_VERSION}+git${SRCPV}" 25PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 11dda5582e..21fbce3ee9 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -394,7 +394,7 @@ if [ "$MACHINE" = "qemuppc" ]; then
394 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" 394 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
395 QEMU_NETWORK_CMD="-net nic,model=pcnet $QEMU_TAP_CMD" 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 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 397 KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
398 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -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