Module Name: src
Committed By: jmcneill
Date: Mon Apr 10 22:25:36 UTC 2017
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
tegra: set loadaddr to 0x90000000 (the default kernel_addr_r overlaps
fdt_addr_r on TK1 + L4T 21.x), and set default root device to ld0a to
match new device probe order.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/embedded/conf/armv7.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/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.10 src/distrib/utils/embedded/conf/armv7.conf:1.11
--- src/distrib/utils/embedded/conf/armv7.conf:1.10 Sat Dec 19 14:57:49 2015
+++ src/distrib/utils/embedded/conf/armv7.conf Mon Apr 10 22:25:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.10 2015/12/19 14:57:49 skrll Exp $
+# $NetBSD: armv7.conf,v 1.11 2017/04/10 22:25:36 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -107,14 +107,15 @@ EOF
populate_tegra() {
tegra_kernelimg=netbsd-TEGRA.ub
+ tegra_loadaddr=0x90000000
# Create a boot.scr for Tegra U-Boot
cat > "${mnt}/boot/boot-TEGRA.txt" << EOF
-setenv bootargs root=ld1a
-fatload mmc 1:1 \${kernel_addr_r} ${tegra_kernelimg}
+setenv bootargs root=ld0a
+fatload mmc 1:1 ${tegra_loadaddr} ${tegra_kernelimg}
fatload mmc 1:1 \${fdt_addr_r} tegra124-\${board}.dtb
fdt addr \${fdt_addr_r}
-bootm \${kernel_addr_r} - \${fdt_addr_r}
+bootm ${tegra_loadaddr} - \${fdt_addr_r}
EOF
"${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/tegra boot" "${mnt}/boot/boot-TEGRA.txt" "${mnt}/boot/boot.scr"
}
