summaryrefslogtreecommitdiffstats
path: root/scripts/poky-qemu-internal
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-10-01 15:09:47 +0100
committerJoshua Lock <josh@linux.intel.com>2010-10-01 16:47:38 +0100
commitb9369741db688d117c94d2b3c4827a317756dc0c (patch)
tree059eb3d4bea3028a43808c4836db65b639d3570f /scripts/poky-qemu-internal
parent8fdc5ff4c181edbae9503034400a492caecbcb98 (diff)
downloadpoky-b9369741db688d117c94d2b3c4827a317756dc0c.tar.gz
poky-qemu-internal: only check mmap_min_addr when running arm images
No need to force users to poke /proc/sys when they don't need to. Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'scripts/poky-qemu-internal')
-rwxr-xr-xscripts/poky-qemu-internal12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index cb5d28b904..f13b95def2 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -150,14 +150,14 @@ if [ ! -f "$ZIMAGE" ]; then
150 return 150 return
151fi 151fi
152 152
153if [ -e /proc/sys/vm/mmap_min_addr ]; then 153if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then
154 if [ `cat /proc/sys/vm/mmap_min_addr` != "0" ]; then 154 if [ -e /proc/sys/vm/mmap_min_addr ]; then
155 echo "Error, please set /proc/sys/vm/mmap_min_addr to 0 since otherwise it can cause problems with QEMU" 155 if [ `cat /proc/sys/vm/mmap_min_addr` != "0" ]; then
156 return 156 echo "Error, please set /proc/sys/vm/mmap_min_addr to 0 since otherwise it can cause problems with QEMU"
157 return
158 fi
157 fi 159 fi
158fi
159 160
160if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then
161 QEMU=qemu-system-arm 161 QEMU=qemu-system-arm
162 MACHINE_SUBTYPE=versatilepb 162 MACHINE_SUBTYPE=versatilepb
163 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" 163 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"