Hi Quentin, On 2025-04-09 11:15, Quentin Schulz wrote: > Hi Jonas, Simon, > > On 3/29/25 4:06 PM, Jonas Karlman wrote: >> From: Simon Glass <[email protected]> >> >> The U-Boot image is currently being identified as an invalid OS in >> spl_fit_image_get_os() due to case sensitive compare. >> >> Use the correct lower-case value to fix this. >> >> Fixes: e0c0efff2a02 ("rockchip: Support building the all output files in >> binman") >> Signed-off-by: Simon Glass <[email protected]> >> Signed-off-by: Jonas Karlman <[email protected]> >> --- >> Changes in v4: >> - Update commit message >> - Split from "VBE serial part H: Implement VBE on Rockchip RK3399" >> --- >> arch/arm/dts/rockchip-u-boot.dtsi | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/arch/arm/dts/rockchip-u-boot.dtsi >> b/arch/arm/dts/rockchip-u-boot.dtsi >> index c8c928c7e508..e9ed1d4b5738 100644 >> --- a/arch/arm/dts/rockchip-u-boot.dtsi >> +++ b/arch/arm/dts/rockchip-u-boot.dtsi >> @@ -50,7 +50,7 @@ >> u-boot { >> description = "U-Boot"; >> type = "standalone"; >> - os = "U-Boot"; >> + os = "u-boot"; > > It seems like it's not the only place where this is wrong? > > $ git grep 'os.*=.*U-Boot' > arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi: > os = "U-Boot"; > arch/arm/dts/k3-am65-iot2050-boot-image.dtsi: > os = "U-Boot"; > arch/arm/dts/k3-binman.dtsi: os = > "U-Boot"; > arch/arm/dts/k3-binman.dtsi: os = > "U-Boot"; > arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi: > os = "U-Boot"; > arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi: > os = "U-Boot"; > arch/riscv/dts/binman.dtsi: os = > "U-Boot"; > tools/binman/entries.rst: os = "U-Boot"; > tools/binman/etype/fit.py: os = "U-Boot"; > tools/binman/test/343_fit_encrypt_data.dts: > os = "U-Boot"; > tools/binman/test/344_fit_encrypt_data_no_key.dts: > os = "U-Boot"; > > So we should probably fix those as well.
I agree, this should probably be fixed for all device tree files (in a separate series). The default handling in SPL is to do the same thing for unknown and u-boot image type, so should not be any effect, unless there is a future code change that may depend on correct image type. (something I think the VBE part of original series may have done). Regards, Jonas > > Cheers, > Quentin
