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

riscv: dts: binman: add condition for opensbi os boot

Browse Source 
Add condition for OpenSBI OS boot mode, by default it is not enabled.
By default, binman creates the output file u-boot.itb.
If SPL_OPENSBI_OS_BOOT is enabled, linux.itb will be created
after compilation instead of the default u-boot.itb.

Signed-off-by: Randolph <randolph@andestech.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Randolph
2023-10-12 14:35:05 +08:00
committed by Leo Yu-Chi Liang
parent e09a2287c1
commit d311df8b31
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,12 @@
&binman { &binman {
itb { itb {
#ifndef CONFIG_SPL_LOAD_FIT_OPENSBI_OS_BOOT
filename = "u-boot.itb"; filename = "u-boot.itb";
#else
filename = "linux.itb";
#endif
fit { fit {
description = "Configuration to load OpenSBI before U-Boot"; description = "Configuration to load OpenSBI before U-Boot";
@@ -24,6 +29,7 @@
fit,fdt-list = "of-list"; fit,fdt-list = "of-list";
images { images {
#ifndef CONFIG_SPL_LOAD_FIT_OPENSBI_OS_BOOT
uboot { uboot {
description = "U-Boot"; description = "U-Boot";
type = "standalone"; type = "standalone";
@@ -37,6 +43,20 @@
filename = "u-boot-nodtb.bin"; filename = "u-boot-nodtb.bin";
}; };
}; };
#else
linux {
description = "Linux";
type = "standalone";
os = "Linux";
arch = "riscv";
compression = "none";
load = <CONFIG_TEXT_BASE>;
linux_blob: blob-ext {
filename = "Image";
};
};
#endif
opensbi { opensbi {
description = "OpenSBI fw_dynamic Firmware"; description = "OpenSBI fw_dynamic Firmware";
@@ -74,7 +94,11 @@
#endif #endif
description = "NAME"; description = "NAME";
firmware = "opensbi"; firmware = "opensbi";
#ifndef CONFIG_SPL_LOAD_FIT_OPENSBI_OS_BOOT
loadables = "uboot"; loadables = "uboot";
#else
loadables = "linux";
#endif
#ifndef CONFIG_OF_BOARD #ifndef CONFIG_OF_BOARD
fdt = "fdt-SEQ"; fdt = "fdt-SEQ";
#endif #endif