From b9369741db688d117c94d2b3c4827a317756dc0c Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Fri, 1 Oct 2010 15:09:47 +0100 Subject: 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 --- scripts/poky-qemu-internal | 12 ++++++------ 1 file 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 return fi -if [ -e /proc/sys/vm/mmap_min_addr ]; then - if [ `cat /proc/sys/vm/mmap_min_addr` != "0" ]; then - echo "Error, please set /proc/sys/vm/mmap_min_addr to 0 since otherwise it can cause problems with QEMU" - return +if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then + if [ -e /proc/sys/vm/mmap_min_addr ]; then + if [ `cat /proc/sys/vm/mmap_min_addr` != "0" ]; then + echo "Error, please set /proc/sys/vm/mmap_min_addr to 0 since otherwise it can cause problems with QEMU" + return + fi fi -fi -if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then QEMU=qemu-system-arm MACHINE_SUBTYPE=versatilepb QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" -- cgit 1.2.3-korg