From: Dinesh Maniyam <[email protected]> rsu_dtb() locates the RSU-managed boot partition by scanning every fixed-partitions node for the "Boot and fpga data" label, falling back to the legacy rsu-handle phandle only when no label matches.
Relabel the Agilex5 SoCDK qspi_boot partition from "u-boot" to "Boot and fpga data" so the primary label scan resolves on the local DTB. The unrelated NAND "u-boot" partition is left untouched. Stratix10 already carries the matching label (aligned with the upstream Linux DTS), and the other SoC64 SoCDKs are not in mainline yet. While here, drop the redundant fixed-partitions override from socfpga_agilex_socdk-u-boot.dtsi: the Agilex SoCDK consumes its devicetree from the upstream source tree, which already defines the QSPI partitions, so the U-Boot overlay copy only risked drift. Signed-off-by: Dinesh Maniyam <[email protected]> --- arch/arm/dts/socfpga_agilex5_socdk.dts | 2 +- arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/arch/arm/dts/socfpga_agilex5_socdk.dts b/arch/arm/dts/socfpga_agilex5_socdk.dts index 886cc89fdb6..483760b6763 100644 --- a/arch/arm/dts/socfpga_agilex5_socdk.dts +++ b/arch/arm/dts/socfpga_agilex5_socdk.dts @@ -158,7 +158,7 @@ #size-cells = <1>; qspi_boot: partition@0 { - label = "u-boot"; + label = "Boot and fpga data"; reg = <0x0 0x04200000>; }; diff --git a/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi index f2150b7eb7b..75d3aa08267 100644 --- a/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi +++ b/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi @@ -164,22 +164,6 @@ cdns,tchsh-ns = <4>; cdns,tslch-ns = <4>; /delete-property/ cdns,read-delay; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - qspi_boot: partition@0 { - label = "u-boot"; - reg = <0x0 0x04200000>; - }; - - root: partition@4200000 { - label = "root"; - reg = <0x04200000 0x0BE00000>; - }; - }; }; #if !defined(CONFIG_SOCFPGA_SECURE_VAB_AUTH) -- 2.43.7
