diff options
author | Jack Rosenthal <jrosenth@chromium.org> | 2021-08-31 18:44:15 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-09-01 22:57:37 +0000 |
commit | 4259d21065b281d8acc58e041d92d64c4db24205 (patch) | |
tree | 4aef746387316e6ad61d488ededf5a173335a5cd /zephyr/projects | |
parent | 3010ab154cb84277e81e906bc05ae360d263993c (diff) | |
download | chrome-ec-4259d21065b281d8acc58e041d92d64c4db24205.tar.gz |
zephyr: zmake: implement multiple toolchain support/probing
Our GitLab builder uses different toolchains than the supported ones
we use for development. At present, this means that the GitLab CI
needs to call -t for each build with the desired toolchain, preventing
us from using the more general commands "zmake coverage" or "zmake
testall".
Extend the idea of toolchain in our config files to be "supported
toolchains" instead (i.e., multiple toolchains can be supported
instead of one. We do this by refactoring our toolchain support code
to consist of two related methods:
- "probe" returns True if the toolchain is detected on the system, or
False otherwise
- "get_toolchain_config" returns the BuildConfig associated with the
toolchain for the system, mirroring the functionality previously
implemented in lambda functions.
Also dropped support for arm-none-eabi, as I believe this was only
used early on during scarlet development, and am not aware of any
current users.
BUG=b:178731498
BRANCH=none
TEST=./run_tests.sh
TEST=zmake testall
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I9b2ad508ae6703f0c3b56518fc32606c0ff1777c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3134668
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Diffstat (limited to 'zephyr/projects')
-rw-r--r-- | zephyr/projects/asurada/hayato/zmake.yaml | 4 | ||||
-rw-r--r-- | zephyr/projects/brya/brya/zmake.yaml | 4 | ||||
-rw-r--r-- | zephyr/projects/herobrine/herobrine_npcx9/zmake.yaml | 4 | ||||
-rw-r--r-- | zephyr/projects/it8xxx2_evb/zmake.yaml | 4 | ||||
-rw-r--r-- | zephyr/projects/kohaku/zmake.yaml | 4 | ||||
-rw-r--r-- | zephyr/projects/npcx_evb/npcx7/zmake.yaml | 4 | ||||
-rw-r--r-- | zephyr/projects/npcx_evb/npcx9/zmake.yaml | 4 | ||||
-rw-r--r-- | zephyr/projects/posix-ec/zmake.yaml | 4 | ||||
-rw-r--r-- | zephyr/projects/trogdor/herobrine_npcx7/zmake.yaml | 4 | ||||
-rw-r--r-- | zephyr/projects/trogdor/lazor/zmake.yaml | 4 | ||||
-rw-r--r-- | zephyr/projects/trogdor/trogdor/zmake.yaml | 4 | ||||
-rw-r--r-- | zephyr/projects/volteer/delbin/zmake.yaml | 4 | ||||
-rw-r--r-- | zephyr/projects/volteer/volteer/zmake.yaml | 4 |
13 files changed, 39 insertions, 13 deletions
diff --git a/zephyr/projects/asurada/hayato/zmake.yaml b/zephyr/projects/asurada/hayato/zmake.yaml index c1ec732c43..f4e821d582 100644 --- a/zephyr/projects/asurada/hayato/zmake.yaml +++ b/zephyr/projects/asurada/hayato/zmake.yaml @@ -8,7 +8,9 @@ dts-overlays: - gpio.dts - motionsense.dts - pwm.dts +supported-toolchains: + - coreboot-sdk + - zephyr supported-zephyr-versions: - v2.6 -toolchain: coreboot-sdk output-type: binman diff --git a/zephyr/projects/brya/brya/zmake.yaml b/zephyr/projects/brya/brya/zmake.yaml index 9340bdec53..71687e0f3e 100644 --- a/zephyr/projects/brya/brya/zmake.yaml +++ b/zephyr/projects/brya/brya/zmake.yaml @@ -5,7 +5,9 @@ board: brya dts-overlays: - gpio.dts +supported-toolchains: + - coreboot-sdk + - zephyr supported-zephyr-versions: - v2.6 -toolchain: coreboot-sdk output-type: npcx diff --git a/zephyr/projects/herobrine/herobrine_npcx9/zmake.yaml b/zephyr/projects/herobrine/herobrine_npcx9/zmake.yaml index 530278c5e7..775ab65ead 100644 --- a/zephyr/projects/herobrine/herobrine_npcx9/zmake.yaml +++ b/zephyr/projects/herobrine/herobrine_npcx9/zmake.yaml @@ -9,7 +9,9 @@ dts-overlays: - i2c.dts - motionsense.dts - switchcap.dts +supported-toolchains: + - coreboot-sdk + - zephyr supported-zephyr-versions: - v2.6 -toolchain: coreboot-sdk output-type: npcx diff --git a/zephyr/projects/it8xxx2_evb/zmake.yaml b/zephyr/projects/it8xxx2_evb/zmake.yaml index ba536537a5..d05a938500 100644 --- a/zephyr/projects/it8xxx2_evb/zmake.yaml +++ b/zephyr/projects/it8xxx2_evb/zmake.yaml @@ -3,7 +3,9 @@ # found in the LICENSE file. board: it8xxx2_evb +supported-toolchains: + - coreboot-sdk + - zephyr supported-zephyr-versions: - v2.6 -toolchain: coreboot-sdk output-type: raw diff --git a/zephyr/projects/kohaku/zmake.yaml b/zephyr/projects/kohaku/zmake.yaml index cf55fc5e13..99e4f135fb 100644 --- a/zephyr/projects/kohaku/zmake.yaml +++ b/zephyr/projects/kohaku/zmake.yaml @@ -3,7 +3,9 @@ # found in the LICENSE file. board: kohaku +supported-toolchains: + - coreboot-sdk + - zephyr supported-zephyr-versions: - v2.6 -toolchain: coreboot-sdk output-type: npcx diff --git a/zephyr/projects/npcx_evb/npcx7/zmake.yaml b/zephyr/projects/npcx_evb/npcx7/zmake.yaml index 79faa50656..e846e582e7 100644 --- a/zephyr/projects/npcx_evb/npcx7/zmake.yaml +++ b/zephyr/projects/npcx_evb/npcx7/zmake.yaml @@ -8,7 +8,9 @@ dts-overlays: - pwm.dts - fan.dts - keyboard.dts +supported-toolchains: + - coreboot-sdk + - zephyr supported-zephyr-versions: - v2.6 -toolchain: coreboot-sdk output-type: npcx diff --git a/zephyr/projects/npcx_evb/npcx9/zmake.yaml b/zephyr/projects/npcx_evb/npcx9/zmake.yaml index 95a2d3adf7..1d750cc813 100644 --- a/zephyr/projects/npcx_evb/npcx9/zmake.yaml +++ b/zephyr/projects/npcx_evb/npcx9/zmake.yaml @@ -8,7 +8,9 @@ dts-overlays: - pwm.dts - fan.dts - keyboard.dts +supported-toolchains: + - coreboot-sdk + - zephyr supported-zephyr-versions: - v2.6 -toolchain: coreboot-sdk output-type: npcx diff --git a/zephyr/projects/posix-ec/zmake.yaml b/zephyr/projects/posix-ec/zmake.yaml index 1001ea87ac..e06fd99183 100644 --- a/zephyr/projects/posix-ec/zmake.yaml +++ b/zephyr/projects/posix-ec/zmake.yaml @@ -1,5 +1,7 @@ board: native_posix +supported-toolchains: + - llvm + - host supported-zephyr-versions: - v2.6 output-type: elf -toolchain: llvm diff --git a/zephyr/projects/trogdor/herobrine_npcx7/zmake.yaml b/zephyr/projects/trogdor/herobrine_npcx7/zmake.yaml index 03ab9036aa..ef0e8a178e 100644 --- a/zephyr/projects/trogdor/herobrine_npcx7/zmake.yaml +++ b/zephyr/projects/trogdor/herobrine_npcx7/zmake.yaml @@ -7,7 +7,9 @@ dts-overlays: - gpio.dts - battery.dts - motionsense.dts +supported-toolchains: + - coreboot-sdk + - zephyr supported-zephyr-versions: - 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 234d7dd416..c1c14d07d5 100644 --- a/zephyr/projects/trogdor/lazor/zmake.yaml +++ b/zephyr/projects/trogdor/lazor/zmake.yaml @@ -8,7 +8,9 @@ dts-overlays: - gpio.dts - keyboard.dts - motionsense.dts +supported-toolchains: + - coreboot-sdk + - zephyr supported-zephyr-versions: - v2.6 -toolchain: coreboot-sdk output-type: npcx diff --git a/zephyr/projects/trogdor/trogdor/zmake.yaml b/zephyr/projects/trogdor/trogdor/zmake.yaml index 03ab9036aa..ef0e8a178e 100644 --- a/zephyr/projects/trogdor/trogdor/zmake.yaml +++ b/zephyr/projects/trogdor/trogdor/zmake.yaml @@ -7,7 +7,9 @@ dts-overlays: - gpio.dts - battery.dts - motionsense.dts +supported-toolchains: + - coreboot-sdk + - zephyr supported-zephyr-versions: - 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..dc5217e042 100644 --- a/zephyr/projects/volteer/delbin/zmake.yaml +++ b/zephyr/projects/volteer/delbin/zmake.yaml @@ -6,7 +6,9 @@ board: volteer dts-overlays: - gpio.dts - motionsense.dts +supported-toolchains: + - coreboot-sdk + - zephyr supported-zephyr-versions: - 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 ef149f29b4..3f291ce671 100644 --- a/zephyr/projects/volteer/volteer/zmake.yaml +++ b/zephyr/projects/volteer/volteer/zmake.yaml @@ -11,7 +11,9 @@ dts-overlays: - keyboard.dts - motionsense.dts - pwm.dts +supported-toolchains: + - coreboot-sdk + - zephyr supported-zephyr-versions: - v2.6 -toolchain: coreboot-sdk output-type: npcx |