Update EDK2 build config

scripts/_build/edk2.sh

@@ -4,7 +4,7 @@ set -e
 
 if [ -z "$1" ]
 then
-  echo "$0 [UEFIPAYLOAD.fd]" >&2
+  echo "$0 [UEFIPAYLOAD.fd] <ARGS..>" >&2
   exit 1
 fi
 UEFIPAYLOAD="$(realpath "$1")"
@@ -23,7 +23,8 @@ pushd edk2 >/dev/null
     -a X64 \
     -b "${BUILD_TYPE}" \
     -t "${TOOLCHAIN}" \
-    -p CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
+    -p CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc \
+    "${@:2}"
 
   cp -v \
     "Build/CorebootPayloadPkgX64/${BUILD_TYPE}_${TOOLCHAIN}/FV/UEFIPAYLOAD.fd" \

scripts/build.sh

@@ -24,7 +24,9 @@ touch apps/firmware-setup/Cargo.toml
 make -C apps/firmware-setup
 
 # Rebuild CorebootPayloadPkg using edk2
-./scripts/_build/edk2.sh build/UEFIPAYLOAD.fd
+export
+./scripts/_build/edk2.sh build/UEFIPAYLOAD.fd \
+  -D FIRMWARE_OPEN_FIRMWARE_SETUP="firmware-setup/firmware-setup.inf"
 
 # Rebuild coreboot
 export FIRMWARE_OPEN_UEFIPAYLOAD="$(realpath build/UEFIPAYLOAD.fd)"