colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

riscv: binman: Fix compilation error

Browse Source 
Some platforms may not have any DDR memory below 4G and for such platforms
the TEXT_BASE and LOAD addresses etc are all 64 bit addresses due to
which the u-boot build fails with below error:

u-boot/arch/riscv/dts/binman.dtsi:30.14-25
Value out of range for 32-bit array element
u-boot/arch/riscv/dts/binman.dtsi:43.14-25
Value out of range for 32-bit array element
u-boot/arch/riscv/dts/binman.dtsi:44.15-26
Value out of range for 32-bit array element
FATAL ERROR: Syntax error parsing input tree

Fix by setting the address-cells property to 2 and converting load
addresses to 64 bit values.

Signed-off-by: Mayuresh Chitale <mchitale@ventanamicro.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Mayuresh Chitale
2023-10-11 21:00:20 +05:30
committed by Leo Yu-Chi Liang
parent e96e537efd
commit 5a348ccf02
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/riscv/dts/binman.dtsi
View File

@@ -5,6 +5,9 @@
#include <config.h> #include <config.h>
#define U64_TO_U32_H(addr) (((addr) >> 32) & 0xffffffff)
#define U64_TO_U32_L(addr) ((addr) & 0xffffffff)
/ { / {
binman: binman { binman: binman {
multiple-images; multiple-images;
@@ -17,7 +20,7 @@
fit { fit {
description = "Configuration to load OpenSBI before U-Boot"; description = "Configuration to load OpenSBI before U-Boot";
#address-cells = <1>; #address-cells = <2>;
fit,fdt-list = "of-list"; fit,fdt-list = "of-list";
images { images {
@@ -27,7 +30,8 @@
os = "U-Boot"; os = "U-Boot";
arch = "riscv"; arch = "riscv";
compression = "none"; compression = "none";
load = <CONFIG_TEXT_BASE>; load = <U64_TO_U32_H(CONFIG_TEXT_BASE)
U64_TO_U32_L(CONFIG_TEXT_BASE)>;
uboot_blob: blob-ext { uboot_blob: blob-ext {
filename = "u-boot-nodtb.bin"; filename = "u-boot-nodtb.bin";
@@ -40,8 +44,10 @@
os = "opensbi"; os = "opensbi";
arch = "riscv"; arch = "riscv";
compression = "none"; compression = "none";
load = <CONFIG_SPL_OPENSBI_LOAD_ADDR>; load = <U64_TO_U32_H(CONFIG_SPL_OPENSBI_LOAD_ADDR)
entry = <CONFIG_SPL_OPENSBI_LOAD_ADDR>; U64_TO_U32_L(CONFIG_SPL_OPENSBI_LOAD_ADDR)>;
entry = <U64_TO_U32_H(CONFIG_SPL_OPENSBI_LOAD_ADDR)
U64_TO_U32_L(CONFIG_SPL_OPENSBI_LOAD_ADDR)>;
opensbi_blob: opensbi { opensbi_blob: opensbi {
filename = "fw_dynamic.bin"; filename = "fw_dynamic.bin";