pickman: Record cherry-pick of 4 commits from us/next

- b841e559cd Prepare v2025.01-rc4 - 28a620d281 board: rpi: Pass CMA through from firmware DT - 6a5fc32fd2 board: rpi: Enable capsule updates - 26512629fb Merge tag 'rpi-2025.01-rc5' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi
Merge tag 'rpi-2025.01-rc5' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi
2025-12-17 11:05:47 -07:00 · 2025-12-17 11:05:47 -07:00 · 2025-12-17 11:05:47 -07:00 · 2025-12-17 11:05:47 -07:00 · 2025-12-17 11:05:42 -07:00
7 changed files with 118 additions and 2 deletions
--- a/.pickman-history
+++ b/.pickman-history
@@ -541,3 +541,74 @@ All 13 commits were successfully cherry-picked from `us/next` to branch `cherry-

 ---

+## 2025-12-17: us/next
+
+Branch: cherry-b841e559cd2
+
+Commits:
+- b841e559cd2 Prepare v2025.01-rc4
+- 28a620d2815 board: rpi: Pass CMA through from firmware DT
+- 6a5fc32fd20 board: rpi: Enable capsule updates
+- 26512629fb3 Merge tag 'rpi-2025.01-rc5' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi
+
+### Conversation log
+The repository is clean. Now let me create and checkout the new branch based on ci/master:
+
+Now let me cherry-pick the first commit:
+
+There's a conflict in the Makefile. Let me examine it:
+
+This is a simple version conflict. The base branch has PATCHLEVEL = 12 (newer version) and the cherry-picked commit is trying to set EXTRAVERSION = -rc4 for an older release. Let me resolve this by keeping the current base PATCHLEVEL (12) and adding the EXTRAVERSION from the cherry-picked commit:
+
+Let me resolve this conflict. Since we're cherry-picking to add the -rc4 release tag functionality, I'll take the EXTRAVERSION = -rc4 from the incoming commit:
+
+Now let me resolve the conflict by taking the EXTRAVERSION = -rc4 from the incoming commit:
+
+There's a duplicate NAME = line. Let me fix that:
+
+Now let me add the file and continue the cherry-pick:
+
+Now let me amend the commit to note the fix-up:
+
+Now let me cherry-pick the second commit:
+
+Now the third commit:
+
+Now let me check if the fourth commit is a merge commit:
+
+Yes, this is a merge commit. Let me use the correct options:
+
+The merge commit is empty (as expected since we already have the changes from the individual commits). Let me commit it as an empty commit to preserve the merge history:
+
+All cherry-picks are done. Let me verify with git log:
+
+All 4 commits are present. Now let me run the build to verify:
+
+Build completed successfully. Let me provide the final status:
+
+## Final Status
+
+### Cherry-pick Results
+All 4 commits successfully cherry-picked from `us/next` branch to new branch `cherry-b841e559cd2`:
+
+| Commit | Subject | Status |
+|--------|---------|--------|
+| b841e559cd2 | Prepare v2025.01-rc4 | ✅ (conflict resolved) |
+| 28a620d2815 | board: rpi: Pass CMA through from firmware DT | ✅ |
+| 6a5fc32fd20 | board: rpi: Enable capsule updates | ✅ |
+| 26512629fb3 | Merge tag 'rpi-2025.01-rc5' | ✅ (empty merge commit preserved) |
+
+### Fix-ups Made
+1. **Makefile conflict** in commit `b841e559cd2`:
+   - Conflict: PATCHLEVEL was 01 in original commit, but base branch has PATCHLEVEL=12
+   - Resolution: Kept PATCHLEVEL=12, applied EXTRAVERSION=-rc4
+   - Note added to commit message
+
+### Build Result
+✅ **OK** - Build completed successfully for sandbox board with no warnings or errors.
+
+### Branch Status
+The branch `cherry-b841e559cd2` is ready for pushing with 4 new commits ahead of `ci/master`.
+
+---
+
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -68,6 +68,19 @@ struct msg_get_clock_rate {
 	u32 end_tag;
 };

+struct efi_fw_image fw_images[] = {
+	{
+		.fw_name = u"RPI_UBOOT",
+		.image_index = 1,
+	},
+};
+
+struct efi_capsule_update_info update_info = {
+	.dfu_string = "mmc 0=u-boot.bin fat 0 1",
+	.num_images = ARRAY_SIZE(fw_images),
+	.images = fw_images,
+};
+
 #ifdef CONFIG_ARM64
 #define DTB_DIR "broadcom/"
 #else
@@ -544,12 +557,15 @@ void  update_fdt_from_fw(void *fdt, void *fw_fdt)
 	if (fdt == fw_fdt)
 		return;

-	/* The firmware provides a more precie model; so copy that */
+	/* The firmware provides a more precise model; so copy that */
 	copy_property(fdt, fw_fdt, "/", "model");

 	/* memory reserve as suggested by the firmware */
 	copy_property(fdt, fw_fdt, "/", "memreserve");

+	/* copy the CMA memory setting from the firmware DT to linux */
+	copy_property(fdt, fw_fdt, "/reserved-memory/linux,cma", "size");
+
 	/* Adjust dma-ranges for the SD card and PCI bus as they can depend on
 	 * the SoC revision
 	 */
--- a/configs/rpi_3_b_plus_defconfig
+++ b/configs/rpi_3_b_plus_defconfig
@@ -19,14 +19,19 @@ CONFIG_SYS_PBSIZE=1049
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_MISC_INIT_R=y
 CONFIG_SYS_PROMPT="U-Boot> "
+CONFIG_CMD_NVEDIT_EFI=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_EFIDEBUG=y
 CONFIG_CMD_FS_UUID=y
 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_TFTP_TSIZE=y
+CONFIG_DFU_MMC=y
+CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000
+CONFIG_SYS_DFU_MAX_FILE_SIZE=0x200000
 CONFIG_BCM2835_GPIO=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCM2835=y
@@ -49,3 +54,6 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_BCM2835=y
 CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_PHYS_TO_BUS=y
+# CONFIG_HEXDUMP is not set
+CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
+CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -19,14 +19,19 @@ CONFIG_SYS_PBSIZE=1049
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_MISC_INIT_R=y
 CONFIG_SYS_PROMPT="U-Boot> "
+CONFIG_CMD_NVEDIT_EFI=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_EFIDEBUG=y
 CONFIG_CMD_FS_UUID=y
 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_TFTP_TSIZE=y
+CONFIG_DFU_MMC=y
+CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000
+CONFIG_SYS_DFU_MAX_FILE_SIZE=0x200000
 CONFIG_BCM2835_GPIO=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCM2835=y
@@ -49,3 +54,6 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_BCM2835=y
 CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_PHYS_TO_BUS=y
+# CONFIG_HEXDUMP is not set
+CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
+CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
--- a/configs/rpi_4_defconfig
+++ b/configs/rpi_4_defconfig
@@ -20,11 +20,13 @@ CONFIG_SYS_PBSIZE=1049
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_MISC_INIT_R=y
 CONFIG_SYS_PROMPT="U-Boot> "
+CONFIG_CMD_NVEDIT_EFI=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_EFIDEBUG=y
 CONFIG_CMD_FS_UUID=y
 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
@@ -65,3 +67,6 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_BCM2835=y
 CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_PHYS_TO_BUS=y
+# CONFIG_HEXDUMP is not set
+CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
+CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
--- a/configs/rpi_arm64_defconfig
+++ b/configs/rpi_arm64_defconfig
@@ -18,15 +18,20 @@ CONFIG_SYS_PBSIZE=1049
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_MISC_INIT_R=y
 CONFIG_SYS_PROMPT="U-Boot> "
+CONFIG_CMD_NVEDIT_EFI=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_EFIDEBUG=y
 CONFIG_CMD_FS_UUID=y
 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_TFTP_TSIZE=y
 CONFIG_DM_DMA=y
+CONFIG_DFU_MMC=y
+CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000
+CONFIG_SYS_DFU_MAX_FILE_SIZE=0x200000
 CONFIG_BCM2835_GPIO=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
@@ -56,3 +61,6 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_BCM2835=y
 CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_PHYS_TO_BUS=y
+# CONFIG_HEXDUMP is not set
+CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
+CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
--- a/doc/develop/release_cycle.rst
+++ b/doc/develop/release_cycle.rst
@@ -73,7 +73,7 @@ For the next scheduled release, release candidates were made on::

 * U-Boot v2025.01-rc3 was released on Mon 25 November 2024.

-.. * U-Boot v2025.01-rc4 was released on Mon 09 December 2024.
+* U-Boot v2025.01-rc4 was released on Mon 09 December 2024.

 .. * U-Boot v2025.01-rc5 was released on Mon 23 December 2024.
Author	SHA1	Message	Date
Simon Glass	05fd9df66b	pickman: Record cherry-pick of 4 commits from us/next - `b841e559cd` Prepare v2025.01-rc4 - `28a620d281` board: rpi: Pass CMA through from firmware DT - `6a5fc32fd2` board: rpi: Enable capsule updates - `26512629fb` Merge tag 'rpi-2025.01-rc5' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi	2025-12-17 11:05:47 -07:00
Tom Rini	7a2f6c9624	Merge tag 'rpi-2025.01-rc5' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi Updates for RPi for 2025.01: - Enable capsule updates - Pass CMA through from firmware DT (cherry picked from commit `26512629fb`)	2025-12-17 11:05:47 -07:00
Ilias Apalodimas	1b6ba514cc	board: rpi: Enable capsule updates Since RPI works well using EFI and has no size limitations with regards to U-Boot, add the needed structures to support capsule updates. While at it update the most commonly used defconfigs and include capsule support and U-Boot commands needed by EFI Tested-by: Sughosh Ganu <sughosh.ganu@linaro.org> Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> (cherry picked from commit `6a5fc32fd2`)	2025-12-17 11:05:47 -07:00
Peter Robinson	499a8a4c9e	board: rpi: Pass CMA through from firmware DT For a lot of usecases, such as display, camera, media the Raspberry Pi needs a lot more CMA than distros configure as default so we should pass this parameter through so things work as expected. Fix a spelling mistake while we're at it. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> Acked-by: Matthias Brugger <mbrugger@suse.com> (cherry picked from commit `28a620d281`)	2025-12-17 11:05:47 -07:00
Tom Rini	35f4d47308	Prepare v2025.01-rc4 Signed-off-by: Tom Rini <trini@konsulko.com> (cherry picked from commit `b841e559cd`) [Fixed conflict in Makefile: kept PATCHLEVEL=12, applied EXTRAVERSION=-rc4]	2025-12-17 11:05:42 -07:00