summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-04-24 22:13:25 +0000
committerRichard Purdie <richard@openedhand.com>2008-04-24 22:13:25 +0000
commit56a4a6f5c8794e26aa8b781d3b5c2ed7931fcd96 (patch)
tree67c70002e24aea7a09dc78122723e98536bb04b6 /scripts
parent927ad4986670f4938049c97e1bbabd5714e410e7 (diff)
downloadpoky-56a4a6f5c8794e26aa8b781d3b5c2ed7931fcd96.tar.gz
scripts/poky-qemu-internal: Enable n800 networking
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4333 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/poky-qemu-internal9
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index d3a662e9e1..9b55e4762e 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -37,7 +37,8 @@ fi
37QEMUIFUP=`which poky-qemu-ifup` 37QEMUIFUP=`which poky-qemu-ifup`
38QEMUIFDOWN=`which poky-qemu-ifdown` 38QEMUIFDOWN=`which poky-qemu-ifdown`
39KERNEL_NETWORK_CMD="ip=192.168.7.2::192.168.7.1:255.255.255.0" 39KERNEL_NETWORK_CMD="ip=192.168.7.2::192.168.7.1:255.255.255.0"
40QEMU_NETWORK_CMD="-net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=$QEMUIFUP,downscript=$QEMUIFDOWN" 40QEMU_TAP_CMD="-net tap,vlan=0,ifname=tap0,script=$QEMUIFUP,downscript=$QEMUIFDOWN"
41QEMU_NETWORK_CMD="-net nic,vlan=0 $QEMU_TAP_CMD"
41KERNCMDLINE="mem=$QEMU_MEMORY" 42KERNCMDLINE="mem=$QEMU_MEMORY"
42 43
43SERIALOPTS="" 44SERIALOPTS=""
@@ -141,7 +142,8 @@ if [ "$MACHINE" = "nokia800" ]; then
141 poky-nokia800-flashutil $HDIMAGE $HDIMAGE.qemuflash 142 poky-nokia800-flashutil $HDIMAGE $HDIMAGE.qemuflash
142 fi 143 fi
143 KERNCMDLINE="root=/dev/mtdblock4 rootfstype=jffs2" 144 KERNCMDLINE="root=/dev/mtdblock4 rootfstype=jffs2"
144 QEMUOPTIONS="$QEMU_NETWORK_CMD -M n800 -mtdblock $HDIMAGE.qemuflash -serial vc -m 130 -serial vc -serial vc -serial vc" 145 QEMU_NETWORK_CMD="-net nic,model=usb,vlan=0 $QEMU_TAP_CMD"
146 QEMUOPTIONS="$QEMU_NETWORK_CMD -M n800 -mtdblock $HDIMAGE.qemuflash -serial vc -m 130 -serial vc -serial vc -serial vc -usb -usbdevice net:0"
145 fi 147 fi
146fi 148fi
147 149
@@ -167,7 +169,8 @@ if [ "$MACHINE" = "nokia800-maemo" ]; then
167 poky-nokia800-flashutil $HDIMAGE $HDIMAGE.qemuflash 169 poky-nokia800-flashutil $HDIMAGE $HDIMAGE.qemuflash
168 fi 170 fi
169 KERNCMDLINE="" 171 KERNCMDLINE=""
170 QEMUOPTIONS="$QEMU_NETWORK_CMD -M n800 -mtdblock $HDIMAGE.qemuflash -serial vc -m 130 -serial vc -serial vc -serial vc" 172 QEMU_NETWORK_CMD="-net nic,model=usb,vlan=0 $QEMU_TAP_CMD"
173 QEMUOPTIONS="$QEMU_NETWORK_CMD -M n800 -mtdblock $HDIMAGE.qemuflash -serial vc -m 130 -serial vc -serial vc -serial vc -usb -usbdevice net:0 -show-cursor"
171 fi 174 fi
172fi 175fi
173 176