Module Name: src
Committed By: jmcneill
Date: Tue Jun 19 15:13:51 UTC 2018
Modified Files:
src/distrib/utils/embedded/conf: arm64.conf
Log Message:
Install RK3328 .dtb files to the correct location
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/arm64.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.1 src/distrib/utils/embedded/conf/arm64.conf:1.2
--- src/distrib/utils/embedded/conf/arm64.conf:1.1 Sun Apr 1 04:35:02 2018
+++ src/distrib/utils/embedded/conf/arm64.conf Tue Jun 19 15:13:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: arm64.conf,v 1.1 2018/04/01 04:35:02 ryo Exp $
+# $NetBSD: arm64.conf,v 1.2 2018/06/19 15:13:51 jmcneill Exp $
# ARM64 customization script used by mkimage
#
board=arm64
@@ -40,6 +40,12 @@ populate_allwinner() {
mv "${mnt}"/boot/sun50i-*.dtb "${mnt}/boot/dtb/allwinner/"
}
+populate_rockchip() {
+ # U-Boot expects 64-bit DTB files to live in a rockchip/ subdirectory
+ mkdir -p "${mnt}/boot/dtb/rockchip"
+ mv "${mnt}"/boot/rk3328-*.dtb "${mnt}/boot/dtb/rockchip/"
+}
+
populate_rpi() {
firmwaredir="${src}/external/broadcom/rpi-firmware/dist"
firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
@@ -107,6 +113,7 @@ populate() {
# SoC specific configuration
populate_allwinner
populate_nvidia
+ populate_rockchip
# Board specific configuration
populate_rpi