Skip to content

Commit

Permalink
Update workflows to match rebase
Browse files Browse the repository at this point in the history
Update references to these changed UefiPayload build definitions:
- NETWORK_ENABLE: Now upstream's NETWORK_DRIVER_ENABLE
- SMMSTORE added as a VARIABLE_SUPPORT option
- Upstream defines RngLib instance, use CPU_RNG_ENABLE=FALSE in QEMU
  testing

Signed-off-by: Benjamin Doron <benjamin.doron@9elements.com>
  • Loading branch information
benjamindoron committed Jun 12, 2024
1 parent fdc919a commit 37b4fdc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
- name: Build X64 UefiPayload
run: |
source ./edksetup.sh
build -D BOOTLOADER=COREBOOT -a IA32 -a X64 -t GCC5 -b DEBUG -p UefiPayloadPkg/UefiPayloadPkg.dsc
build -D BOOTLOADER=COREBOOT -D VARIABLE_SUPPORT=SMMSTORE -D CPU_RNG_ENABLE=FALSE -a IA32 -a X64 -t GCC5 -b DEBUG -p UefiPayloadPkg/UefiPayloadPkg.dsc
- name: Run binary in QEMU
run: |
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
run: |
if [ "$(grep TPM_ENABLE UefiPayloadPkg/UefiPayloadPkg.dsc)" != "" ]; then
source ./edksetup.sh
build -D BOOTLOADER=COREBOOT -D TPM_ENABLE=TRUE -a IA32 -a X64 -t GCC5 -b DEBUG -p UefiPayloadPkg/UefiPayloadPkg.dsc
build -D BOOTLOADER=COREBOOT -D VARIABLE_SUPPORT=SMMSTORE -D CPU_RNG_ENABLE=FALSE -D TPM_ENABLE=TRUE -a IA32 -a X64 -t GCC5 -b DEBUG -p UefiPayloadPkg/UefiPayloadPkg.dsc
else
echo "TPM not supported"
fi
Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
run: |
if [ "$(grep SECURE_BOOT_ENABLE UefiPayloadPkg/UefiPayloadPkg.dsc)" != "" ]; then
source ./edksetup.sh
build -D BOOTLOADER=COREBOOT -D SECURE_BOOT_ENABLE=TRUE -a IA32 -a X64 -t GCC5 -b DEBUG -p UefiPayloadPkg/UefiPayloadPkg.dsc
build -D BOOTLOADER=COREBOOT -D VARIABLE_SUPPORT=SMMSTORE -D CPU_RNG_ENABLE=FALSE -D SECURE_BOOT_ENABLE=TRUE -a IA32 -a X64 -t GCC5 -b DEBUG -p UefiPayloadPkg/UefiPayloadPkg.dsc
else
echo "SECURE_BOOT_ENABLE not supported"
fi
Expand Down Expand Up @@ -214,16 +214,16 @@ jobs:
- name: Build X64 UefiPayload with Network
run: |
if [ "$(grep NETWORK_ENABLE UefiPayloadPkg/UefiPayloadPkg.dsc)" != "" ]; then
if [ "$(grep NETWORK_DRIVER_ENABLE UefiPayloadPkg/UefiPayloadPkg.dsc)" != "" ]; then
source ./edksetup.sh
build -D BOOTLOADER=COREBOOT -D NETWORK_ENABLE=TRUE -DNETWORK_HTTP_BOOT_ENABLE=FALSE -a IA32 -a X64 -t GCC5 -b DEBUG -p UefiPayloadPkg/UefiPayloadPkg.dsc
build -D BOOTLOADER=COREBOOT -D VARIABLE_SUPPORT=SMMSTORE -D CPU_RNG_ENABLE=FALSE -D NETWORK_DRIVER_ENABLE=TRUE -DNETWORK_HTTP_BOOT_ENABLE=FALSE -a IA32 -a X64 -t GCC5 -b DEBUG -p UefiPayloadPkg/UefiPayloadPkg.dsc
else
echo "NETWORK_ENABLE not supported"
echo "NETWORK_DRIVER_ENABLE not supported"
fi
- name: Run binary in QEMU
run: |
if [ "$(grep NETWORK_ENABLE UefiPayloadPkg/UefiPayloadPkg.dsc)" != "" ]; then
if [ "$(grep NETWORK_DRIVER_ENABLE UefiPayloadPkg/UefiPayloadPkg.dsc)" != "" ]; then
./Testing/test_UefiPayloadPkgQemu.sh Build/UefiPayloadPkgX64/DEBUG_GCC5/FV/UEFIPAYLOAD.fd
else
echo "Not running binary"
Expand Down Expand Up @@ -256,7 +256,7 @@ jobs:
- name: Build X64 UefiPayload in Release mode
run: |
source ./edksetup.sh
build -D BOOTLOADER=COREBOOT -a IA32 -a X64 -t GCC5 -b RELEASE -p UefiPayloadPkg/UefiPayloadPkg.dsc
build -D BOOTLOADER=COREBOOT -D VARIABLE_SUPPORT=SMMSTORE -D CPU_RNG_ENABLE=FALSE -a IA32 -a X64 -t GCC5 -b RELEASE -p UefiPayloadPkg/UefiPayloadPkg.dsc
- name: Run binary in QEMU
run: |
Expand Down Expand Up @@ -289,7 +289,7 @@ jobs:
- name: Build X64 UefiPayload
run: |
source ./edksetup.sh
build -D BOOTLOADER=SBL -a IA32 -a X64 -t GCC5 -b DEBUG -p UefiPayloadPkg/UefiPayloadPkg.dsc
build -D BOOTLOADER=SBL -D CPU_RNG_ENABLE=FALSE -a IA32 -a X64 -t GCC5 -b DEBUG -p UefiPayloadPkg/UefiPayloadPkg.dsc
- name: Run binary in QEMU
run: |
Expand Down
4 changes: 2 additions & 2 deletions ReadMe.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ EDK II Project - 9elements enhanced
The EDK2 repository contains custom patches not upstreamed yet.
The following features have been added to be used with coreboot:

- Variable support using SMMSTOREv2
- Variable support using SMMSTOREv2, enable with ``build -DVARIABLE_SUPPORT=SMMSTORE``
- Workaround for coreboot's PCIHostBridge allocator
- Disabled EDK2 MTRR programming sometimes crashing the system
- Rng support
Expand All @@ -17,7 +17,7 @@ The following features have been added to be used with coreboot:
- TPM support, enable with ``build -DTPM_ENABLE=TRUE``
- Secureboot support, enable with ``build -DSECURE_BOOT_ENABLE=TRUE``
- IPXE support, enable with ``build -DNETWORK_IPXE=TRUE``
- Network support, enable with ``build -DNETWORK_ENABLE=TRUE``
- Network support, enable with ``build -DNETWORK_DRIVER_ENABLE=TRUE``

A modern, feature-rich, cross-platform firmware development
environment for the UEFI and PI specifications from www.uefi.org.
Expand Down

0 comments on commit 37b4fdc

Please sign in to comment.