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

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@altera.com>
Reviewed-by: Tien Fong Chee <tien.fong.chee@altera.com>
This commit is contained in:
Dinesh Maniyam 2026-02-03 15:55:57 +08:00 committed by Tom Rini
parent 4696a38bef
commit 044d6a800e
2 changed files with 39 additions and 1 deletions

View File

@ -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

View File

@ -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"