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

arm64: zynqmp: Use CONFIG_SPL_FS_LOAD_PAYLOAD_NAME in binman

Browse Source 
u-boot.itb name is coming via CONFIG_SPL_FS_LOAD_PAYLOAD_NAME and it's
change will affect SD boot mode that's why start to use it.

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/0f037e62e2d8486c0f68f204b45705be9e996ba7.1744039048.git.michal.simek@amd.com
This commit is contained in:
Michal Simek
2025-04-16 13:44:44 +02:00
parent 003d56c548
commit 4fa8db5f9e
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/dts/zynqmp-binman-som.dts
+10 -4
View File
@@ -2,13 +2,19 @@
/*
* dts file for Xilinx ZynqMP SOMs (k24/k26)
*
* (C) Copyright 2024, Advanced Micro Devices, Inc.
* (C) Copyright 2024-2025, Advanced Micro Devices, Inc.
*
* Michal Simek <michal.simek@amd.com>
*/
#include <config.h>
#if defined(CONFIG_SPL_FS_LOAD_PAYLOAD_NAME)
#define U_BOOT_ITB_FILENAME CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
#else
#define U_BOOT_ITB_FILENAME "u-boot.itb"
#endif
/dts-v1/;
/ {
binman: binman {
@@ -103,9 +109,9 @@
};
};
/* u-boot.itb generation in a static way */
/* Generation in a static way */
itb {
filename = "u-boot.itb";
filename = U_BOOT_ITB_FILENAME;
pad-byte = <0>;
fit {
@@ -227,7 +233,7 @@
};
blob-ext@2 {
offset = <CONFIG_SYS_SPI_U_BOOT_OFFS>;
filename = "u-boot.itb";
filename = U_BOOT_ITB_FILENAME;
};
fdtmap {
};
arch/arm/dts/zynqmp-binman.dts
+10 -4
View File
@@ -2,22 +2,28 @@
/*
* dts file for Xilinx ZynqMP platforms
*
* (C) Copyright 2024, Advanced Micro Devices, Inc.
* (C) Copyright 2024-2025, Advanced Micro Devices, Inc.
*
* Michal Simek <michal.simek@amd.com>
*/
#include <config.h>
#if defined(CONFIG_SPL_FS_LOAD_PAYLOAD_NAME)
#define U_BOOT_ITB_FILENAME CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
#else
#define U_BOOT_ITB_FILENAME "u-boot.itb"
#endif
/dts-v1/;
/ {
binman: binman {
multiple-images;
#ifdef CONFIG_SPL
/* u-boot.itb generation in a static way */
/* Generation in a static way */
itb {
filename = "u-boot.itb";
filename = U_BOOT_ITB_FILENAME;
pad-byte = <0>;
fit {
@@ -196,7 +202,7 @@
};
blob-ext@2 {
offset = <CONFIG_SYS_SPI_U_BOOT_OFFS>;
filename = "u-boot.itb";
filename = U_BOOT_ITB_FILENAME;
};
fdtmap {
};