| Message ID | 20250416162533.1396-2-ziyao@disroot.org |
|---|---|
| State | Accepted |
| Commit | efe9c12322b92c49257d3dd86e40de8c26209e16 |
| Delegated to: | Andes |
| Headers | show |
| Series | Fix binman_sym functionality on RISC-V port | expand |
Hi Yao, On Wed, 16 Apr 2025 at 10:25, Yao Zi <ziyao@disroot.org> wrote: > > Switch to u-boot-nodtb entry which precisely represents a proper U-Boot > and could be matched with u_boot_any. This allows RISC-V ports that make > use of binman to be built without disabling SPL_BINMAN_UBOOT_SYMBOLS > explicitly, which is set to y by default. > > Fixes: 0784510f741 ("riscv: sifive: unleashed: Switch to use binman to generate u-boot.itb") > Suggested-by: Jonas Karlman <jonas@kwiboo.se> > Signed-off-by: Yao Zi <ziyao@disroot.org> > --- > arch/riscv/dts/binman.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Reviewed-by: Simon Glass <sjg@chromium.org> > diff --git a/arch/riscv/dts/binman.dtsi b/arch/riscv/dts/binman.dtsi > index 0405faca574..b7656423b69 100644 > --- a/arch/riscv/dts/binman.dtsi > +++ b/arch/riscv/dts/binman.dtsi > @@ -35,7 +35,7 @@ > compression = "none"; > load = /bits/ 64 <CONFIG_TEXT_BASE>; > > - uboot_blob: blob-ext { > + uboot_blob: u-boot-nodtb { > filename = "u-boot-nodtb.bin"; Also you can see the default filename for that entry type in tools/binman/etype/u_boot_nodtb.py: def GetDefaultFilename(self): return 'u-boot-nodtb.bin' so you can drop this filename. > }; > }; > -- > 2.49.0 > Regards, Simon
On Thu, Apr 17, 2025 at 03:35:50PM -0600, Simon Glass wrote: > Hi Yao, > > On Wed, 16 Apr 2025 at 10:25, Yao Zi <ziyao@disroot.org> wrote: > > > > Switch to u-boot-nodtb entry which precisely represents a proper U-Boot > > and could be matched with u_boot_any. This allows RISC-V ports that make > > use of binman to be built without disabling SPL_BINMAN_UBOOT_SYMBOLS > > explicitly, which is set to y by default. > > > > Fixes: 0784510f741 ("riscv: sifive: unleashed: Switch to use binman to generate u-boot.itb") > > Suggested-by: Jonas Karlman <jonas@kwiboo.se> > > Signed-off-by: Yao Zi <ziyao@disroot.org> > > --- > > arch/riscv/dts/binman.dtsi | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > Reviewed-by: Simon Glass <sjg@chromium.org> > > > diff --git a/arch/riscv/dts/binman.dtsi b/arch/riscv/dts/binman.dtsi > > index 0405faca574..b7656423b69 100644 > > --- a/arch/riscv/dts/binman.dtsi > > +++ b/arch/riscv/dts/binman.dtsi > > @@ -35,7 +35,7 @@ > > compression = "none"; > > load = /bits/ 64 <CONFIG_TEXT_BASE>; > > > > - uboot_blob: blob-ext { > > + uboot_blob: u-boot-nodtb { > > filename = "u-boot-nodtb.bin"; > > Also you can see the default filename for that entry type in > tools/binman/etype/u_boot_nodtb.py: > > def GetDefaultFilename(self): > return 'u-boot-nodtb.bin' > > so you can drop this filename. Okay, thanks for the hint. > > }; > > }; > > -- > > 2.49.0 > > > > Regards, > Simon Best regards, Yao Zi
diff --git a/arch/riscv/dts/binman.dtsi b/arch/riscv/dts/binman.dtsi index 0405faca574..b7656423b69 100644 --- a/arch/riscv/dts/binman.dtsi +++ b/arch/riscv/dts/binman.dtsi @@ -35,7 +35,7 @@ compression = "none"; load = /bits/ 64 <CONFIG_TEXT_BASE>; - uboot_blob: blob-ext { + uboot_blob: u-boot-nodtb { filename = "u-boot-nodtb.bin"; }; };
Switch to u-boot-nodtb entry which precisely represents a proper U-Boot and could be matched with u_boot_any. This allows RISC-V ports that make use of binman to be built without disabling SPL_BINMAN_UBOOT_SYMBOLS explicitly, which is set to y by default. Fixes: 0784510f741 ("riscv: sifive: unleashed: Switch to use binman to generate u-boot.itb") Suggested-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Yao Zi <ziyao@disroot.org> --- arch/riscv/dts/binman.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)