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
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
[build-system]
|
||||
requires = ["setuptools>=61.0"]
|
||||
requires = ["setuptools>=78.1.1"]
|
||||
build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[build-system]
|
||||
requires = ["setuptools>=61.0"]
|
||||
requires = ["setuptools>=78.1.1"]
|
||||
build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[build-system]
|
||||
requires = ["setuptools>=61.0"]
|
||||
requires = ["setuptools>=78.1.1"]
|
||||
build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */
|
||||
// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
|
||||
#include "fdt_host.h"
|
||||
#include "../../scripts/dtc/libfdt/fdt_rw.c"
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[build-system]
|
||||
requires = ["setuptools>=61.0"]
|
||||
requires = ["setuptools>=78.1.1"]
|
||||
build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
|
||||
@@ -76,13 +76,29 @@ struct header0_info_v2 {
|
||||
/**
|
||||
* struct header0_info - header block for boot ROM
|
||||
*
|
||||
* This is stored at SD card block 64 (where each block is 512 bytes, or at
|
||||
* the start of SPI flash. It is encoded with RC4.
|
||||
* This is stored at MMC block 64 (where each block is 512 bytes), or at
|
||||
* the start of SPI flash. It is encoded with RC4 with the below rc4_key.
|
||||
*
|
||||
* In Rockchip terminology:
|
||||
*
|
||||
* "init" means the stage that is loaded into SRAM. TPL if there is one, SPL
|
||||
* otherwise.
|
||||
*
|
||||
* "boot" means the next stages after "init" stage that are loaded by the
|
||||
* BootROM into DRAM. Only applicable if "init" stage returns to BootROM (via
|
||||
* the appropriate ROCKCHIP_BACK_TO_BROM symbol, BOOT_DEVICE_BOOTROM is used as
|
||||
* boot device for the next stage and the "init" stage successfully booted) and
|
||||
* if "init_boot_size" > "init_size".
|
||||
* Basically, it is the content of "init" plus the SPL or even U-Boot proper if
|
||||
* relevant.
|
||||
*
|
||||
* @magic: Magic (must be RK_MAGIC)
|
||||
* @disable_rc4: 0 to use rc4 for boot image, 1 to use plain binary
|
||||
* @init_offset: Offset in blocks of the SPL code from this header
|
||||
* block. E.g. 4 means 2KB after the start of this header.
|
||||
* @init_offset: Offset in 512-byte blocks of the "init" code from the
|
||||
* start of this header. For instance, 4 means 2KiB.
|
||||
* @init_size: Size (in blocks) of the "init" code.
|
||||
* @init_boot_size: Size (in blocks) of the "init" and "boot" code combined.
|
||||
*
|
||||
* Other fields are not used by U-Boot
|
||||
*/
|
||||
struct header0_info {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[build-system]
|
||||
requires = ["setuptools>=61.0"]
|
||||
requires = ["setuptools>=78.1.1"]
|
||||
build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
|
||||
Reference in New Issue
Block a user