From c1dafbbfad644cbea25fc272fb96ffc88b59f42f Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Thu, 12 Oct 2023 12:52:30 -0600
Subject: [PATCH] scripts: Always set EC build dir

Building EC was broken as the build output from the previous board was
not being cleaned. `BUILD` is now always set, defaulting to "build",
instead of only when `BOARD` is specified. For good measure, add it
to the clean command in case a custom path is used.

Fixes: 569321f9ac79 ("scripts: Set EC build dir")
Signed-off-by: Tim Crawford <tcrawford@system76.com>
---
 ec                   | 2 +-
 scripts/_build/ec.sh | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ec b/ec
index 946415f..01be30f 160000
--- a/ec
+++ b/ec
@@ -1 +1 @@
-Subproject commit 946415f3a731d731cb1378d60b28f8ffab8d16cb
+Subproject commit 01be30f107c7930b0673d9f6a35058603f00bd63
diff --git a/scripts/_build/ec.sh b/scripts/_build/ec.sh
index 51d84b2..ce6b7e6 100755
--- a/scripts/_build/ec.sh
+++ b/scripts/_build/ec.sh
@@ -15,6 +15,8 @@ while read line; do
     fi
 done < "$1"
 
-make -C ec clean
-make -C ec VERSION="${VERSION}" "${EC_ARGS[@]}" BUILD=build -j "$(nproc)"
-cp "ec/build/ec.rom" "$2"
+BUILD_DIR="build"
+
+make -C ec BUILD="$BUILD_DIR" clean
+make -C ec VERSION="${VERSION}" "${EC_ARGS[@]}" BUILD="$BUILD_DIR" -j "$(nproc)"
+cp "ec/$BUILD_DIR/ec.rom" "$2"