diff options
| author | Sean Rhodes <sean@starlabs.systems> | 2022-08-02 09:12:13 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-09-01 14:11:57 +0000 |
| commit | 306550dac93e9de8cea4b82a2874898499987ba4 (patch) | |
| tree | 33660c230ebdbdc471391832ef43e37c35e18127 | |
| parent | 4dfcd7acdc705994cd20c27d5e3edfae31672b64 (diff) | |
payloads/edk2: Convert UefiPayloadPkg to a file target
Convert UefiPayloadPkg (UEFIPAYLOAD.fd) to a file target.
There is no functional change here, it just avoids it being copied
out of the build dir, into an output directory and then into build.
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Change-Id: Iff097f6f1e715c697c33c50c395d7c1b88cc6280
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66360
Reviewed-by: Martin Roth <martin.roth@amd.corp-partner.google.com>
Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | payloads/external/Makefile.inc | 5 | ||||
| -rw-r--r-- | payloads/external/edk2/Makefile | 22 |
2 files changed, 18 insertions, 9 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index f964bdaab5..6720f30630 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -154,8 +154,8 @@ payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(D # edk2 -$(obj)/UEFIPAYLOAD.fd edk2: $(DOTCONFIG) - $(MAKE) -C payloads/external/edk2 all \ +$(obj)/UEFIPAYLOAD.fd: $(DOTCONFIG) + $(MAKE) -C payloads/external/edk2 UefiPayloadPkg \ HOSTCC="$(HOSTCC)" \ CC="$(HOSTCC)" \ CONFIG_EDK2_REPOSITORY=$(CONFIG_EDK2_REPOSITORY) \ @@ -190,7 +190,6 @@ $(obj)/UEFIPAYLOAD.fd edk2: $(DOTCONFIG) OBJCOPY_arm=$(OBJCOPY_arm) \ OBJCOPY_arm64=$(OBJCOPY_arm64) \ MFLAGS= MAKEFLAGS= - mv payloads/external/edk2/workspace/output/UEFIPAYLOAD.fd $@ # FILO diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile index 7711e72fdd..9ee9b441db 100644 --- a/payloads/external/edk2/Makefile +++ b/payloads/external/edk2/Makefile @@ -98,7 +98,7 @@ ifneq ($(CONFIG_EDK2_CUSTOM_BUILD_PARAMS),) BUILD_STR += $(CONFIG_EDK2_CUSTOM_BUILD_PARAMS) endif -all: clean build +all: UefiPayloadPkg $(WORKSPACE): mkdir -p $(WORKSPACE) @@ -179,12 +179,22 @@ prep: clean checktools logo update cat ../tools_def.txt >> $(EDK2_PATH)/Conf/tools_def.txt; \ fi; \ -build: prep print +$(WORKSPACE)/Build/UefiPayloadPkgX64/$(RELEASE_STR)_COREBOOT/FV/UEFIPAYLOAD.fd: \ + prep print cd $(WORKSPACE); \ source $(EDK2_PATH)/edksetup.sh; \ - build -b $(RELEASE_STR) $(BUILD_STR); \ - mkdir -p $(WORKSPACE)/output; \ - mv $(WORKSPACE)/Build/UefiPayloadPkgX64/$(RELEASE_STR)_COREBOOT/FV/UEFIPAYLOAD.fd $(WORKSPACE)/output + echo -n "EDK2: Building... "; \ + build -b $(RELEASE_STR) $(BUILD_STR) \ + -y $(WORKSPACE)/Build/UefiPayloadPkgX64/UEFIPAYLOAD.txt; \ + if [ ! -f $@ ]; then \ + echo "Failed!"; \ + exit 1; \ + fi + echo "Success!"; \ + +UefiPayloadPkg: $(WORKSPACE)/Build/UefiPayloadPkgX64/$(RELEASE_STR)_COREBOOT/FV/UEFIPAYLOAD.fd + mv $(WORKSPACE)/Build/UefiPayloadPkgX64/$(RELEASE_STR)_COREBOOT/FV/UEFIPAYLOAD.fd \ + ../../../build/UEFIPAYLOAD.fd clean: test -d $(WORKSPACE) && (cd $(WORKSPACE); rm -rf Build; rm -f Conf/tools_def.txt) || exit 0 @@ -192,4 +202,4 @@ clean: distclean: rm -rf $(WORKSPACE) -.PHONY: all update checktools config build clean distclean logo +.PHONY: update logo checktools UefiPayloadPkg clean distclean |