[src/trunk]: src/distrib/utils/embedded Install ELF kernel to the FFS partiti...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/695b79453fd2
branches:  trunk
changeset: 835532:695b79453fd2
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Aug 27 22:36:49 2018 +0000

description:
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

diffstat:

 distrib/utils/embedded/conf/arm64.conf           |  14 ++++++++++----
 distrib/utils/embedded/files/arm64_extlinux.conf |  12 ------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diffs (44 lines):

diff -r 26c781034b34 -r 695b79453fd2 distrib/utils/embedded/conf/arm64.conf
--- a/distrib/utils/embedded/conf/arm64.conf    Mon Aug 27 22:22:16 2018 +0000
+++ b/distrib/utils/embedded/conf/arm64.conf    Mon Aug 27 22:36:49 2018 +0000
@@ -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 @@
 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() {
diff -r 26c781034b34 -r 695b79453fd2 distrib/utils/embedded/files/arm64_extlinux.conf
--- a/distrib/utils/embedded/files/arm64_extlinux.conf  Mon Aug 27 22:22:16 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-# $NetBSD: arm64_extlinux.conf,v 1.1 2018/04/01 04:35:02 ryo Exp $
-#
-# NetBSD/arm64 U-boot boot configuration
-#
-
-menu title NetBSD/arm64 boot options
-timeout 30
-
-label NetBSD/arm64
-       kernel /netbsd.img
-       fdtdir /dtb
-       append root=ld0a console=fb