Sun Dec 3 13:31:45 2017 UTC ()
On 64-bit boards, U-Boot expects to find .dtb files in an allwinner/ subdirectory


(jmcneill)
diff -r1.21 -r1.22 src/distrib/utils/embedded/conf/armv7.conf
cvs diff -r1.21 -r1.22 src/distrib/utils/embedded/conf/armv7.conf (expand / switch to unified diff)

--- src/distrib/utils/embedded/conf/armv7.conf 2017/11/30 19:55:47 1.21
+++ src/distrib/utils/embedded/conf/armv7.conf 2017/12/03 13:31:45 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: armv7.conf,v 1.21 2017/11/30 19:55:47 jmcneill Exp $ 1# $NetBSD: armv7.conf,v 1.22 2017/12/03 13:31:45 jmcneill Exp $
2# ARMv7 customization script used by mkimage 2# ARMv7 customization script used by mkimage
3# 3#
4board=armv7 4board=armv7
5console=fb 5console=fb
6resize=true 6resize=true
7 7
8. ${DIR}/conf/evbarm.conf 8. ${DIR}/conf/evbarm.conf
9 9
10kernels_beagle="BEAGLEBOARD BEAGLEBONE" 10kernels_beagle="BEAGLEBOARD BEAGLEBONE"
11kernels_rpi="RPI2" 11kernels_rpi="RPI2"
12kernels_amlogic="ODROID-C1" 12kernels_amlogic="ODROID-C1"
13kernels_tegra="TEGRA" 13kernels_tegra="TEGRA"
14kernels_sunxi="SUNXI" 14kernels_sunxi="SUNXI"
@@ -93,27 +93,29 @@ populate_amlogic() { @@ -93,27 +93,29 @@ populate_amlogic() {
93 odroidc1_kernelimg=netbsd-ODROID-C1.ub 93 odroidc1_kernelimg=netbsd-ODROID-C1.ub
94 94
95 # Create a boot.ini for Amlogic U-Boot 95 # Create a boot.ini for Amlogic U-Boot
96 cat >> "${mnt}/boot/boot.ini" << EOF 96 cat >> "${mnt}/boot/boot.ini" << EOF
97ODROIDC-UBOOT-CONFIG 97ODROIDC-UBOOT-CONFIG
98 98
99setenv bootargs "root=ld0a awge0.mac-address=\${ethaddr} console=${console}" 99setenv bootargs "root=ld0a awge0.mac-address=\${ethaddr} console=${console}"
100setenv bootcmd "fatload mmc 0:1 0x21000000 ${odroidc1_kernelimg}; bootm 0x21000000" 100setenv bootcmd "fatload mmc 0:1 0x21000000 ${odroidc1_kernelimg}; bootm 0x21000000"
101run bootcmd 101run bootcmd
102EOF 102EOF
103} 103}
104 104
105populate_sunxi() { 105populate_sunxi() {
106 : 106 # U-Boot expects 64-bit DTB files to live in an allwinner/ subdirectory
 107 mkdir -p "${mnt}/boot/allwinner"
 108 mv "${mnt}"/boot/sun50i-* "${mnt}/boot/allwinner/"
107} 109}
108 110
109populate_tegra() { 111populate_tegra() {
110 : 112 :
111} 113}
112 114
113populate() { 115populate() {
114 echo "${bar} looking for kernels in ${kernel} ${bar}" 116 echo "${bar} looking for kernels in ${kernel} ${bar}"
115 kernels="" 117 kernels=""
116 # .ub kernels 118 # .ub kernels
117 for k in $kernels_beagle $kernels_sunxi $kernels_amlogic $kernels_tegra; do 119 for k in $kernels_beagle $kernels_sunxi $kernels_amlogic $kernels_tegra; do
118 f="${kernel}/netbsd-${k}.ub.gz" 120 f="${kernel}/netbsd-${k}.ub.gz"
119 test -f "${f}" && kernels="${kernels} ${f}" 121 test -f "${f}" && kernels="${kernels} ${f}"