zephyr: zmake: drop support for zephyr v2.4

Drop support for Zephyr OS v2.4 on all boards, since the v2.5 uprev is
successful.

If someone still needs to manually compile for v2.4 for testing, one
can do so by passing --zephyr-base=$PATH_TO_ZEPHYR_24 and
--ignore-unsupported-zephyr-version to zmake.

BUG=b:180409973
BRANCH=none
TEST=zmake testall

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I0b3922c0b7f47811b26bad4e7f99125cabdaed91
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2715345
Commit-Queue: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

15 files changed, 11 insertions, 14 deletions

diff --git a/zephyr/README.md b/zephyr/README.md
index 69cfeaa161..d06925bc70 100644
--- a/zephyr/README.md
+++ b/zephyr/README.md
@@ -14,3 +14,12 @@ As an experiment we have a basic gitlab integration. So far it just builds and
 fails.
 
 See the piplines [here](https://gitlab.com/zephyr-ec/ec/-/pipelines).
+
+## News and Breaking Changes
+
+* Support for Zephyr v2.4 has been dropped as of
+  [CL:2715345](https://crrev.com/c/2715345).  If you wish to build for
+  kernel v2.4 now, you must invoke `zmake configure` similar to below:
+
+      $ zmake --zephyr-base ~/trunk/src/third_party/zephyr/main/v2.4 \
+              configure --ignore-unsupported-zephyr-version ...
diff --git a/zephyr/projects/delbin/zmake.yaml b/zephyr/projects/delbin/zmake.yaml
index 34f6926ed3..ec95a01cbe 100644
--- a/zephyr/projects/delbin/zmake.yaml
+++ b/zephyr/projects/delbin/zmake.yaml
@@ -4,7 +4,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 4140b76361..2104408a71 100644
--- a/zephyr/projects/kohaku/zmake.yaml
+++ b/zephyr/projects/kohaku/zmake.yaml
@@ -4,7 +4,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 ed3fbaf622..a27129cc53 100644
--- a/zephyr/projects/posix-ec/zmake.yaml
+++ b/zephyr/projects/posix-ec/zmake.yaml
@@ -1,6 +1,5 @@
 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 dfec106043..2c4774ed4a 100644
--- a/zephyr/projects/volteer/zmake.yaml
+++ b/zephyr/projects/volteer/zmake.yaml
@@ -4,7 +4,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 a8f361e3ce..4804127f1b 100644
--- a/zephyr/test/accel_cal/zmake.yaml
+++ b/zephyr/test/accel_cal/zmake.yaml
@@ -4,7 +4,6 @@
 
 board: native_posix
 supported-zephyr-versions:
-  - v2.4
   - v2.5
 toolchain: llvm
 output-type: elf
diff --git a/zephyr/test/base32/zmake.yaml b/zephyr/test/base32/zmake.yaml
index 0b3c6a6a37..febbda3b49 100644
--- a/zephyr/test/base32/zmake.yaml
+++ b/zephyr/test/base32/zmake.yaml
@@ -4,7 +4,6 @@
 
 board: native_posix
 supported-zephyr-versions:
-  - v2.4
   - v2.5
 toolchain: llvm
 output-type: elf
diff --git a/zephyr/test/crc/zmake.yaml b/zephyr/test/crc/zmake.yaml
index 0b3c6a6a37..febbda3b49 100644
--- a/zephyr/test/crc/zmake.yaml
+++ b/zephyr/test/crc/zmake.yaml
@@ -4,7 +4,6 @@
 
 board: native_posix
 supported-zephyr-versions:
-  - v2.4
   - v2.5
 toolchain: llvm
 output-type: elf
diff --git a/zephyr/test/hooks/zmake.yaml b/zephyr/test/hooks/zmake.yaml
index 0b3c6a6a37..febbda3b49 100644
--- a/zephyr/test/hooks/zmake.yaml
+++ b/zephyr/test/hooks/zmake.yaml
@@ -4,7 +4,6 @@
 
 board: native_posix
 supported-zephyr-versions:
-  - v2.4
   - v2.5
 toolchain: llvm
 output-type: elf
diff --git a/zephyr/test/i2c/zmake.yaml b/zephyr/test/i2c/zmake.yaml
index 49a307d935..f02e2bae9e 100644
--- a/zephyr/test/i2c/zmake.yaml
+++ b/zephyr/test/i2c/zmake.yaml
@@ -4,7 +4,6 @@
 
 board: native_posix
 supported-zephyr-versions:
-  - v2.4
   - v2.5
 toolchain: llvm
 output-type: elf
diff --git a/zephyr/test/i2c_dts/zmake.yaml b/zephyr/test/i2c_dts/zmake.yaml
index e6f172b080..320fb5012a 100644
--- a/zephyr/test/i2c_dts/zmake.yaml
+++ b/zephyr/test/i2c_dts/zmake.yaml
@@ -4,7 +4,6 @@
 
 board: native_posix
 supported-zephyr-versions:
-  - v2.4
   - v2.5
 output-type: elf
 toolchain: llvm
diff --git a/zephyr/test/system/zmake.yaml b/zephyr/test/system/zmake.yaml
index e6f172b080..320fb5012a 100644
--- a/zephyr/test/system/zmake.yaml
+++ b/zephyr/test/system/zmake.yaml
@@ -4,7 +4,6 @@
 
 board: native_posix
 supported-zephyr-versions:
-  - v2.4
   - v2.5
 output-type: elf
 toolchain: llvm
diff --git a/zephyr/test/tasks/zmake.yaml b/zephyr/test/tasks/zmake.yaml
index 0b3c6a6a37..febbda3b49 100644
--- a/zephyr/test/tasks/zmake.yaml
+++ b/zephyr/test/tasks/zmake.yaml
@@ -4,7 +4,6 @@
 
 board: native_posix
 supported-zephyr-versions:
-  - v2.4
   - v2.5
 toolchain: llvm
 output-type: elf
diff --git a/zephyr/zmake/tests/test_project.py b/zephyr/zmake/tests/test_project.py
index 5d6fd0b5ed..9b5cd8fe35 100644
--- a/zephyr/zmake/tests/test_project.py
+++ b/zephyr/zmake/tests/test_project.py
@@ -72,7 +72,7 @@ def test_find_dts_overlays(modules):
                 {'board': board,
                  'toolchain': 'foo',
                  'output-type': 'elf',
-                 'supported-zephyr-versions': ['v2.4']}) as project:
+                 'supported-zephyr-versions': ['v2.5']}) as project:
                 config = project.find_dts_overlays(
                     dict(enumerate(module_paths)))
 
diff --git a/zephyr/zmake/zmake/project.py b/zephyr/zmake/zmake/project.py
index f8079ce423..a7e2fec20e 100644
--- a/zephyr/zmake/zmake/project.py
+++ b/zephyr/zmake/zmake/project.py
@@ -45,7 +45,7 @@ class ProjectConfig:
                 'type': 'array',
                 'items': {
                     'type': 'string',
-                    'enum': ['v2.4', 'v2.5'],
+                    'enum': ['v2.5'],
                 },
                 'minItems': 1,
                 'uniqueItems': True,