diff options
| author | Tom Rini <[email protected]> | 2025-12-18 08:06:10 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-12-18 08:06:10 -0600 |
| commit | 930eff5416ea98ebd09cec73f5d06a7033b4d52e (patch) | |
| tree | 55a54df2e4ee0314b1180d033c7a7bb34726b47a /include | |
| parent | a333d9e59f6675c9541c34643f334dbf50898647 (diff) | |
| parent | 6f419247baa45917fcdd67062e271b8884d8c7aa (diff) | |
Merge tag 'u-boot-socfpga-next-20251217' of https://source.denx.de/u-boot/custodians/u-boot-socfpga into next
This pull request brings together a set of fixes and enhancements across
the SoCFPGA platform family, with a focus on MMC/SPL robustness, EFI
boot enablement, and Agilex5 SD/eMMC support.
CI: https://source.denx.de/u-boot/custodians/u-boot-socfpga/-/pipelines/28776
Highlights:
*
SPL / MMC:
o
Fix Kconfig handling for
SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE
o
Correct raw sector calculations and respect explicit sector values
when loading U-Boot from MMC in SPL
o
Adjust raw MMC loading logic for SoCFPGA platforms
*
EFI boot:
o
Permit EFI booting on SoCFPGA platforms
o
Disable mkeficapsule tool build for Arria 10 where unsupported
*
Agilex5:
o
Upgrade SDHCI controller from SD4HC to SD6HC
o
Enable MMC and Cadence SDHCI support in defconfig
o
Add dedicated eMMC device tree and defconfig for Agilex5 SoCDK
o
Revert incorrect GPIO configuration for SDIO_SEL
o
Refine U-Boot DT handling for SD and eMMC boot variants
*
SPI:
o
Allow disabling the DesignWare SPI driver in SPL via Kconfig
*
Board / configuration fixes:
o
Enable random MAC address generation for Cyclone V
o
Fix DE0-Nano-SoC boot configuration
o
Remove obsolete or conflicting options from multiple legacy
SoCFPGA defconfigs
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/am43xx_evm.h | 5 | ||||
| -rw-r--r-- | include/part.h | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 036995cbb48..99d3ecb3fff 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -148,9 +148,4 @@ #define NANDBOOT #endif /* CONFIG_MTD_RAW_NAND */ -#if defined(CONFIG_TI_SECURE_DEVICE) -/* Avoid relocating onto firewalled area at end of DRAM */ -#define CFG_PRAM (64 * 1024) -#endif /* CONFIG_TI_SECURE_DEVICE */ - #endif /* __CONFIG_AM43XX_EVM_H */ diff --git a/include/part.h b/include/part.h index d940f8b5d0e..daebbbc2e68 100644 --- a/include/part.h +++ b/include/part.h @@ -461,7 +461,8 @@ ulong disk_blk_erase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt); #ifdef CONFIG_XPL_BUILD # define part_print_ptr(x) NULL # if defined(CONFIG_SPL_FS_EXT4) || defined(CONFIG_SPL_FS_FAT) || \ - defined(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION) + defined(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION) || \ + defined(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE) # define part_get_info_ptr(x) x # else # define part_get_info_ptr(x) NULL |