Index: head/tools/tools/nanobsd/embedded/beaglebone.cfg
===================================================================
--- head/tools/tools/nanobsd/embedded/beaglebone.cfg
+++ head/tools/tools/nanobsd/embedded/beaglebone.cfg
@@ -26,7 +26,7 @@
 # SUCH DAMAGE.
 #
 
-NANO_ARCH=armv6
+NANO_ARCH=armv7
 NANO_KERNEL=BEAGLEBONE
 NANO_DRIVE=mmcsd0
 NANO_NAME=beaglebone
Index: head/tools/tools/nanobsd/embedded/common
===================================================================
--- head/tools/tools/nanobsd/embedded/common
+++ head/tools/tools/nanobsd/embedded/common
@@ -535,6 +535,9 @@
 std_armv6 ( ) {
 }
 
+std_armv7 ( ) {
+}
+
 std_i386 ( ) {
 	# Default values, if not overridden in .cfg file
 	: ${NANO_KERNEL:=GENERIC}
Index: head/tools/tools/nanobsd/embedded/pandaboard.cfg
===================================================================
--- head/tools/tools/nanobsd/embedded/pandaboard.cfg
+++ head/tools/tools/nanobsd/embedded/pandaboard.cfg
@@ -26,7 +26,7 @@
 # SUCH DAMAGE.
 #
 
-NANO_ARCH=armv6
+NANO_ARCH=armv7
 NANO_KERNEL=PANDABOARD
 NANO_DRIVE=mmcsd0
 NANO_NAME=pandaboard
Index: head/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg
===================================================================
--- head/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg
+++ head/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg
@@ -36,7 +36,7 @@
 
 #
 # Run with
-#	qemu-system-x86_64 -serial stdio -bios OVMF.fd \
+#	qemu-system-x86_64 -m 512 -serial stdio -bios OVMF.fd \
 #		-hda _.disk.image.qemu-amd64-uefi.qcow2
 # OVMF.fd is from
 #	http://sourceforge.net/projects/edk2/files/OVMF/OVMF-X64-r15214.zip
Index: head/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg
===================================================================
--- head/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg
+++ head/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg
@@ -36,7 +36,7 @@
 
 #
 # Run with
-#	qemu-system-x86_64 -serial stdio -bios OVMF.fd \
+#	qemu-system-x86_64 -m 512 -serial stdio -bios OVMF.fd \
 #		-hda _.disk.image.qemu-amd64-uefi.qcow2
 # OVMF.fd is from
 #	http://sourceforge.net/projects/edk2/files/OVMF/OVMF-X64-r15214.zip
Index: head/tools/tools/nanobsd/embedded/qemu-amd64.cfg
===================================================================
--- head/tools/tools/nanobsd/embedded/qemu-amd64.cfg
+++ head/tools/tools/nanobsd/embedded/qemu-amd64.cfg
@@ -34,6 +34,6 @@
 qemu_env
 
 # Run with:
-# qemu-system-x86_64 -hdd $file -serial telnet::4444,server -nographic
+# qemu-system-x86_64 -m 512 -hdd $file -serial telnet::4444,server -nographic
 # To get some breathing room on the image:
 # qemu-img resize $file +2G
Index: head/tools/tools/nanobsd/embedded/qemu-armv7.cfg
===================================================================
--- head/tools/tools/nanobsd/embedded/qemu-armv7.cfg
+++ head/tools/tools/nanobsd/embedded/qemu-armv7.cfg
@@ -27,7 +27,7 @@
 # SUCH DAMAGE.
 #
 
-NANO_ARCH=armv6
+NANO_ARCH=armv7
 NANO_DRIVE=vtbd0
 NANO_KERNEL=GENERIC
 NANO_NAME=qemu-armv7
@@ -40,7 +40,7 @@
 
 #
 # Run with
-#	qemu-system-arm -M virt -serial stdio -bios QEMU_EFI.fd \
+#	qemu-system-arm -m 512 -M virt -serial stdio -bios QEMU_EFI.fd \
 #		-drive if=none,file=_.disk.image.qemu-armv7.qcow2,id=hd0 \
 #		-device virtio-blk-device,drive=hd0
 # QEMU_EFI.fd is from
Index: head/tools/tools/nanobsd/embedded/rpi2.cfg
===================================================================
--- head/tools/tools/nanobsd/embedded/rpi2.cfg
+++ head/tools/tools/nanobsd/embedded/rpi2.cfg
@@ -26,7 +26,7 @@
 # SUCH DAMAGE.
 #
 
-NANO_ARCH=armv6
+NANO_ARCH=armv7
 NANO_KERNEL=RPI2
 NANO_DRIVE=mmcsd0
 NANO_NAME=rpi2