Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hwmv2 revert common board ci #6

Closed
wants to merge 15 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
14 changes: 7 additions & 7 deletions .github/workflows/codecov.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: ["mps2/an385", "native_sim", "qemu_x86", "unit_testing"]
platform: ["mps2/an385", "native_sim/native", "qemu_x86/atom", "unit_testing/unit_testing"]
include:
- platform: 'mps2/an385'
normalized: 'mps2_an385'
- platform: 'native_sim'
normalized: 'native_sim'
- platform: 'qemu_x86'
normalized: 'qemu_x86'
- platform: 'unit_testing'
normalized: 'unit_testing'
- platform: 'native_sim/native'
normalized: 'native_sim_native'
- platform: 'qemu_x86/atom'
normalized: 'qemu_x86_atom'
- platform: 'unit_testing/unit_testing'
normalized: 'unit_testing_unit_testing'
env:
CCACHE_DIR: /node-cache/ccache-zephyr
CCACHE_REMOTE_STORAGE: "redis://cache-*.keydb-cache.svc.cluster.local|shards=1,2,3"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hello_world_multiplatform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ jobs:
shell: bash
run: |
if [ "${{ runner.os }}" = "macOS" ]; then
EXTRA_TWISTER_FLAGS="-P native_sim --build-only"
EXTRA_TWISTER_FLAGS="-P native_sim/native --build-only"
elif [ "${{ runner.os }}" = "Windows" ]; then
EXTRA_TWISTER_FLAGS="-P native_sim --short-build-path -O/tmp/twister-out"
EXTRA_TWISTER_FLAGS="-P native_sim/native --short-build-path -O/tmp/twister-out"
fi
./scripts/twister --force-color --inline-logs -T samples/hello_world -v $EXTRA_TWISTER_FLAGS

Expand Down
2 changes: 1 addition & 1 deletion arch/posix/Linux.aarch64.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if (CONFIG_64BIT)
if (${WORDSIZE} STREQUAL "32")
message(FATAL_ERROR
"CONFIG_64BIT=y but this Aarch64 machine has a 32-bit userspace.\n"
"If you were targeting native_sim/native/64, target native_sim instead.\n"
"If you were targeting native_sim/native/64, target native_sim/native instead.\n"
"Otherwise, be sure to define CONFIG_64BIT appropriately.\n"
)
endif()
Expand Down
22 changes: 0 additions & 22 deletions boards/96boards/aerocore2/96b_aerocore2.yaml

This file was deleted.

22 changes: 22 additions & 0 deletions boards/96boards/aerocore2/96b_aerocore2_stm32f427xx.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Copyright (c) 2020 Linaro Limited
# SPDX-License-Identifier: Apache-2.0


identifier: 96b_aerocore2/stm32f427xx
name: 96Boards AeroCore 2
type: mcu
arch: arm
toolchain:
- zephyr
- gnuarmemb
- xtools
supported:
- gpio
- pwm
- i2c
- spi
- usb_device
- adc
ram: 256
flash: 2048
vendor: 96boards
6 changes: 3 additions & 3 deletions boards/96boards/aerocore2/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ More information about STM32F427VIT6 can be found here:
Supported Features
==================

The Zephyr 96b_aerocore2 board configuration supports the following hardware
The Zephyr 96b_aerocore2/stm32f427xx board configuration supports the following hardware
features:

+------------+------------+-------------------------------------+
Expand Down Expand Up @@ -80,7 +80,7 @@ features:
More details about the board can be found at `96Boards website`_.

The default configuration can be found in
:zephyr_file:`boards/96boards/aerocore2/96b_aerocore2_defconfig`
:zephyr_file:`boards/96boards/aerocore2/96b_aerocore2_stm32f427xx_defconfig`

Connections and IOs
===================
Expand Down Expand Up @@ -315,7 +315,7 @@ Then build and flash an application. Here is an example for the

.. zephyr-app-commands::
:zephyr-app: samples/hello_world
:board: 96b_aerocore2
:board: 96b_aerocore2/stm32f427xx
:goals: build flash

Connect a USB-TTL dongle to the UART_7 header port and to your computer.
Expand Down
20 changes: 0 additions & 20 deletions boards/96boards/argonkey/96b_argonkey.yaml

This file was deleted.

20 changes: 20 additions & 0 deletions boards/96boards/argonkey/96b_argonkey_stm32f412cx.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
identifier: 96b_argonkey/stm32f412cx
name: 96Boards Argonkey
type: mcu
arch: arm
toolchain:
- zephyr
- gnuarmemb
- xtools
ram: 256
flash: 1024
supported:
- gpio
- i2c
- i2s
- hts221
- lps22hb
- lsm6dsl
- counter
- spi
- vl53l0x
6 changes: 3 additions & 3 deletions boards/96boards/argonkey/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Hardware
Supported Features
==================

The Zephyr 96b_argonkey board configuration supports the following hardware
The Zephyr 96b_argonkey/stm32f412cx board configuration supports the following hardware
features:

+-----------+------------+-------------------------------------+
Expand All @@ -78,7 +78,7 @@ More information about the board can be found at the
`ARGONKEY website`_.

The default board configuration can be found in
:zephyr_file:`boards/96boards/argonkey/96b_argonkey_defconfig`
:zephyr_file:`boards/96boards/argonkey/96b_argonkey_stm32f412cx_defconfig`

Connections and IOs
===================
Expand Down Expand Up @@ -149,7 +149,7 @@ Here is an example for building the :ref:`hello_world` application.

.. zephyr-app-commands::
:zephyr-app: samples/hello_world
:board: 96b_argonkey
:board: 96b_argonkey/stm32f412cx
:goals: build

Flashing
Expand Down
72 changes: 0 additions & 72 deletions boards/96boards/avenger96/96b_avenger96.dts

This file was deleted.

25 changes: 0 additions & 25 deletions boards/96boards/avenger96/96b_avenger96.yaml

This file was deleted.

72 changes: 72 additions & 0 deletions boards/96boards/avenger96/96b_avenger96_stm32mp157cxx.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
/*
* Copyright (c) 2019 Linaro Ltd.
*
* SPDX-License-Identifier: Apache-2.0
*/

/dts-v1/;
#include <st/mp1/stm32mp157.dtsi>
#include <st/mp1/stm32mp157aacx-pinctrl.dtsi>

/ {
model = "Arrow Electronics STM32MP157A Avenger96 board";
compatible = "arrow,stm32mp157a-avenger96";

chosen {
/*
* By default, Zephyr console and shell are assigned to
* remoteproc. To enable console and shell over UART, uncomment
* following lines and set the correct config in
* 96b_avenger96_stm32mp157cxx_defconfig. Refer "Serial Port" section in
* Zephyr board documentation.
* zephyr,console = &uart7;
* zephyr,shell-uart = &uart7;
*/
zephyr,flash = &retram;
zephyr,sram = &mcusram;
};

leds {
compatible = "gpio-leds";
green_led_0: led_0 {
gpios = <&gpiof 3 GPIO_ACTIVE_HIGH>;
label = "USR0 LED";
};
green_led_1: led_1 {
gpios = <&gpiog 0 GPIO_ACTIVE_HIGH>;
label = "USR1 LED";
};
green_led_2: led_2 {
gpios = <&gpiog 1 GPIO_ACTIVE_HIGH>;
label = "USR2 LED";
};
};

aliases {
led0 = &green_led_0;
led1 = &green_led_1;
led2 = &green_led_2;
};
};

&rcc {
clock-frequency = <DT_FREQ_M(209)>;
};

&mailbox {
status = "okay";
};

&uart4 {
pinctrl-0 = <&uart4_tx_pd1 &uart4_rx_pb2>;
pinctrl-names = "default";
current-speed = <115200>;
status = "okay";
};

&uart7 {
pinctrl-0 = <&uart7_tx_pe8 &uart7_rx_pe7>;
pinctrl-names = "default";
current-speed = <115200>;
status = "okay";
};
25 changes: 25 additions & 0 deletions boards/96boards/avenger96/96b_avenger96_stm32mp157cxx.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
identifier: 96b_avenger96/stm32mp157cxx
name: 96Boards Avenger96
type: mcu
arch: arm
toolchain:
- zephyr
- gnuarmemb
- xtools
supported:
- gpio
- shell
testing:
ignore_tags:
- cmsis_rtos_v2
- net
- mpu
- tinycrypt
- crypto
- aes
- cmm
- LED
- nfc
ram: 256
flash: 64
vendor: 96boards
Loading
Loading