Teach nanobsd about armv7, add -m to qemu invocations
qemu defaults to 128 MiB of RAM, which has been found to not necessarily be enough for booting the system, at least on amd64 and armv7 Add a sensible -m 512 to the examples so that they'll work out of the box in the general case. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D14234
This commit is contained in:
parent
12363d8ea3
commit
312640ff19
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=329061
@ -26,7 +26,7 @@
|
|||||||
# SUCH DAMAGE.
|
# SUCH DAMAGE.
|
||||||
#
|
#
|
||||||
|
|
||||||
NANO_ARCH=armv6
|
NANO_ARCH=armv7
|
||||||
NANO_KERNEL=BEAGLEBONE
|
NANO_KERNEL=BEAGLEBONE
|
||||||
NANO_DRIVE=mmcsd0
|
NANO_DRIVE=mmcsd0
|
||||||
NANO_NAME=beaglebone
|
NANO_NAME=beaglebone
|
||||||
|
@ -535,6 +535,9 @@ std_armeb ( ) {
|
|||||||
std_armv6 ( ) {
|
std_armv6 ( ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std_armv7 ( ) {
|
||||||
|
}
|
||||||
|
|
||||||
std_i386 ( ) {
|
std_i386 ( ) {
|
||||||
# Default values, if not overridden in .cfg file
|
# Default values, if not overridden in .cfg file
|
||||||
: ${NANO_KERNEL:=GENERIC}
|
: ${NANO_KERNEL:=GENERIC}
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
# SUCH DAMAGE.
|
# SUCH DAMAGE.
|
||||||
#
|
#
|
||||||
|
|
||||||
NANO_ARCH=armv6
|
NANO_ARCH=armv7
|
||||||
NANO_KERNEL=PANDABOARD
|
NANO_KERNEL=PANDABOARD
|
||||||
NANO_DRIVE=mmcsd0
|
NANO_DRIVE=mmcsd0
|
||||||
NANO_NAME=pandaboard
|
NANO_NAME=pandaboard
|
||||||
|
@ -36,7 +36,7 @@ qemu_env
|
|||||||
|
|
||||||
#
|
#
|
||||||
# Run with
|
# 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
|
# -hda _.disk.image.qemu-amd64-uefi.qcow2
|
||||||
# OVMF.fd is from
|
# OVMF.fd is from
|
||||||
# http://sourceforge.net/projects/edk2/files/OVMF/OVMF-X64-r15214.zip
|
# http://sourceforge.net/projects/edk2/files/OVMF/OVMF-X64-r15214.zip
|
||||||
|
@ -36,7 +36,7 @@ qemu_env
|
|||||||
|
|
||||||
#
|
#
|
||||||
# Run with
|
# 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
|
# -hda _.disk.image.qemu-amd64-uefi.qcow2
|
||||||
# OVMF.fd is from
|
# OVMF.fd is from
|
||||||
# http://sourceforge.net/projects/edk2/files/OVMF/OVMF-X64-r15214.zip
|
# http://sourceforge.net/projects/edk2/files/OVMF/OVMF-X64-r15214.zip
|
||||||
|
@ -34,6 +34,6 @@ NANO_NAME=qemu-amd64
|
|||||||
qemu_env
|
qemu_env
|
||||||
|
|
||||||
# Run with:
|
# 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:
|
# To get some breathing room on the image:
|
||||||
# qemu-img resize $file +2G
|
# qemu-img resize $file +2G
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
# SUCH DAMAGE.
|
# SUCH DAMAGE.
|
||||||
#
|
#
|
||||||
|
|
||||||
NANO_ARCH=armv6
|
NANO_ARCH=armv7
|
||||||
NANO_DRIVE=vtbd0
|
NANO_DRIVE=vtbd0
|
||||||
NANO_KERNEL=GENERIC
|
NANO_KERNEL=GENERIC
|
||||||
NANO_NAME=qemu-armv7
|
NANO_NAME=qemu-armv7
|
||||||
@ -40,7 +40,7 @@ qemu_env
|
|||||||
|
|
||||||
#
|
#
|
||||||
# Run with
|
# 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 \
|
# -drive if=none,file=_.disk.image.qemu-armv7.qcow2,id=hd0 \
|
||||||
# -device virtio-blk-device,drive=hd0
|
# -device virtio-blk-device,drive=hd0
|
||||||
# QEMU_EFI.fd is from
|
# QEMU_EFI.fd is from
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
# SUCH DAMAGE.
|
# SUCH DAMAGE.
|
||||||
#
|
#
|
||||||
|
|
||||||
NANO_ARCH=armv6
|
NANO_ARCH=armv7
|
||||||
NANO_KERNEL=RPI2
|
NANO_KERNEL=RPI2
|
||||||
NANO_DRIVE=mmcsd0
|
NANO_DRIVE=mmcsd0
|
||||||
NANO_NAME=rpi2
|
NANO_NAME=rpi2
|
||||||
|
Loading…
Reference in New Issue
Block a user