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.
This commit is contained in:
jmcneill 2017-04-10 22:25:36 +00:00
parent a11ceffedb
commit ec75ca4b3d
1 changed files with 5 additions and 4 deletions

View File

@ -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 # ARMv7 customization script used by mkimage
# #
board=armv7 board=armv7
@ -107,14 +107,15 @@ EOF
populate_tegra() { populate_tegra() {
tegra_kernelimg=netbsd-TEGRA.ub tegra_kernelimg=netbsd-TEGRA.ub
tegra_loadaddr=0x90000000
# Create a boot.scr for Tegra U-Boot # Create a boot.scr for Tegra U-Boot
cat > "${mnt}/boot/boot-TEGRA.txt" << EOF cat > "${mnt}/boot/boot-TEGRA.txt" << EOF
setenv bootargs root=ld1a setenv bootargs root=ld0a
fatload mmc 1:1 \${kernel_addr_r} ${tegra_kernelimg} fatload mmc 1:1 ${tegra_loadaddr} ${tegra_kernelimg}
fatload mmc 1:1 \${fdt_addr_r} tegra124-\${board}.dtb fatload mmc 1:1 \${fdt_addr_r} tegra124-\${board}.dtb
fdt addr \${fdt_addr_r} fdt addr \${fdt_addr_r}
bootm \${kernel_addr_r} - \${fdt_addr_r} bootm ${tegra_loadaddr} - \${fdt_addr_r}
EOF 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" "${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/tegra boot" "${mnt}/boot/boot-TEGRA.txt" "${mnt}/boot/boot.scr"
} }