diff options
| author | Dinesh Maniyam <[email protected]> | 2026-02-03 15:55:57 +0800 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-02-14 11:06:45 -0600 |
| commit | 044d6a800edd8ccb1efc3d2e55a0cc4b6824c8f6 (patch) | |
| tree | 4b8f727ff1c885fcda36b8e4e339be3a570ac90a | |
| parent | 4696a38befba6c1ead5bd44b8f92e5456f78124c (diff) | |
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 <[email protected]>
Reviewed-by: Tien Fong Chee <[email protected]>
| -rw-r--r-- | arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi | 38 | ||||
| -rw-r--r-- | configs/socfpga_agilex_defconfig | 2 |
2 files changed, 39 insertions, 1 deletions
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" |