[src/trunk]: src/distrib/utils/embedded/files Turn off efiboot until we figur...

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

details:   https://anonhg.NetBSD.org/src/rev/37fe67c491d9
branches:  trunk
changeset: 997931:37fe67c491d9
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Apr 02 10:00:32 2019 +0000

description:
Turn off efiboot until we figure out why it fails on some boards.

diffstat:

 distrib/utils/embedded/files/armv7_boot.cmd |  54 +++++++++++++++++++++++++---
 1 files changed, 47 insertions(+), 7 deletions(-)

diffs (70 lines):

diff -r 4470fb931b4b -r 37fe67c491d9 distrib/utils/embedded/files/armv7_boot.cmd
--- a/distrib/utils/embedded/files/armv7_boot.cmd       Tue Apr 02 03:52:17 2019 +0000
+++ b/distrib/utils/embedded/files/armv7_boot.cmd       Tue Apr 02 10:00:32 2019 +0000
@@ -2,19 +2,59 @@
        setenv kernel netbsd-BEAGLEBONE.ub
        setenv mmcpart 0:1
        setenv bootargs root=ld0a
-else
-       setenv use_efi 1
+fi
+if test "${board}" = "de0-nano-soc" ; then
+       setenv kernel netbsd-GENERIC.ub
+       setenv bootargs 'root=ld0a'
+       setenv mmcpart 0:1
+       setenv use_fdt 1
+fi
+if test "${soc}" = "exynos" ; then
+       setenv kernel netbsd-GENERIC.ub
+       setenv bootargs 'root=ld1a'
+       setenv mmcpart 2:1
+       setenv use_fdt 1
+fi
+if test "${soc}" = "sunxi" ; then
+       setenv kernel netbsd-GENERIC.ub
+       setenv bootargs 'root=ld0a'
+       setenv mmcpart 0:1
+       setenv use_fdt 1
 fi
-
+if test "${soc}" = "tegra" ; then
+       setenv kernel netbsd-GENERIC.ub
+       setenv bootargs root=ld1a
+       setenv mmcpart 1:1
+       setenv use_fdt 1
+fi
+if test "${soc}" = "tegra124" ; then
+       setenv kernel netbsd-GENERIC.ub
+       setenv bootargs root=ld0a
+       setenv mmcpart 1:1
+       setenv use_fdt 1
+fi
 if test "${soc}" = "tegra210" ; then
+       setenv kernel netbsd-GENERIC.ub
+       setenv bootargs root=ld0a
+       setenv mmcpart 1:1
+       setenv use_fdt 1
+       setenv fdtfile ${soc}-${board}.dtb
        # enable PCIe
        pci enum
 fi
 
-if test "${use_efi}" = "1" ; then
-       setenv boot_scripts
-       setenv boot_script_dhcp
-       run distro_bootcmd
+if test "${kernel}" = "" ; then
+       echo '>>>'
+       echo '>>> Target device is not supported by this script.'
+       echo '>>>'
+       exit
+fi
+
+if test "${use_fdt}" = "1" ; then
+       fatload mmc ${mmcpart} ${kernel_addr_r} ${kernel}
+       fatload mmc ${mmcpart} ${fdt_addr_r} ${fdtfile}
+       fdt addr ${fdt_addr_r}
+       bootm ${kernel_addr_r} - ${fdt_addr_r}
 else
        fatload mmc ${mmcpart} ${kernel_addr_r} ${kernel}
        bootm ${kernel_addr_r} ${bootargs}