diff options
| author | Liming Wang <liming.wang@windriver.com> | 2012-01-04 18:29:17 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-17 14:53:17 +0000 |
| commit | 523f6b69c61af52b699bd27da460c1e917e7734c (patch) | |
| tree | b447461b593448d64a70a66f79678e03eff7d302 /scripts/runqemu-internal | |
| parent | 573daf67349d12576fabbdeee403786fc7ef479b (diff) | |
| download | poky-523f6b69c61af52b699bd27da460c1e917e7734c.tar.gz | |
qemuppc: replace emulation of qemuppc from prep to mac99
With this new emulation, existing qemuppc functionality is maintained
and other functionality such as framebuffer + sato and NFS boot are
added.
(From OE-Core rev: 52ea026df141ea23bbab38ad3a9733c15097eaa4)
Signed-off-by: Liming Wang <liming.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu-internal')
| -rwxr-xr-x | scripts/runqemu-internal | 16 |
1 files changed, 8 insertions, 8 deletions
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 | ||
| 390 | if [ "$MACHINE" = "qemuppc" ]; then | 390 | if [ "$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 |
| 409 | fi | 409 | fi |
| 410 | 410 | ||