From ae5a46f56ad476a59bf999283f7cf3afdccd0b91 Mon Sep 17 00:00:00 2001 From: Sergii Dmytruk Date: Fri, 30 Jan 2026 01:02:10 +0200 Subject: [PATCH] payloads/edk2: copy BOOTSPLASH_REGION_LOGO_FILE as a capsule logo Change-Id: Iaccb60dedad5ea089f297968e7c0778b052d87de Upstream-Status: Inappropriate [Dasharo downstream] Signed-off-by: Sergii Dmytruk --- payloads/external/Makefile.mk | 3 ++- payloads/external/edk2/Makefile | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/payloads/external/Makefile.mk b/payloads/external/Makefile.mk index 44434b0464..9654202a23 100644 --- a/payloads/external/Makefile.mk +++ b/payloads/external/Makefile.mk @@ -304,7 +304,8 @@ $(obj)/UEFIPAYLOAD.fd: $(DOTCONFIG) $(IPXE_EFI) CONFIG_EDK2_FW_VERSION=L"$(CONFIG_LOCALVERSION)" \ CONFIG_EDK2_FW_VENDOR=L"$(CONFIG_BIOS_VENDOR)" \ CONFIG_EDK2_FW_RELEASE_DATE=L"$(call get_build_value,COREBOOT_DMI_DATE)" \ - CONFIG_EDK2_FW_REVISION=$(shell printf 0x"%04x%04x" $(DASHARO_MAJOR_VERSION) $(DASHARO_MINOR_VERSION)) + CONFIG_EDK2_FW_REVISION=$(shell printf 0x"%04x%04x" $(DASHARO_MAJOR_VERSION) $(DASHARO_MINOR_VERSION)) \ + CONFIG_BOOTSPLASH_REGION_LOGO_FILE=$(CONFIG_BOOTSPLASH_REGION_LOGO_FILE) $(obj)/ShimmedUniversalPayload.elf: $(DOTCONFIG) diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile index b964666f3d..cc3651997e 100644 --- a/payloads/external/edk2/Makefile +++ b/payloads/external/edk2/Makefile @@ -524,6 +524,9 @@ $(EDK2_PATH): $(WORKSPACE) fi cd $(EDK2_PATH); \ git checkout -- MdeModulePkg/Logo/Logo.bmp > /dev/null 2>&1 || true; \ + if [ "$(CONFIG_EDK2_CAPSULES_V2)" = y ]; then \ + git checkout -- DasharoPayloadPkg/CapsuleSplashDxe/Logo.bmp > /dev/null 2>&1 || true; \ + fi; \ if [ -e $(PAYLOAD_NAME)/ShimLayer/UniversalPayload.o ]; then \ rm $(PAYLOAD_NAME)/ShimLayer/UniversalPayload.o; \ fi; \ @@ -549,7 +552,17 @@ logo: $(EDK2_PATH) BMP3:$(EDK2_PATH)/MdeModulePkg/Logo/Logo.bmp;; \ *) convert -background None $(top)/$(CONFIG_EDK2_BOOTSPLASH_FILE) \ BMP3:$(EDK2_PATH)/MdeModulePkg/Logo/Logo.bmp;; \ - esac \ + esac; \ + if [ "$(CONFIG_EDK2_CAPSULES_V2)" = y ]; then \ + case "$(CONFIG_BOOTSPLASH_REGION_LOGO_FILE)" in \ + "") cp $(EDK2_PATH)/MdeModulePkg/Logo/Logo.bmp \ + $(EDK2_PATH)/DasharoPayloadPkg/CapsuleSplashDxe/Logo.bmp;; \ + /*) magick -background None $(CONFIG_BOOTSPLASH_REGION_LOGO_FILE) \ + BMP3:$(EDK2_PATH)/DasharoPayloadPkg/CapsuleSplashDxe/Logo.bmp;; \ + *) magick -background None $(top)/$(CONFIG_BOOTSPLASH_REGION_LOGO_FILE) \ + BMP3:$(EDK2_PATH)/DasharoPayloadPkg/CapsuleSplashDxe/Logo.bmp;; \ + esac \ + fi gop_driver: $(EDK2_PATH) if [ -n "$(CONFIG_EDK2_GOP_DRIVER)" ]; then \