diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-04-23 09:03:20 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-04-23 09:03:20 +0200 |
| commit | 5296c5ff98c1a0d971a2dc7884822606b4edcda6 (patch) | |
| tree | ec5c9f0870160f1d0c4e5dc76281b836eaa6bd60 /configs | |
| parent | 1d27d40c3d716003408c62ff9bb7153d12be19fd (diff) | |
| download | DistroKit-5296c5ff98c1a0d971a2dc7884822606b4edcda6.tar.gz DistroKit-5296c5ff98c1a0d971a2dc7884822606b4edcda6.tar.xz | |
586-qemu/run: cleanup & update
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'configs')
| -rwxr-xr-x | configs/i586-qemu-2011.01.0/run | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/configs/i586-qemu-2011.01.0/run b/configs/i586-qemu-2011.01.0/run index 6ef0ef8..bfa5d19 100755 --- a/configs/i586-qemu-2011.01.0/run +++ b/configs/i586-qemu-2011.01.0/run @@ -1,17 +1,21 @@ #!/bin/bash -SCRIPTDIR=$(cd $(dirname $0); pwd) +platformconfig=selected_platformconfig +# fallback to platformconfig in the same dir as this script +if [ ! -e "$platformconfig" ]; then + platformconfig=$(dirname $0)/platformconfig +fi # # we need information about the platform # -if [ ! -e "selected_platformconfig" ]; then +if [ ! -e "$platformconfig" ]; then echo "error: selected_platformconfig does not exist" echo " please use 'ptxdist platform ...' or 'ptxdist --platformconfig=...'" exit 1 fi -source selected_platformconfig +source $platformconfig if [ -n "${PTXCONF_PLATFORM}" ]; then PTXDIST_PLATFORMDIR="./platform-${PTXCONF_PLATFORM}" @@ -30,13 +34,7 @@ if [ ! -e "${PTXDIST_PLATFORMDIR}/images/hd.img" ]; then fi # the emulator to run -if test "${PTXCONF_ARCH_STRING}" = "i386"; then - ARCH_STRING="x86_64" -else - ARCH_STRING="${PTXCONF_ARCH_STRING}" -fi - -QEMU_EXEC=qemu-system-${ARCH_STRING} +QEMU_EXEC=qemu-system-${PTXCONF_ARCH_STRING} # disable this, if you want to have some graphics output QEMU_NOGRAPHIC=--nographic @@ -63,4 +61,4 @@ ${QEMU_EXEC} ${QEMU_NOGRAPHIC} \ -redir tcp:${TELNET_EXTERNAL_PORT}:${PLATFORM_IP}:${TELNET_INTERNAL_PORT} \ -kernel ${PTXDIST_PLATFORMDIR}/images/linuximage \ -hda ${PTXDIST_PLATFORMDIR}/images/hd.img \ - -append "root=/dev/sda1 rw console=ttyS0,115200" + -append "root=/dev/sda1 rw console=ttyS0,115200 ro" |