diff options
| author | Tom Rini <[email protected]> | 2023-10-11 10:21:33 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-10-11 10:21:33 -0400 |
| commit | 5ae883c7160cf8b0604ec6d03798dd90fc81ee38 (patch) | |
| tree | ae73bc9a0ce880b85ab4898438dd99cf33194f7e /include | |
| parent | be98a786b67dfcccde1f18ec7cbfe1584e03cebe (diff) | |
| parent | 131e44c5448fb0ba9f8b6084cb848a84d729b2c5 (diff) | |
Merge tag 'fsl-qoirq-2023-10-10' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq
Drop legacy PPA secure FW support
support for MC reserved memory
reset the FLSHxCR1 registers for nxp_fspi
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/ls1046a_common.h | 3 | ||||
| -rw-r--r-- | include/fsl-mc/fsl_mc.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 38fb1d45bcb..867b098a073 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -21,8 +21,7 @@ (defined(CONFIG_NAND_BOOT) || defined(CONFIG_QSPI_BOOT)) #define SPL_NO_MMC #endif -#if defined(CONFIG_SPL_BUILD) && \ - !defined(CONFIG_SPL_FSL_LS_PPA) +#if defined(CONFIG_SPL_BUILD) #define SPL_NO_IFC #endif diff --git a/include/fsl-mc/fsl_mc.h b/include/fsl-mc/fsl_mc.h index c701dc1084b..258738dfc8c 100644 --- a/include/fsl-mc/fsl_mc.h +++ b/include/fsl-mc/fsl_mc.h @@ -66,6 +66,7 @@ int get_mc_boot_status(void); int get_dpl_apply_status(void); int is_lazy_dpl_addr_valid(void); void fdt_fixup_mc_ddr(u64 *base, u64 *size); +void fdt_reserve_mc_mem(void *blob, u32 mc_icid); #ifdef CFG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET int get_aiop_apply_status(void); #endif |