summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuval Peress <peress@chromium.org>2021-06-23 16:45:24 -0600
committerJora Jacobi <jora@google.com>2021-06-23 23:16:57 +0000
commit4c5f28056111cb31d18dffc956af21b095b7b8f6 (patch)
tree7f3b6c73ff5c4aa1634d8cda358864efabf2ec0b
parent36c54d7fbebe7f271cab355fbd1a9cd2541c968b (diff)
downloadchrome-ec-4c5f28056111cb31d18dffc956af21b095b7b8f6.tar.gz
zephyr: fix CQ when migrating to 2.6
As it turns out the CQ can't checkout both 2.5 and 2.6. For now each project will need to support both. BRANCH=none BUG=b:190731415, b:191892353 TEST=emerge-volteer-zephyr chromeos-base/chromeos-zephyr Signed-off-by: Yuval Peress <peress@chromium.org> Change-Id: Ib73777560ad40b5d45f79d30525ced26e1acfb41 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2983841 Reviewed-by: Jora Jacobi <jora@google.com> Commit-Queue: Jora Jacobi <jora@google.com>
-rw-r--r--zephyr/projects/brya/brya/zmake.yaml1
-rw-r--r--zephyr/projects/trogdor/lazor/zmake.yaml1
-rw-r--r--zephyr/projects/volteer/delbin/zmake.yaml1
-rw-r--r--zephyr/projects/volteer/volteer/zmake.yaml1
4 files changed, 4 insertions, 0 deletions
diff --git a/zephyr/projects/brya/brya/zmake.yaml b/zephyr/projects/brya/brya/zmake.yaml
index 9340bdec53..6277154814 100644
--- a/zephyr/projects/brya/brya/zmake.yaml
+++ b/zephyr/projects/brya/brya/zmake.yaml
@@ -6,6 +6,7 @@ board: brya
dts-overlays:
- gpio.dts
supported-zephyr-versions:
+ - v2.5
- v2.6
toolchain: coreboot-sdk
output-type: npcx
diff --git a/zephyr/projects/trogdor/lazor/zmake.yaml b/zephyr/projects/trogdor/lazor/zmake.yaml
index 03ab9036aa..a013cce67b 100644
--- a/zephyr/projects/trogdor/lazor/zmake.yaml
+++ b/zephyr/projects/trogdor/lazor/zmake.yaml
@@ -8,6 +8,7 @@ dts-overlays:
- battery.dts
- motionsense.dts
supported-zephyr-versions:
+ - v2.5
- v2.6
toolchain: coreboot-sdk
output-type: npcx
diff --git a/zephyr/projects/volteer/delbin/zmake.yaml b/zephyr/projects/volteer/delbin/zmake.yaml
index 92b19417ef..c9f33ca2d7 100644
--- a/zephyr/projects/volteer/delbin/zmake.yaml
+++ b/zephyr/projects/volteer/delbin/zmake.yaml
@@ -7,6 +7,7 @@ dts-overlays:
- gpio.dts
- motionsense.dts
supported-zephyr-versions:
+ - v2.5
- v2.6
toolchain: coreboot-sdk
output-type: npcx
diff --git a/zephyr/projects/volteer/volteer/zmake.yaml b/zephyr/projects/volteer/volteer/zmake.yaml
index a80c9a7731..ace5404e29 100644
--- a/zephyr/projects/volteer/volteer/zmake.yaml
+++ b/zephyr/projects/volteer/volteer/zmake.yaml
@@ -11,6 +11,7 @@ dts-overlays:
- motionsense.dts
- pwm.dts
supported-zephyr-versions:
+ - v2.5
- v2.6
toolchain: coreboot-sdk
output-type: npcx