Module Name: src
Committed By: jmcneill
Date: Mon Aug 27 22:36:49 UTC 2018
Modified Files:
src/distrib/utils/embedded/conf: arm64.conf
Removed Files:
src/distrib/utils/embedded/files: arm64_extlinux.conf
Log Message:
Install ELF kernel to the FFS partition and boot it with bootaa64.efi
instead of loading kernel.img from the MSDOS partition with extlinux.conf
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/embedded/conf/arm64.conf
cvs rdiff -u -r1.1 -r0 src/distrib/utils/embedded/files/arm64_extlinux.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/arm64.conf
diff -u src/distrib/utils/embedded/conf/arm64.conf:1.3 src/distrib/utils/embedded/conf/arm64.conf:1.4
--- src/distrib/utils/embedded/conf/arm64.conf:1.3 Sun Aug 12 17:15:56 2018
+++ src/distrib/utils/embedded/conf/arm64.conf Mon Aug 27 22:36:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: arm64.conf,v 1.3 2018/08/12 17:15:56 jmcneill Exp $
+# $NetBSD: arm64.conf,v 1.4 2018/08/27 22:36:49 jmcneill Exp $
# ARM64 customization script used by mkimage
#
board=arm64
@@ -29,9 +29,15 @@ EOF
populate_common() {
# Rename kernel to netbsd.img
mv "${mnt}/boot/netbsd-${kernel_GENERIC64}.img" "${mnt}/boot/netbsd.img"
- # Install boot configuration file
- mkdir -p "${mnt}/boot/extlinux"
- cp ${DIR}/files/arm64_extlinux.conf "${mnt}/boot/extlinux/extlinux.conf"
+
+ # Install EFI bootloader
+ mkdir -p "${mnt}/boot/EFI/BOOT"
+ cp "${release}/usr/mdec/bootaa64.efi" "${mnt}/boot/EFI/BOOT/bootaa64.efi"
+
+ # Install kernel to root of the FFS partition
+ ${GZIP_CMD} -dc ${kernel}/netbsd-${kernel_GENERIC64}.gz > "${mnt}/netbsd"
+ echo "./netbsd type=file uname=root gname=wheel mode=0755" \
+ >> "$tmp/selected_sets"
}
populate_allwinner() {
