From a8517076094e453c8c8463cf87964f6d4949bba2 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <andrei.gherzan@huawei.com> Date: Wed, 19 Oct 2022 17:55:31 +0200 Subject: [PATCH] Cleanup/drop support for Avenger/Nitrogen boards The Avenger board was already deprecated and this clean-ups some remaining support on Zephyr. Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com> --- .oniro-ci/machines-and-flavours.yaml | 9 --------- docs/build-flavours/zephyr-flavour.rst | 1 - docs/ci/machines-and-flavours.rst | 13 ------------- flavours/zephyr/conf-notes.txt | 1 - flavours/zephyr/local.conf.sample | 2 -- 5 files changed, 26 deletions(-) diff --git a/.oniro-ci/machines-and-flavours.yaml b/.oniro-ci/machines-and-flavours.yaml index 09ccfdce..9ae25218 100644 --- a/.oniro-ci/machines-and-flavours.yaml +++ b/.oniro-ci/machines-and-flavours.yaml @@ -243,15 +243,6 @@ zephyr-qemu-cortex-m3-twister-gcc: zephyr-qemu-cortex-m3-twister-clang: extends: [.zephyr-qemu-cortex-m3-twister, .toolchain-clang, .broken] -.zephyr-96b-avenger: - extends: .build-zephyr-image - variables: - MACHINE: 96b-avenger96 -zephyr-96b-avenger-gcc: - extends: [.zephyr-96b-avenger, .toolchain-gcc] -zephyr-96b-avenger-clang: - extends: [.zephyr-96b-avenger, .toolchain-clang, .broken] - .zephyr-nrf52840dk-nrf52840: extends: .build-zephyr-image variables: diff --git a/docs/build-flavours/zephyr-flavour.rst b/docs/build-flavours/zephyr-flavour.rst index c3025e4d..50c17d91 100644 --- a/docs/build-flavours/zephyr-flavour.rst +++ b/docs/build-flavours/zephyr-flavour.rst @@ -22,7 +22,6 @@ Supported machines (default in **bold**): * **qemu-x86** * qemu-cortex-m3 -* 96b-avenger96 (96Boards Avenger96) * arduino-nano-33-ble (Arduino Nano 33 BLE and Arduino Nano 33 BLE Sense) Build steps example: diff --git a/docs/ci/machines-and-flavours.rst b/docs/ci/machines-and-flavours.rst index 831545ed..cf97d2a2 100644 --- a/docs/ci/machines-and-flavours.rst +++ b/docs/ci/machines-and-flavours.rst @@ -113,19 +113,6 @@ basic 32bit ARM micro-controller virtual machine. The cache for this job is publicly available. -zephyr-96b-avenger -.................. - -This job extends `.build-zephyr` job from the manifest repository and builds -``zephyr-philosophers`` using the Zephyr flavour of |main_project_name| and -``MACHINE=96b-avenger96``. This job checks that Zephyr can be built for the -96Boards Avenger development board cortex-M3 core, embedded into STM32MP157 -SoC. - -.. note:: - The cache for this job is not public, pending legal review of any firmware - that may be included. - zephyr-arduino-nano-33-ble .......................... diff --git a/flavours/zephyr/conf-notes.txt b/flavours/zephyr/conf-notes.txt index 30a77190..1153f172 100644 --- a/flavours/zephyr/conf-notes.txt +++ b/flavours/zephyr/conf-notes.txt @@ -6,7 +6,6 @@ You can now run 'bitbake zephyr-philosophers' Supported machines (first is the default): - qemu-x86 - qemu-cortex-m3 -- 96b-avenger96 (96Boards Avenger96) - arduino-nano-33-ble (Arduino Nano 33 BLE and Arduino Nano 33 BLE Sense) MACHINE variable can be set up in conf/local.conf file under build directory diff --git a/flavours/zephyr/local.conf.sample b/flavours/zephyr/local.conf.sample index ff7af319..5af885a2 100644 --- a/flavours/zephyr/local.conf.sample +++ b/flavours/zephyr/local.conf.sample @@ -26,8 +26,6 @@ # There are also the following hardware board target machines included for # demonstration purposes: # -#MACHINE ?= "96b-nitrogen" -#MACHINE ?= "96b-avenger96" #MACHINE ?= "nrf52840dk-nrf52840" #MACHINE ?= "arduino-nano-33-ble" # -- GitLab