From f82507ae1d78372091cbaea882ff0422066d33c6 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Fri, 10 Mar 2017 05:49:09 +0000 Subject: The SoftIron OverDrive 3000 boots to an EFI shell. Create a startup.nsh file on the ESP to explicitly load bootaa64.efi so it will load without manual intervention. Suggested by patrick@ verified by deraadt@ ok kettenis@ The partition type of the ESP remains 0x0c rather than 0xef as it should be as otherwise the rpi3 won't boot. The AMI EDK2 based UEFI on the other hand can handle the ESP partition type being 0x0c or 0xef. --- distrib/arm64/miniroot/Makefile | 1 + distrib/arm64/ramdisk/install.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'distrib') diff --git a/distrib/arm64/miniroot/Makefile b/distrib/arm64/miniroot/Makefile index 5257a9e2198..8af672e0f62 100644 --- a/distrib/arm64/miniroot/Makefile +++ b/distrib/arm64/miniroot/Makefile @@ -63,6 +63,7 @@ do_files: cp ${PUBOOT}/rpi_3/u-boot.bin ${MOUNT_POINT}/ mkdir -p ${MOUNT_POINT}/efi/boot cp /usr/mdec/BOOTAA64.EFI ${MOUNT_POINT}/efi/boot/bootaa64.efi + echo bootaa64.efi > ${MOUNT_POINT}/efi/boot/startup.nsh echo 'arm_control=0x200\nenable_uart=1\ndevice_tree_address=0x100\nkernel=u-boot.bin' > ${MOUNT_POINT}/config.txt rd_setup: diff --git a/distrib/arm64/ramdisk/install.md b/distrib/arm64/ramdisk/install.md index 24b40ac6517..640d012d6c9 100644 --- a/distrib/arm64/ramdisk/install.md +++ b/distrib/arm64/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.3 2017/03/08 09:33:03 jsg Exp $ +# $OpenBSD: install.md,v 1.4 2017/03/10 05:49:08 jsg Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -45,6 +45,7 @@ md_installboot() { mount ${MOUNT_ARGS_msdos} ${_disk}i /mnt/mnt mkdir -p /mnt/mnt/efi/boot cp /mnt/usr/mdec/BOOTAA64.EFI /mnt/mnt/efi/boot/bootaa64.efi + echo bootaa64.efi > /mnt/mnt/efi/boot/startup.nsh _plat=rpi _mdec=/usr/mdec/$_plat -- cgit v1.2.3