diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-10-01 15:09:47 +0100 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-10-01 16:47:38 +0100 |
| commit | b9369741db688d117c94d2b3c4827a317756dc0c (patch) | |
| tree | 059eb3d4bea3028a43808c4836db65b639d3570f | |
| parent | 8fdc5ff4c181edbae9503034400a492caecbcb98 (diff) | |
| download | openembedded-core-b9369741db688d117c94d2b3c4827a317756dc0c.tar.gz openembedded-core-b9369741db688d117c94d2b3c4827a317756dc0c.tar.bz2 openembedded-core-b9369741db688d117c94d2b3c4827a317756dc0c.tar.xz openembedded-core-b9369741db688d117c94d2b3c4827a317756dc0c.zip | |
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>
| -rwxr-xr-x | scripts/poky-qemu-internal | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal index cb5d28b90..f13b95def 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" |