Add CONFIG_REBOOT to set fdt_addr

This is needed for PXE/extlinux boot to find FDT (Device Tree Blob)
otherwise we don't boot. Also configure fdt command with FDT address
so we could use it out-of-the-box in U-Boot prompt.

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
This commit is contained in:
David Abdurachmanov 2019-03-30 20:31:09 +01:00
parent 60e6ad3bb8
commit 92694119a7
Signed by: davidlt
GPG Key ID: 7108702C938B13C1
3 changed files with 19 additions and 12 deletions

View File

@ -1,10 +0,0 @@
diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig
index b012443..0ccc933 100644
--- a/configs/qemu-riscv64_smode_defconfig
+++ b/configs/qemu-riscv64_smode_defconfig
@@ -9,3 +9,5 @@ CONFIG_DISPLAY_CPUINFO=y
CONFIG_DISPLAY_BOARDINFO=y
# CONFIG_CMD_MII is not set
CONFIG_OF_PRIOR_STAGE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_FAT=y

View File

@ -0,0 +1,13 @@
diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
index 2588c5a..0a3b098 100644
--- a/include/configs/qemu-riscv.h
+++ b/include/configs/qemu-riscv.h
@@ -48,4 +48,8 @@
"ramdisk_addr_r=0x82300000\0" \
BOOTENV
+#define CONFIG_PREBOOT \
+ "setenv fdt_addr ${fdtcontroladdr};" \
+ "fdt addr ${fdtcontroladdr};"
+
#endif /* __CONFIG_H */

View File

@ -2,7 +2,7 @@
Name: uboot-tools
Version: 2019.04
Release: 0.6%{?candidate:.%{candidate}}.1.riscv64%{?dist}
Release: 0.6%{?candidate:.%{candidate}}.2.riscv64%{?dist}
Summary: U-Boot utilities
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
URL: http://www.denx.de/wiki/U-Boot
@ -31,7 +31,7 @@ Patch13: tegra-p2371-2180-Build-position-independent-binary.patch
Patch14: net-eth-uclass-Write-MAC-address-to-hardware-after-probe.patch
# RISC-V (riscv64)
Patch30: u-boot-2019.04-rc4-riscv-bootz-fat.patch
Patch30: u-boot-2019.04-rc4-riscv.patch
BuildRequires: bc
BuildRequires: dtc
@ -352,6 +352,10 @@ cp -p board/warp7/README builds/docs/README.warp7
%endif
%changelog
* Sat Mar 30 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> 2019.04-0.6-rc4.2.riscv64
- Disable bootz (not supported)
- Add CONFIG_PREBOOT for qemu-riscv to set fdt_addr for extlinux boot
* Tue Mar 26 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> 2019.04-0.6-rc4.1.riscv64
- Enable bootz and FAT fs commands for qemu-riscv64_smode