On Tuesday 22 March 2022 11:58:56 Robert Marko wrote:
> Partition currently called "uboot" does not only contain U-boot, but
> rather it contains TF-A, U-boot and U-boot environment.
>
> So, to avoid accidentally deleting the U-boot environment which is
> located at 0x180000 split the partition.
>
> "uboot" is not the correct name as you can't boot these boards with U-boot
> only, TF-A must be present as well, so rename the "uboot" partition to
> "firmware".
>
> While we are here, describe the NOR node as "spi-flash@0" instead of
> "m25p80@0" which is the old SPI-NOR driver name.
>
> This won't break booting for existing devices as the SoC-s BootROM is not
> partition aware at all, it will simply try booting from 0x0 of the
> boot device that is set by bootstrap pins.
>
> This will however prevent accidental or automated flashing of just U-boot
> to the partition.
>
> Signed-off-by: Robert Marko <robert.marko@xxxxxxxxxx>
Reviewed-by: Pali Rohár <pali@xxxxxxxxxx>
> ---
> Changes in v2:
> * Update the commit description by adressing ABI breaking concerns
> ---
> arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
> index 95d46e8d081c..ac64949bb53e 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
> @@ -99,7 +99,7 @@ &spi0 {
> pinctrl-names = "default";
> pinctrl-0 = <&spi_quad_pins>;
>
> - m25p80@0 {
> + spi-flash@0 {
> compatible = "jedec,spi-nor";
> reg = <0>;
> spi-max-frequency = <54000000>;
> @@ -108,10 +108,15 @@ partitions {
> compatible = "fixed-partitions";
> #address-cells = <1>;
> #size-cells = <1>;
> - /* only bootloader is located on the SPI */
> +
> partition@0 {
> - label = "uboot";
> - reg = <0 0x400000>;
> + label = "firmware";
> + reg = <0x0 0x180000>;
> + };
> +
> + partition@180000 {
> + label = "u-boot-env";
> + reg = <0x180000 0x10000>;
> };
> };
> };
> --
> 2.35.1
>
