[src/trunk]: src/distrib/utils/embedded/conf tegra: set loadaddr to 0x9000000...

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

details:   https://anonhg.NetBSD.org/src/rev/1e9d1df4eaae
branches:  trunk
changeset: 823047:1e9d1df4eaae
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Apr 10 22:25:36 2017 +0000

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

diffstat:

 distrib/utils/embedded/conf/armv7.conf |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 51108de0ad64 -r 1e9d1df4eaae distrib/utils/embedded/conf/armv7.conf
--- a/distrib/utils/embedded/conf/armv7.conf    Mon Apr 10 21:53:37 2017 +0000
+++ b/distrib/utils/embedded/conf/armv7.conf    Mon Apr 10 22:25:36 2017 +0000
@@ -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 @@
 
 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"
 }