[PATCH] arm: socfpga: agilex: restore Multi-DTB support for NAND boot

[Chee, Tien Fong]

On 3/2/2026 3:55 pm, dinesh.maniyam at altera.com wrote:
> From: Dinesh Maniyam <dinesh.maniyam at altera.com>
>
>  From v2025.10 onward, Agilex platforms use the upstream Linux device
> tree sources instead of local copies.
> To continue using a single defconfig while supporting NAND boot,
> restore Multi-DTB support and update the DT paths to the upstream
> intel directory.
>
> NAND boot is configured to use FDT-1, while other boot flows
> continue to use the default device tree.
> No functional change is intended for non-NAND boot paths.
>
> Signed-off-by: Dinesh Maniyam <dinesh.maniyam at altera.com>
> ---
>   arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi | 38 +++++++++++++++++++
>   configs/socfpga_agilex_defconfig              |  2 +-
>   2 files changed, 39 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi
> index 6f2fe7bf746..37a3b14ed33 100644
> --- a/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi
> +++ b/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi
> @@ -181,3 +181,41 @@
>   		};
>   	};
>   };
> +
> +#if !defined(CONFIG_SOCFPGA_SECURE_VAB_AUTH)
> +&fdt_0_blob {
> +	filename = "dts/upstream/src/arm64/intel/socfpga_agilex_socdk.dtb";
> +};
> +
> +&images {
> +	fdt-1 {
> +		description = "socfpga_socdk_nand";
> +		type = "flat_dt";
> +		compression = "none";
> +		fdt_1_blob: blob-ext {
> +			filename = "dts/upstream/src/arm64/intel/socfpga_agilex_socdk_nand.dtb";
> +		};
> +		hash {
> +			algo = "crc32";
> +		};
> +	};
> +};
> +
> +&board_config {
> +	board-1 {
> +		description = "board_1";
> +		firmware = "atf";
> +		loadables = "uboot";
> +		fdt = "fdt-1";
> +		signature {
> +			algo = "crc32";
> +			key-name-hint = "dev";
> +			sign-images = "atf", "uboot", "fdt-1";
> +		};
> +	};
> +};
> +
> +&binman {
> +	/delete-node/ kernel;
> +};
> +#endif
> diff --git a/configs/socfpga_agilex_defconfig b/configs/socfpga_agilex_defconfig
> index eb99392f0ea..b2c7b30d546 100644
> --- a/configs/socfpga_agilex_defconfig
> +++ b/configs/socfpga_agilex_defconfig
> @@ -58,7 +58,7 @@ CONFIG_CMD_CACHE=y
>   CONFIG_CMD_SMC=y
>   CONFIG_CMD_UBI=y
>   CONFIG_OF_UPSTREAM=y
> -CONFIG_OF_LIST=""
> +CONFIG_OF_LIST="intel/socfpga_agilex_socdk intel/socfpga_agilex_socdk_nand"
>   CONFIG_ENV_IS_IN_FAT=y
>   CONFIG_ENV_IS_IN_UBI=y
>   CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"


Reviewed-by: Tien Fong Chee <tien.fong.chee at altera.com>


Best regards,
Tien Fong