sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

payloads/edk2: Convert UefiPayloadPkg to a file target

Browse Source 
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>
This commit is contained in:
Sean Rhodes
2022-08-02 09:12:13 +01:00
committed by Felix Held
parent 4dfcd7acdc
commit 306550dac9
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
payloads/external/Makefile.inc vendored
View File

@@ -154,8 +154,8 @@ payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(D
# edk2 # edk2
$(obj)/UEFIPAYLOAD.fd edk2: $(DOTCONFIG) $(obj)/UEFIPAYLOAD.fd: $(DOTCONFIG)
$(MAKE) -C payloads/external/edk2 all \ $(MAKE) -C payloads/external/edk2 UefiPayloadPkg \
HOSTCC="$(HOSTCC)" \ HOSTCC="$(HOSTCC)" \
CC="$(HOSTCC)" \ CC="$(HOSTCC)" \
CONFIG_EDK2_REPOSITORY=$(CONFIG_EDK2_REPOSITORY) \ CONFIG_EDK2_REPOSITORY=$(CONFIG_EDK2_REPOSITORY) \
@@ -190,7 +190,6 @@ $(obj)/UEFIPAYLOAD.fd edk2: $(DOTCONFIG)
OBJCOPY_arm=$(OBJCOPY_arm) \ OBJCOPY_arm=$(OBJCOPY_arm) \
OBJCOPY_arm64=$(OBJCOPY_arm64) \ OBJCOPY_arm64=$(OBJCOPY_arm64) \
MFLAGS= MAKEFLAGS= MFLAGS= MAKEFLAGS=
mv payloads/external/edk2/workspace/output/UEFIPAYLOAD.fd $@
# FILO # FILO

22
payloads/external/edk2/Makefile vendored
View File

@@ -98,7 +98,7 @@ ifneq ($(CONFIG_EDK2_CUSTOM_BUILD_PARAMS),)
BUILD_STR += $(CONFIG_EDK2_CUSTOM_BUILD_PARAMS) BUILD_STR += $(CONFIG_EDK2_CUSTOM_BUILD_PARAMS)
endif endif
all: clean build all: UefiPayloadPkg
$(WORKSPACE): $(WORKSPACE):
mkdir -p $(WORKSPACE) mkdir -p $(WORKSPACE)
@@ -179,12 +179,22 @@ prep: clean checktools logo update
cat ../tools_def.txt >> $(EDK2_PATH)/Conf/tools_def.txt; \ cat ../tools_def.txt >> $(EDK2_PATH)/Conf/tools_def.txt; \
fi; \ fi; \
build: prep print $(WORKSPACE)/Build/UefiPayloadPkgX64/$(RELEASE_STR)_COREBOOT/FV/UEFIPAYLOAD.fd: \
prep print
cd $(WORKSPACE); \ cd $(WORKSPACE); \
source $(EDK2_PATH)/edksetup.sh; \ source $(EDK2_PATH)/edksetup.sh; \
build -b $(RELEASE_STR) $(BUILD_STR); \ echo -n "EDK2: Building... "; \
mkdir -p $(WORKSPACE)/output; \ build -b $(RELEASE_STR) $(BUILD_STR) \
mv $(WORKSPACE)/Build/UefiPayloadPkgX64/$(RELEASE_STR)_COREBOOT/FV/UEFIPAYLOAD.fd $(WORKSPACE)/output -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: clean:
test -d $(WORKSPACE) && (cd $(WORKSPACE); rm -rf Build; rm -f Conf/tools_def.txt) || exit 0 test -d $(WORKSPACE) && (cd $(WORKSPACE); rm -rf Build; rm -f Conf/tools_def.txt) || exit 0
@@ -192,4 +202,4 @@ clean:
distclean: distclean:
rm -rf $(WORKSPACE) rm -rf $(WORKSPACE)
.PHONY: all update checktools config build clean distclean logo .PHONY: update logo checktools UefiPayloadPkg clean distclean