summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/poky-qemu-internal10
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index c5f38e74d3..aede0d6983 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -56,6 +56,8 @@ fi
56 56
57case "$MACHINE" in 57case "$MACHINE" in
58 "qemuarm") ;; 58 "qemuarm") ;;
59 "qemuarmv6") ;;
60 "qemuarmv7") ;;
59 "qemux86") ;; 61 "qemux86") ;;
60 "akita") ;; 62 "akita") ;;
61 "spitz") ;; 63 "spitz") ;;
@@ -84,7 +86,7 @@ if [ -e /proc/sys/vm/mmap_min_addr ]; then
84 fi 86 fi
85fi 87fi
86 88
87if [ "$MACHINE" = "qemuarm" ]; then 89if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then
88 QEMU=qemu-system-arm 90 QEMU=qemu-system-arm
89 if [ "$TYPE" = "ext2" ]; then 91 if [ "$TYPE" = "ext2" ]; then
90 KERNCMDLINE="root=/dev/sda console=ttyAMA0 console=tty0 mem=$QEMU_MEMORY" 92 KERNCMDLINE="root=/dev/sda console=ttyAMA0 console=tty0 mem=$QEMU_MEMORY"
@@ -101,6 +103,12 @@ if [ "$MACHINE" = "qemuarm" ]; then
101 KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 103 KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
102 QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -no-reboot" 104 QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -no-reboot"
103 fi 105 fi
106 if [ "$MACHINE" = "qemuarmv6" ]; then
107 QEMUOPTIONS="$QEMUOPTIONS -cpu arm1136"
108 fi
109 if [ "$MACHINE" = "qemuarmv7" ]; then
110 QEMUOPTIONS="$QEMUOPTIONS -cpu cortex-a8"
111 fi
104fi 112fi
105 113
106if [ "$MACHINE" = "qemux86" ]; then 114if [ "$MACHINE" = "qemux86" ]; then