diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-04-25 15:47:51 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-21 09:59:03 +0100 |
commit | f13ef77b5d462fe27c5b0151ff9c4b346f595d1f (patch) | |
tree | 832c36f464829a90babd8abe9fe70b3757d6a96d /scripts/runqemu | |
parent | 4cbc27c3e3d0ecc14dbc8560f7a8eb23d2e6557d (diff) | |
download | poky-f13ef77b5d462fe27c5b0151ff9c4b346f595d1f.tar.gz |
runqemu: Add qemush4 and qemumips64 knowledge
New machines need to be added and they also
have different kernel commandlines
(From OE-Core rev: 3a5432aec0faea49d2c04984cd169ceb35bba89f)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-x | scripts/runqemu | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index fc7363fdd8..1e803edd1b 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -94,7 +94,7 @@ KVM_ENABLED="no" | |||
94 | while true; do | 94 | while true; do |
95 | arg=${1} | 95 | arg=${1} |
96 | case "$arg" in | 96 | case "$arg" in |
97 | "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemuppc") | 97 | "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumips64" | "qemush4" | "qemuppc") |
98 | [ -z "$MACHINE" ] && MACHINE=$arg || \ | 98 | [ -z "$MACHINE" ] && MACHINE=$arg || \ |
99 | error "conflicting MACHINE types [$MACHINE] and [$arg]" | 99 | error "conflicting MACHINE types [$MACHINE] and [$arg]" |
100 | ;; | 100 | ;; |
@@ -223,7 +223,7 @@ if [ "$FSTYPE" = "nfs" -a -z "$ROOTFS" ]; then | |||
223 | fi | 223 | fi |
224 | 224 | ||
225 | if [ -z "$MACHINE" ]; then | 225 | if [ -z "$MACHINE" ]; then |
226 | MACHINE=`basename $KERNEL | sed 's/.*-\(qemux86-64\|qemux86\|qemuarm\|qemumips\|qemuppc\).*/\1/'` | 226 | MACHINE=`basename $KERNEL | sed 's/.*-\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/'` |
227 | if [ -z "$MACHINE" ]; then | 227 | if [ -z "$MACHINE" ]; then |
228 | error "Unable to set MACHINE from kernel filename [$KERNEL]" | 228 | error "Unable to set MACHINE from kernel filename [$KERNEL]" |
229 | fi | 229 | fi |
@@ -245,6 +245,12 @@ QEMUARM_DEFAULT_FSTYPE=ext3 | |||
245 | QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin | 245 | QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin |
246 | QEMUMIPS_DEFAULT_FSTYPE=ext3 | 246 | QEMUMIPS_DEFAULT_FSTYPE=ext3 |
247 | 247 | ||
248 | QEMUMIPS64_DEFAULT_KERNEL=vmlinux-qemumips64.bin | ||
249 | QEMUMIPS64_DEFAULT_FSTYPE=ext3 | ||
250 | |||
251 | QEMUSH4_DEFAULT_KERNEL=vmlinux-qemumips.bin | ||
252 | QEMUSH4_DEFAULT_FSTYPE=ext3 | ||
253 | |||
248 | QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin | 254 | QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin |
249 | QEMUPPC_DEFAULT_FSTYPE=ext3 | 255 | QEMUPPC_DEFAULT_FSTYPE=ext3 |
250 | 256 | ||