| Message ID | 20230919092847.42391-1-rasmus.villemoes@prevas.dk |
|---|---|
| State | Accepted |
| Commit | 9960d4a5402f511ffc96814b3ca12adc9dd7c2fd |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | imx8mp: binman: rename spl and u-boot nodes | expand |
On 9/19/23 11:28, Rasmus Villemoes wrote: > The hab signing script doc/imx/habv4/csf_examples/mx8m/csf.sh does > > fdtget -t x u-boot.dtb /binman/imx-boot/uboot offset > > to figure out the offset of u-boot.itb inside flash.bin. That works > fine for imx8mm, imx8mn, imx8mq, but fails for imx8mp because in that > case 'uboot' is merely a label and not actually the node name. > > Homogenize these cases and make imx8mp the same as the other imx8m* > variants. The binman type is explicitly given and no longer derived > from the node name, and the csf.sh script will work for all four SOCs. > > Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> > --- > arch/arm/dts/imx8mp-u-boot.dtsi | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi > index 200938a980..355af16cf3 100644 > --- a/arch/arm/dts/imx8mp-u-boot.dtsi > +++ b/arch/arm/dts/imx8mp-u-boot.dtsi > @@ -171,14 +171,16 @@ > filename = "flash.bin"; > pad-byte = <0x00>; > > - spl: blob-ext@1 { > + spl { > filename = "spl.bin"; > offset = <0x0>; > + type = "blob-ext"; > }; > > - uboot: blob-ext@2 { > + binman_uboot: uboot { > filename = "u-boot.itb"; > offset = <0x58000>; > + type = "blob-ext"; > }; > }; > }; Reviewed-by: Marek Vasut <marex@denx.de>
On Tue, Sep 19, 2023 at 6:29 AM Rasmus Villemoes <rasmus.villemoes@prevas.dk> wrote: > > The hab signing script doc/imx/habv4/csf_examples/mx8m/csf.sh does > > fdtget -t x u-boot.dtb /binman/imx-boot/uboot offset > > to figure out the offset of u-boot.itb inside flash.bin. That works > fine for imx8mm, imx8mn, imx8mq, but fails for imx8mp because in that > case 'uboot' is merely a label and not actually the node name. > > Homogenize these cases and make imx8mp the same as the other imx8m* > variants. The binman type is explicitly given and no longer derived > from the node name, and the csf.sh script will work for all four SOCs. > > Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Reviewed-by: Fabio Estevam <festevam@denx.de>
> The hab signing script doc/imx/habv4/csf_examples/mx8m/csf.sh does > fdtget -t x u-boot.dtb /binman/imx-boot/uboot offset > to figure out the offset of u-boot.itb inside flash.bin. That works > fine for imx8mm, imx8mn, imx8mq, but fails for imx8mp because in that > case 'uboot' is merely a label and not actually the node name. > Homogenize these cases and make imx8mp the same as the other imx8m* > variants. The binman type is explicitly given and no longer derived > from the node name, and the csf.sh script will work for all four SOCs. > Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> > Reviewed-by: Marek Vasut <marex@denx.de> > Reviewed-by: Fabio Estevam <festevam@denx.de> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi index 200938a980..355af16cf3 100644 --- a/arch/arm/dts/imx8mp-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-u-boot.dtsi @@ -171,14 +171,16 @@ filename = "flash.bin"; pad-byte = <0x00>; - spl: blob-ext@1 { + spl { filename = "spl.bin"; offset = <0x0>; + type = "blob-ext"; }; - uboot: blob-ext@2 { + binman_uboot: uboot { filename = "u-boot.itb"; offset = <0x58000>; + type = "blob-ext"; }; }; };
The hab signing script doc/imx/habv4/csf_examples/mx8m/csf.sh does fdtget -t x u-boot.dtb /binman/imx-boot/uboot offset to figure out the offset of u-boot.itb inside flash.bin. That works fine for imx8mm, imx8mn, imx8mq, but fails for imx8mp because in that case 'uboot' is merely a label and not actually the node name. Homogenize these cases and make imx8mp the same as the other imx8m* variants. The binman type is explicitly given and no longer derived from the node name, and the csf.sh script will work for all four SOCs. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> --- arch/arm/dts/imx8mp-u-boot.dtsi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)