scripts: Fix adding SBIOS firmware to USB

Fixes: 618a266 ("scripts: Split creating USB image to separate script")
Signed-off-by: Tim Crawford <[email protected]>

Author: crawfxrd

scripts/build.sh

@@ -31,7 +31,6 @@ rm -rf "${BUILD}"
 mkdir -p "${BUILD}"
 
 UEFIPAYLOAD="${BUILD}/UEFIPAYLOAD.fd"
-COREBOOT="${BUILD}/firmware.rom"
 EDK2_ARGS=(
     -D SHELL_TYPE=NONE
     -D SOURCE_DEBUG_ENABLE=FALSE
@@ -79,7 +78,7 @@ FIRMWARE_OPEN_UEFIPAYLOAD="${UEFIPAYLOAD}" \
 KERNELVERSION="${VERSION}" \
     ./scripts/_build/coreboot.sh \
         "${MODEL_DIR}/coreboot.config" \
-        "${COREBOOT}"
+        "${BUILD}/firmware.rom"
 
 # Rebuild EC firmware for System76 EC models
 if [ ! -e  "${MODEL_DIR}/ec.rom" ] && [ -e "${MODEL_DIR}/ec.config" ]

scripts/usb.sh

@@ -39,7 +39,7 @@ cp -v "apps/firmware-update/build/x86_64-unknown-uefi/boot.img" "${USB}.partial"
 
 # Copy firmware to USB image
 mmd -i "${USB}.partial@@1M" "::${BASEDIR}/firmware"
-mcopy -v -i "${USB}.partial@@1M" "${COREBOOT}" "::${BASEDIR}/firmware/firmware.rom"
+mcopy -v -i "${USB}.partial@@1M" "${BUILD}/firmware.rom" "::${BASEDIR}/firmware/firmware.rom"
 if [ -e "${BUILD}/ec.rom" ]; then
     mcopy -v -i "${USB}.partial@@1M" "${BUILD}/ec.rom" "::${BASEDIR}/firmware/ec.rom"
 elif [ -e "${MODEL_DIR}/ec.rom" ]; then