summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Rosenthal <jrosenth@chromium.org>2021-02-18 12:57:32 -0700
committerCommit Bot <commit-bot@chromium.org>2021-02-18 21:13:06 +0000
commitd9a957f6dd6e0d2ca20443044dd4cab133079f5a (patch)
tree9b754248701846cb49dcaabac528077d21aad56b
parenta1655accd7953f14bc70e3e35855bd563880cfd0 (diff)
downloadchrome-ec-d9a957f6dd6e0d2ca20443044dd4cab133079f5a.tar.gz
zephyr: support zephyr v2.5 on all projects
Zephyr v2.5 will build for all projects now, mark it as supported for all projects and it will be enabled by default. We can delete v2.4 from this list once v2.5 gets a bit more battle testing. If you need to build for v2.4 in the interim, you should pass the --zephyr-base flag to zmake, like so: $ zmake --zephyr-base ~/trunk/src/third_party/zephyr/main/v2.4 ... BUG=b:180409973 BRANCH=none TEST=zmake testall TEST=flash on delbin, test UART console functioning Signed-off-by: Jack Rosenthal <jrosenth@chromium.org> Change-Id: I9cb7902455b2c6f231bea5c0b08b0e18bca0ddd8 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2705192 Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--zephyr/projects/delbin/zmake.yaml1
-rw-r--r--zephyr/projects/kohaku/zmake.yaml1
-rw-r--r--zephyr/projects/posix-ec/zmake.yaml1
-rw-r--r--zephyr/projects/volteer/zmake.yaml1
-rw-r--r--zephyr/test/accel_cal/zmake.yaml1
-rw-r--r--zephyr/test/base32/zmake.yaml1
-rw-r--r--zephyr/test/crc/zmake.yaml1
-rw-r--r--zephyr/test/hooks/zmake.yaml1
-rw-r--r--zephyr/test/i2c/zmake.yaml1
-rw-r--r--zephyr/test/i2c_dts/zmake.yaml1
-rw-r--r--zephyr/test/system/zmake.yaml1
-rw-r--r--zephyr/test/tasks/zmake.yaml1
12 files changed, 12 insertions, 0 deletions
diff --git a/zephyr/projects/delbin/zmake.yaml b/zephyr/projects/delbin/zmake.yaml
index dd63310772..34f6926ed3 100644
--- a/zephyr/projects/delbin/zmake.yaml
+++ b/zephyr/projects/delbin/zmake.yaml
@@ -5,5 +5,6 @@
board: delbin
supported-zephyr-versions:
- v2.4
+ - v2.5
toolchain: coreboot-sdk
output-type: npcx
diff --git a/zephyr/projects/kohaku/zmake.yaml b/zephyr/projects/kohaku/zmake.yaml
index fc8827ea44..4140b76361 100644
--- a/zephyr/projects/kohaku/zmake.yaml
+++ b/zephyr/projects/kohaku/zmake.yaml
@@ -5,5 +5,6 @@
board: kohaku
supported-zephyr-versions:
- v2.4
+ - v2.5
toolchain: coreboot-sdk
output-type: npcx
diff --git a/zephyr/projects/posix-ec/zmake.yaml b/zephyr/projects/posix-ec/zmake.yaml
index a71e599058..ed3fbaf622 100644
--- a/zephyr/projects/posix-ec/zmake.yaml
+++ b/zephyr/projects/posix-ec/zmake.yaml
@@ -1,5 +1,6 @@
board: native_posix
supported-zephyr-versions:
- v2.4
+ - v2.5
output-type: elf
toolchain: llvm
diff --git a/zephyr/projects/volteer/zmake.yaml b/zephyr/projects/volteer/zmake.yaml
index d50dae9b21..dfec106043 100644
--- a/zephyr/projects/volteer/zmake.yaml
+++ b/zephyr/projects/volteer/zmake.yaml
@@ -5,5 +5,6 @@
board: volteer
supported-zephyr-versions:
- v2.4
+ - v2.5
toolchain: coreboot-sdk
output-type: npcx
diff --git a/zephyr/test/accel_cal/zmake.yaml b/zephyr/test/accel_cal/zmake.yaml
index d4b8654312..a8f361e3ce 100644
--- a/zephyr/test/accel_cal/zmake.yaml
+++ b/zephyr/test/accel_cal/zmake.yaml
@@ -5,6 +5,7 @@
board: native_posix
supported-zephyr-versions:
- v2.4
+ - v2.5
toolchain: llvm
output-type: elf
is-test: true
diff --git a/zephyr/test/base32/zmake.yaml b/zephyr/test/base32/zmake.yaml
index 8269f3557e..0b3c6a6a37 100644
--- a/zephyr/test/base32/zmake.yaml
+++ b/zephyr/test/base32/zmake.yaml
@@ -5,6 +5,7 @@
board: native_posix
supported-zephyr-versions:
- v2.4
+ - v2.5
toolchain: llvm
output-type: elf
is-test: true
diff --git a/zephyr/test/crc/zmake.yaml b/zephyr/test/crc/zmake.yaml
index 8269f3557e..0b3c6a6a37 100644
--- a/zephyr/test/crc/zmake.yaml
+++ b/zephyr/test/crc/zmake.yaml
@@ -5,6 +5,7 @@
board: native_posix
supported-zephyr-versions:
- v2.4
+ - v2.5
toolchain: llvm
output-type: elf
is-test: true
diff --git a/zephyr/test/hooks/zmake.yaml b/zephyr/test/hooks/zmake.yaml
index 8269f3557e..0b3c6a6a37 100644
--- a/zephyr/test/hooks/zmake.yaml
+++ b/zephyr/test/hooks/zmake.yaml
@@ -5,6 +5,7 @@
board: native_posix
supported-zephyr-versions:
- v2.4
+ - v2.5
toolchain: llvm
output-type: elf
is-test: true
diff --git a/zephyr/test/i2c/zmake.yaml b/zephyr/test/i2c/zmake.yaml
index 54e80db400..49a307d935 100644
--- a/zephyr/test/i2c/zmake.yaml
+++ b/zephyr/test/i2c/zmake.yaml
@@ -5,6 +5,7 @@
board: native_posix
supported-zephyr-versions:
- v2.4
+ - v2.5
toolchain: llvm
output-type: elf
is-test: true
diff --git a/zephyr/test/i2c_dts/zmake.yaml b/zephyr/test/i2c_dts/zmake.yaml
index 664e8d9177..e6f172b080 100644
--- a/zephyr/test/i2c_dts/zmake.yaml
+++ b/zephyr/test/i2c_dts/zmake.yaml
@@ -5,6 +5,7 @@
board: native_posix
supported-zephyr-versions:
- v2.4
+ - v2.5
output-type: elf
toolchain: llvm
is-test: true
diff --git a/zephyr/test/system/zmake.yaml b/zephyr/test/system/zmake.yaml
index 664e8d9177..e6f172b080 100644
--- a/zephyr/test/system/zmake.yaml
+++ b/zephyr/test/system/zmake.yaml
@@ -5,6 +5,7 @@
board: native_posix
supported-zephyr-versions:
- v2.4
+ - v2.5
output-type: elf
toolchain: llvm
is-test: true
diff --git a/zephyr/test/tasks/zmake.yaml b/zephyr/test/tasks/zmake.yaml
index 8269f3557e..0b3c6a6a37 100644
--- a/zephyr/test/tasks/zmake.yaml
+++ b/zephyr/test/tasks/zmake.yaml
@@ -5,6 +5,7 @@
board: native_posix
supported-zephyr-versions:
- v2.4
+ - v2.5
toolchain: llvm
output-type: elf
is-test: true