From 845222f739ae637a45fc4cf2c5a1e8de94f743a6 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Mon, 25 Jul 2022 23:18:47 -0500 Subject: payloads/tianocore: Fix bootsplash/logo handling commit 108e53792804 ("payloads/tianocore: Add a proper target for the Boot Splash") introduced 2 bugs in bootsplash handling: - the "logo" make target added a spurious "/edk2" to the project dir - the "logo" make target failed to account for the case where no user- defined logo file is used (the upstream Tianocore one will be used in this case) Fix both these issues. Test: build/boot qemu w/Tianocore w/o user-defined bootsplash file. Change-Id: Ieebc547670213459823f58956ae87c6bf94b74ef Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/66142 Tested-by: build bot (Jenkins) Reviewed-by: Sean Rhodes Reviewed-by: Lean Sheng Tan --- payloads/external/tianocore/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'payloads') diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index 595843f3ecbb..f78e30756584 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -136,8 +136,9 @@ update: $(project_dir) fi; \ git submodule update --init --checkout -logo: $(project_dir)/edk2 +logo: $(project_dir) case "$(CONFIG_TIANOCORE_BOOTSPLASH_FILE)" in \ + "") ;; \ /*) convert -background None $(CONFIG_TIANOCORE_BOOTSPLASH_FILE) \ BMP3:$(project_dir)/MdeModulePkg/Logo/Logo.bmp;; \ *) convert -background None $(top)/$(CONFIG_TIANOCORE_BOOTSPLASH_FILE) \ -- cgit v1.2.3