diff options
| author |   jsg <jsg@openbsd.org> | 2017-01-24 05:29:22 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2017-01-24 05:29:22 +0000 |
| commit | d9e0385638bef18ac4720124282e80f73b1f261f (patch) | |
| tree | 1c7c87b34fe1bd7f5582e8e099c8aebaba66beda | |
| parent | Display the thread ID (TID) rather than the process group ID (PGRP) (diff) | |
| download | wireguard-openbsd-d9e0385638bef18ac4720124282e80f73b1f261f.tar.xz wireguard-openbsd-d9e0385638bef18ac4720124282e80f73b1f261f.zip | |
There are two u-boot targets which should work with the sabre lite
boards. mx6qsabrelite (which sets fdt_addr) and nitrogen6q
(which sets fdtaddr). The difference seems to be the mx6qsabrelite
target uses a small loader in SPI connected flash which will load
the rest of u-boot from an SD card. The nitrogen6q target normally
loads all of u-boot from an image in flash and then searches for a
6x_bootscript file with u-boot commands on MMC and SATA.
While neither of them supports "Generic Distro Configuration" which
would automatically search for an EFI image, if they did fdt_addr
is intended to be used for a DTB in ROM, while fdt_addr_r is intended
to be used for a DTB in RAM.
Change the 6x_bootscript u-boot commands to load the DTB to
fdtaddr instead of fdt_addr as matthieu@ reported fdt_addr was not
present in the u-boot environment on his system.
| -rw-r--r-- | distrib/armv7/miniroot/boot.cmd | 4 | ||||
| -rw-r--r-- | distrib/armv7/ramdisk/install.md | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/distrib/armv7/miniroot/boot.cmd b/distrib/armv7/miniroot/boot.cmd index bec5aef45a6..c06ed7162e0 100644 --- a/distrib/armv7/miniroot/boot.cmd +++ b/distrib/armv7/miniroot/boot.cmd @@ -1,4 +1,4 @@ setenv fdtfile imx6q-sabrelite.dtb ; -load ${dtype} ${disk}:1 ${fdt_addr} ${fdtfile} ; +load ${dtype} ${disk}:1 ${fdtaddr} ${fdtfile} ; load ${dtype} ${disk}:1 ${loadaddr} efi/boot/bootarm.efi ; -bootefi ${loadaddr} ${fdt_addr} ; +bootefi ${loadaddr} ${fdtaddr} ; diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md index 970e1f30d51..158c52c19ea 100644 --- a/distrib/armv7/ramdisk/install.md +++ b/distrib/armv7/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.44 2017/01/22 23:43:54 rpe Exp $ +# $OpenBSD: install.md,v 1.45 2017/01/24 05:29:22 jsg Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -74,9 +74,9 @@ md_installboot() { cp $_mdec/*.dtb /mnt/mnt/ cat > /tmp/i/boot.cmd<<-__EOT setenv fdtfile imx6q-sabrelite.dtb ; - load ${dtype} ${disk}:1 ${fdt_addr} ${fdtfile} ; + load ${dtype} ${disk}:1 ${fdtaddr} ${fdtfile} ; load ${dtype} ${disk}:1 ${loadaddr} efi/boot/bootarm.efi ; - bootefi ${loadaddr} ${fdt_addr} ; + bootefi ${loadaddr} ${fdtaddr} ; __EOT mkuboot -t script -a arm -o linux /tmp/i/boot.cmd \ /mnt/mnt/6x_bootscript |