From d11dcd4c2ae2aae804302d368065740dbc1d62e5 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Tue, 7 Apr 2020 13:18:25 -0600
Subject: [PATCH] Copy ec.rom to usb.img if flashing open EC

---
 scripts/build.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index 09be304..f9214d5 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -101,11 +101,14 @@ then
 
     # Copy firmware to USB image
     mmd -i "${USB}.partial@@1M" "::${BASEDIR}/firmware"
-    mcopy -i "${USB}.partial@@1M" "${COREBOOT}" "::${BASEDIR}/firmware/firmware.rom"
-    if [ -e "${MODEL_DIR}/ec.rom" -a -e "${MODEL_DIR}/uecflash.efi" ]
+    mcopy -v -i "${USB}.partial@@1M" "${COREBOOT}" "::${BASEDIR}/firmware/firmware.rom"
+    if [ -e "${BUILD}/ec.rom" ]
     then
-        mcopy -i "${USB}.partial@@1M" "${MODEL_DIR}/ec.rom" "::${BASEDIR}/firmware/ec.rom"
-        mcopy -i "${USB}.partial@@1M" "${MODEL_DIR}/uecflash.efi" "::${BASEDIR}/firmware/uecflash.efi"
+        mcopy -v -i "${USB}.partial@@1M" "${BUILD}/ec.rom" "::${BASEDIR}/firmware/ec.rom"
+    elif [ -e "${MODEL_DIR}/ec.rom" -a -e "${MODEL_DIR}/uecflash.efi" ]
+    then
+        mcopy -v -i "${USB}.partial@@1M" "${MODEL_DIR}/ec.rom" "::${BASEDIR}/firmware/ec.rom"
+        mcopy -v -i "${USB}.partial@@1M" "${MODEL_DIR}/uecflash.efi" "::${BASEDIR}/firmware/uecflash.efi"
     fi
     mv -v "${USB}.partial" "${USB}"
 fi