From 7ff282c55f88eaafd180b06820421cdd85cc5368 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Sat, 28 Dec 2024 09:39:32 +0100 Subject: [PATCH 01/10] manifest: support TDK HAL This HAL is needed by Zephyr upstream test suite to build all sensor drivers. Signed-off-by: Stephan Linz --- doc/bridle/releases/release-notes-4.1.0.rst | 3 +++ submanifests/zephyr.yml | 1 + 2 files changed, 4 insertions(+) diff --git a/doc/bridle/releases/release-notes-4.1.0.rst b/doc/bridle/releases/release-notes-4.1.0.rst index e0c603bead..71be1a38f8 100644 --- a/doc/bridle/releases/release-notes-4.1.0.rst +++ b/doc/bridle/releases/release-notes-4.1.0.rst @@ -69,6 +69,7 @@ For more details, see: :ref:`repos_and_revs`. | **hal** : *hal_silabs* | **hal** : *hal_st* | **hal** : *hal_stm32* + | **hal** : *hal_tdk* | **hal** : *hal_telink* | **hal** : *hal_ti* | **hal** : *hal_wurthelektronik* @@ -186,6 +187,8 @@ Build Infrastructure * tbd. * tbd. * tbd. +* Enable support for the TDK HAL in the West manifest. This HAL is needed by + Zephyr upstream test suite to build all sensor drivers. Documentation ============= diff --git a/submanifests/zephyr.yml b/submanifests/zephyr.yml index ee466793a1..2206b89794 100644 --- a/submanifests/zephyr.yml +++ b/submanifests/zephyr.yml @@ -75,6 +75,7 @@ manifest: - hal_silabs - hal_st - hal_stm32 + - hal_tdk - hal_telink - hal_ti - hal_wurthelektronik From 693213fdf192e730d03ec4a1ff11b36f9b936af0 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Sat, 28 Dec 2024 09:37:34 +0100 Subject: [PATCH 02/10] snippets: tests: all drivers: revert fixes for upstream sensors This reverts commit add2b4b9e6eb836e76384aa94f749b35264f3d13. Signed-off-by: Stephan Linz --- .../tstdrv-bldall-sensor-adj.overlay | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/snippets/tstdrv-bldall-sensor-adj/tstdrv-bldall-sensor-adj.overlay b/snippets/tstdrv-bldall-sensor-adj/tstdrv-bldall-sensor-adj.overlay index d4b94f14c8..22e6b4a024 100644 --- a/snippets/tstdrv-bldall-sensor-adj/tstdrv-bldall-sensor-adj.overlay +++ b/snippets/tstdrv-bldall-sensor-adj/tstdrv-bldall-sensor-adj.overlay @@ -111,31 +111,5 @@ compatible = "vnd,w1"; status = "okay"; reg = <0xffffeeee 0x1000>; - #address-cells = <1>; - #size-cells = <0>; - ranges = <0 0>; - }; -}; - -/* FIX: /test/w1@66660000: unnecessary #address-cells/#size-cells - * without "ranges" or child "reg" property - * OR: /test/w1@66660000:ranges: empty "ranges" property - * but its #size-cells (0) differs from /test (1) - */ -&test_w1 { - ranges = <0 0>; -}; - -/* FIX: /test/i2c@11112222/lis2dux12@8a: duplicate unit-address - * (also used in node /test/i2c@11112222/iis328dq@8a) - */ -/delete-node/ &test_i2c_iis328dq; -&test_i2c_adj { - test_i2c_iis328dq: iis328dq@8a { - compatible = "st,iis328dq"; - status = "okay"; - reg = <0x8a>; - int2-gpios = <&test_gpio 0 0>; - threshold-int-pad = <2>; }; }; From 7a1f7a52c81ed33d7b4549eff2b52ea4518f5a60 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Wed, 25 Dec 2024 20:10:10 +0100 Subject: [PATCH 03/10] dts: arm: move rpi_pico under raspberrypi Follow the wider directory convention of dts///. This is foundation work ahead of introducing support for the RP2350. Signed-off-by: Stephan Linz --- boards/cytron/maker_rp2040/cytron_rp2040.dtsi | 2 +- boards/jsed/picoboy/picoboy.dtsi | 2 +- boards/waveshare/rp2040/waveshare_rp2040.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boards/cytron/maker_rp2040/cytron_rp2040.dtsi b/boards/cytron/maker_rp2040/cytron_rp2040.dtsi index 4741eb0a57..25e5ea8754 100644 --- a/boards/cytron/maker_rp2040/cytron_rp2040.dtsi +++ b/boards/cytron/maker_rp2040/cytron_rp2040.dtsi @@ -4,7 +4,7 @@ */ #include -#include +#include #include #include "cytron_rp2040-pinctrl.dtsi" diff --git a/boards/jsed/picoboy/picoboy.dtsi b/boards/jsed/picoboy/picoboy.dtsi index 22d320c501..f623bf7352 100644 --- a/boards/jsed/picoboy/picoboy.dtsi +++ b/boards/jsed/picoboy/picoboy.dtsi @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include "picoboy-pinctrl.dtsi" diff --git a/boards/waveshare/rp2040/waveshare_rp2040.dtsi b/boards/waveshare/rp2040/waveshare_rp2040.dtsi index c17383bc96..c23d6ca51a 100644 --- a/boards/waveshare/rp2040/waveshare_rp2040.dtsi +++ b/boards/waveshare/rp2040/waveshare_rp2040.dtsi @@ -4,7 +4,7 @@ */ #include -#include +#include #include #include "waveshare_rp2040-pinctrl.dtsi" From 2a6128c731e4f0f1b6e7de3dc61dc03b9bd2e9a9 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Thu, 26 Dec 2024 08:57:03 +0100 Subject: [PATCH 04/10] drivers: mipi-dbi: use string for mipi-mode property Use a string for the mipi-mode property over an integer value, as this significantly improves the readability of the MIPI DBI device binding. Signed-off-by: Stephan Linz --- .../geeekpi_pico_bb_plus/st7796s_320x480.dtsi | 2 +- .../geeekpi_pico_bb_plus/st7796s_480x320.dtsi | 2 +- .../pimoroni_pico_lcd_1_44/st7789v_135x240.dtsi | 2 +- .../pimoroni_pico_lcd_1_44/st7789v_240x135.dtsi | 2 +- .../pimoroni_pico_lcd_2/st7789v_240x320.dtsi | 2 +- .../pimoroni_pico_lcd_2/st7789v_320x240.dtsi | 2 +- .../spotpear_pico_lcd_1_54/st7789v_240x240ls.dtsi | 2 +- .../spotpear_pico_lcd_1_54/st7789v_240x240pt.dtsi | 2 +- .../waveshare_pico_lcd_0_96/st7735s_160x80.dtsi | 2 +- .../waveshare_pico_lcd_0_96/st7735s_80x160.dtsi | 2 +- .../waveshare_pico_lcd_1_14/st7789v_135x240.dtsi | 2 +- .../waveshare_pico_lcd_1_14/st7789v_240x135.dtsi | 2 +- .../waveshare_pico_lcd_1_3/st7789v_240x240ls.dtsi | 2 +- .../waveshare_pico_lcd_1_3/st7789v_240x240pt.dtsi | 2 +- .../waveshare_pico_lcd_1_44/st7735s_128x128ls.dtsi | 2 +- .../waveshare_pico_lcd_1_44/st7735s_128x128pt.dtsi | 2 +- .../waveshare_pico_lcd_1_8/st7735s_128x160.dtsi | 2 +- .../waveshare_pico_lcd_1_8/st7735s_160x128.dtsi | 2 +- .../waveshare_pico_lcd_2/st7789v_240x320.dtsi | 2 +- .../waveshare_pico_lcd_2/st7789v_320x240.dtsi | 2 +- .../st7789v_240x320.dtsi | 2 +- .../st7789v_320x240.dtsi | 2 +- .../ili9488_320x480.dtsi | 1 + .../ili9488_480x320.dtsi | 1 + .../rpipico_r3.dtsi | 1 + .../rp2040/rpigeek_lcd_st7789v_135x240.dtsi | 2 +- .../rp2040/rpigeek_lcd_st7789v_240x135.dtsi | 2 +- .../rp2040/rpipico_lcd_st7735s_160x80.dtsi | 2 +- .../rp2040/rpipico_lcd_st7735s_80x160.dtsi | 2 +- .../tstdrv-bldall-display-adj.overlay | 14 +++++++++++--- 30 files changed, 40 insertions(+), 29 deletions(-) diff --git a/boards/shields/rpi_pico_bb/boards/geeekpi_pico_bb_plus/st7796s_320x480.dtsi b/boards/shields/rpi_pico_bb/boards/geeekpi_pico_bb_plus/st7796s_320x480.dtsi index d0fe355d3d..42f0fa3627 100644 --- a/boards/shields/rpi_pico_bb/boards/geeekpi_pico_bb_plus/st7796s_320x480.dtsi +++ b/boards/shields/rpi_pico_bb/boards/geeekpi_pico_bb_plus/st7796s_320x480.dtsi @@ -10,7 +10,7 @@ st7796s_320x480: st7796s@0 { compatible = "sitronix,st7796s"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_bb/boards/geeekpi_pico_bb_plus/st7796s_480x320.dtsi b/boards/shields/rpi_pico_bb/boards/geeekpi_pico_bb_plus/st7796s_480x320.dtsi index 1164bea8ab..528be231f4 100644 --- a/boards/shields/rpi_pico_bb/boards/geeekpi_pico_bb_plus/st7796s_480x320.dtsi +++ b/boards/shields/rpi_pico_bb/boards/geeekpi_pico_bb_plus/st7796s_480x320.dtsi @@ -10,7 +10,7 @@ st7796s_480x320: st7796s@0 { compatible = "sitronix,st7796s"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/pimoroni_pico_lcd_1_44/st7789v_135x240.dtsi b/boards/shields/rpi_pico_lcd/boards/pimoroni_pico_lcd_1_44/st7789v_135x240.dtsi index f004d057c3..6fbe97ee92 100644 --- a/boards/shields/rpi_pico_lcd/boards/pimoroni_pico_lcd_1_44/st7789v_135x240.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/pimoroni_pico_lcd_1_44/st7789v_135x240.dtsi @@ -10,7 +10,7 @@ st7789v_135x240: st7789v@0 { compatible = "sitronix,st7789v"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/pimoroni_pico_lcd_1_44/st7789v_240x135.dtsi b/boards/shields/rpi_pico_lcd/boards/pimoroni_pico_lcd_1_44/st7789v_240x135.dtsi index 94d50c726d..7c0e9acebc 100644 --- a/boards/shields/rpi_pico_lcd/boards/pimoroni_pico_lcd_1_44/st7789v_240x135.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/pimoroni_pico_lcd_1_44/st7789v_240x135.dtsi @@ -10,7 +10,7 @@ st7789v_240x135: st7789v@0 { compatible = "sitronix,st7789v"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/pimoroni_pico_lcd_2/st7789v_240x320.dtsi b/boards/shields/rpi_pico_lcd/boards/pimoroni_pico_lcd_2/st7789v_240x320.dtsi index 43dca0afbd..f8938b381b 100644 --- a/boards/shields/rpi_pico_lcd/boards/pimoroni_pico_lcd_2/st7789v_240x320.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/pimoroni_pico_lcd_2/st7789v_240x320.dtsi @@ -10,7 +10,7 @@ st7789v_240x320: st7789v@0 { compatible = "sitronix,st7789v"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/pimoroni_pico_lcd_2/st7789v_320x240.dtsi b/boards/shields/rpi_pico_lcd/boards/pimoroni_pico_lcd_2/st7789v_320x240.dtsi index d67af468e1..a61def0884 100644 --- a/boards/shields/rpi_pico_lcd/boards/pimoroni_pico_lcd_2/st7789v_320x240.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/pimoroni_pico_lcd_2/st7789v_320x240.dtsi @@ -10,7 +10,7 @@ st7789v_320x240: st7789v@0 { compatible = "sitronix,st7789v"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/spotpear_pico_lcd_1_54/st7789v_240x240ls.dtsi b/boards/shields/rpi_pico_lcd/boards/spotpear_pico_lcd_1_54/st7789v_240x240ls.dtsi index 44b95205a9..8e08b10d53 100644 --- a/boards/shields/rpi_pico_lcd/boards/spotpear_pico_lcd_1_54/st7789v_240x240ls.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/spotpear_pico_lcd_1_54/st7789v_240x240ls.dtsi @@ -10,7 +10,7 @@ st7789v_240x240ls: st7789v@0 { compatible = "sitronix,st7789v"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/spotpear_pico_lcd_1_54/st7789v_240x240pt.dtsi b/boards/shields/rpi_pico_lcd/boards/spotpear_pico_lcd_1_54/st7789v_240x240pt.dtsi index 31cc3fcc46..47e225694a 100644 --- a/boards/shields/rpi_pico_lcd/boards/spotpear_pico_lcd_1_54/st7789v_240x240pt.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/spotpear_pico_lcd_1_54/st7789v_240x240pt.dtsi @@ -10,7 +10,7 @@ st7789v_240x240pt: st7789v@0 { compatible = "sitronix,st7789v"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_0_96/st7735s_160x80.dtsi b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_0_96/st7735s_160x80.dtsi index a6355ff2f0..c13c5695bb 100644 --- a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_0_96/st7735s_160x80.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_0_96/st7735s_160x80.dtsi @@ -10,7 +10,7 @@ st7735s_160x80: st7735s@0 { compatible = "sitronix,st7735r"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_0_96/st7735s_80x160.dtsi b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_0_96/st7735s_80x160.dtsi index 084fec4b00..13ada6ae6f 100644 --- a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_0_96/st7735s_80x160.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_0_96/st7735s_80x160.dtsi @@ -10,7 +10,7 @@ st7735s_80x160: st7735s@0 { compatible = "sitronix,st7735r"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_14/st7789v_135x240.dtsi b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_14/st7789v_135x240.dtsi index ce4391dfd3..8296d8a603 100644 --- a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_14/st7789v_135x240.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_14/st7789v_135x240.dtsi @@ -10,7 +10,7 @@ st7789v_135x240: st7789v@0 { compatible = "sitronix,st7789v"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_14/st7789v_240x135.dtsi b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_14/st7789v_240x135.dtsi index 8a67787ef5..fe3a972e9b 100644 --- a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_14/st7789v_240x135.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_14/st7789v_240x135.dtsi @@ -10,7 +10,7 @@ st7789v_240x135: st7789v@0 { compatible = "sitronix,st7789v"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_3/st7789v_240x240ls.dtsi b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_3/st7789v_240x240ls.dtsi index ce396eb6b3..9c48ffcd9c 100644 --- a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_3/st7789v_240x240ls.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_3/st7789v_240x240ls.dtsi @@ -10,7 +10,7 @@ st7789v_240x240ls: st7789v@0 { compatible = "sitronix,st7789v"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_3/st7789v_240x240pt.dtsi b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_3/st7789v_240x240pt.dtsi index 3cefdc5192..20fcf19d5a 100644 --- a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_3/st7789v_240x240pt.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_3/st7789v_240x240pt.dtsi @@ -10,7 +10,7 @@ st7789v_240x240pt: st7789v@0 { compatible = "sitronix,st7789v"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_44/st7735s_128x128ls.dtsi b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_44/st7735s_128x128ls.dtsi index 12e9895cf2..da4c82b391 100644 --- a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_44/st7735s_128x128ls.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_44/st7735s_128x128ls.dtsi @@ -10,7 +10,7 @@ st7735s_128x128ls: st7735s@0 { compatible = "sitronix,st7735r"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_44/st7735s_128x128pt.dtsi b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_44/st7735s_128x128pt.dtsi index 771a340587..d369deb126 100644 --- a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_44/st7735s_128x128pt.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_44/st7735s_128x128pt.dtsi @@ -10,7 +10,7 @@ st7735s_128x128pt: st7735s@0 { compatible = "sitronix,st7735r"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_8/st7735s_128x160.dtsi b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_8/st7735s_128x160.dtsi index fc206537fe..8905630b96 100644 --- a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_8/st7735s_128x160.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_8/st7735s_128x160.dtsi @@ -10,7 +10,7 @@ st7735s_128x160: st7735s@0 { compatible = "sitronix,st7735r"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_8/st7735s_160x128.dtsi b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_8/st7735s_160x128.dtsi index eeb2efcc2d..1f867231bf 100644 --- a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_8/st7735s_160x128.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_1_8/st7735s_160x128.dtsi @@ -10,7 +10,7 @@ st7735s_160x128: st7735s@0 { compatible = "sitronix,st7735r"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_2/st7789v_240x320.dtsi b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_2/st7789v_240x320.dtsi index 1c1b5ffdb2..c8c9049be2 100644 --- a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_2/st7789v_240x320.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_2/st7789v_240x320.dtsi @@ -10,7 +10,7 @@ st7789v_240x320: st7789v@0 { compatible = "sitronix,st7789v"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_2/st7789v_320x240.dtsi b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_2/st7789v_320x240.dtsi index 23094444a1..27304847f5 100644 --- a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_2/st7789v_320x240.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_lcd_2/st7789v_320x240.dtsi @@ -10,7 +10,7 @@ st7789v_320x240: st7789v@0 { compatible = "sitronix,st7789v"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_2_8/st7789v_240x320.dtsi b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_2_8/st7789v_240x320.dtsi index 57482198ec..e153034463 100644 --- a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_2_8/st7789v_240x320.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_2_8/st7789v_240x320.dtsi @@ -10,7 +10,7 @@ st7789v_240x320: st7789v@0 { compatible = "sitronix,st7789v"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_2_8/st7789v_320x240.dtsi b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_2_8/st7789v_320x240.dtsi index 1203da4680..4c2f6ec728 100644 --- a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_2_8/st7789v_320x240.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_2_8/st7789v_320x240.dtsi @@ -10,7 +10,7 @@ st7789v_320x240: st7789v@0 { compatible = "sitronix,st7789v"; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_3_5/ili9488_320x480.dtsi b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_3_5/ili9488_320x480.dtsi index 1f63ac29ca..46d6d25fc2 100644 --- a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_3_5/ili9488_320x480.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_3_5/ili9488_320x480.dtsi @@ -9,6 +9,7 @@ ili9488_320x480: ili9488@0 { compatible = "ilitek,ili9488"; mipi-max-frequency = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_3_5/ili9488_480x320.dtsi b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_3_5/ili9488_480x320.dtsi index 24fc1aac2a..e1166c6bbb 100644 --- a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_3_5/ili9488_480x320.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_3_5/ili9488_480x320.dtsi @@ -9,6 +9,7 @@ ili9488_480x320: ili9488@0 { compatible = "ilitek,ili9488"; mipi-max-frequency = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; reg = <0>; status = "disabled"; diff --git a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_3_5/rpipico_r3.dtsi b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_3_5/rpipico_r3.dtsi index 05c3c0d668..496e2d57d2 100644 --- a/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_3_5/rpipico_r3.dtsi +++ b/boards/shields/rpi_pico_lcd/boards/waveshare_pico_restouch_lcd_3_5/rpipico_r3.dtsi @@ -43,6 +43,7 @@ spi-dev = <&rpipico_spi_lcd>; #address-cells = <1>; #size-cells = <0>; + write-only; }; &lcd_panel { diff --git a/boards/waveshare/rp2040/rpigeek_lcd_st7789v_135x240.dtsi b/boards/waveshare/rp2040/rpigeek_lcd_st7789v_135x240.dtsi index 0205317c12..eca59d22df 100644 --- a/boards/waveshare/rp2040/rpigeek_lcd_st7789v_135x240.dtsi +++ b/boards/waveshare/rp2040/rpigeek_lcd_st7789v_135x240.dtsi @@ -31,7 +31,7 @@ reg = <0>; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; width = <135>; /* portrait */ height = <240>; /* portrait */ diff --git a/boards/waveshare/rp2040/rpigeek_lcd_st7789v_240x135.dtsi b/boards/waveshare/rp2040/rpigeek_lcd_st7789v_240x135.dtsi index acfeddec1a..e0c9415f0b 100644 --- a/boards/waveshare/rp2040/rpigeek_lcd_st7789v_240x135.dtsi +++ b/boards/waveshare/rp2040/rpigeek_lcd_st7789v_240x135.dtsi @@ -31,7 +31,7 @@ reg = <0>; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; width = <240>; /* landscape */ height = <135>; /* landscape */ diff --git a/boards/waveshare/rp2040/rpipico_lcd_st7735s_160x80.dtsi b/boards/waveshare/rp2040/rpipico_lcd_st7735s_160x80.dtsi index 1d04851309..57aaa4098f 100644 --- a/boards/waveshare/rp2040/rpipico_lcd_st7735s_160x80.dtsi +++ b/boards/waveshare/rp2040/rpipico_lcd_st7735s_160x80.dtsi @@ -31,7 +31,7 @@ reg = <0>; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; width = <160>; /* landscape */ height = <80>; /* landscape */ diff --git a/boards/waveshare/rp2040/rpipico_lcd_st7735s_80x160.dtsi b/boards/waveshare/rp2040/rpipico_lcd_st7735s_80x160.dtsi index dd7cbbea2f..ea63509abe 100644 --- a/boards/waveshare/rp2040/rpipico_lcd_st7735s_80x160.dtsi +++ b/boards/waveshare/rp2040/rpipico_lcd_st7735s_80x160.dtsi @@ -31,7 +31,7 @@ reg = <0>; mipi-max-frequency = ; - mipi-mode = ; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; width = <80>; /* portrait */ height = <160>; /* portrait */ diff --git a/snippets/tstdrv-bldall-display-adj/tstdrv-bldall-display-adj.overlay b/snippets/tstdrv-bldall-display-adj/tstdrv-bldall-display-adj.overlay index 7765581388..9da245e938 100644 --- a/snippets/tstdrv-bldall-display-adj/tstdrv-bldall-display-adj.overlay +++ b/snippets/tstdrv-bldall-display-adj/tstdrv-bldall-display-adj.overlay @@ -211,15 +211,19 @@ status = "okay"; #address-cells = <1>; #size-cells = <0>; + reset-gpios = <&test_gpio_adj 0 0>; dc-gpios = <&test_gpio_adj 0 0>; spi-dev = <&test_spi_adj>; - test_mipi_dbi_ili9488: ili9342c@a { + xfr-min-bits = ; + + test_mipi_dbi_ili9488: ili9488@a { compatible = "ilitek,ili9488"; status = "okay"; reg = <10>; mipi-max-frequency = <60000000>; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; pixel-format = <0>; rotation = <270>; width = <480>; @@ -230,18 +234,22 @@ test_mipi_dbi_xfr_16bit_adj { compatible = "zephyr,mipi-dbi-spi"; status = "okay"; - xfr-min-bits = ; #address-cells = <1>; #size-cells = <0>; + reset-gpios = <&test_gpio_adj 0 0>; dc-gpios = <&test_gpio_adj 0 0>; spi-dev = <&test_spi_adj>; - test_mipi_dbi_xfr_16bit_ili9488: ili9342c@14 { + xfr-min-bits = ; + write-only; + + test_mipi_dbi_xfr_16bit_ili9488: ili9488@14 { compatible = "ilitek,ili9488"; status = "okay"; reg = <20>; mipi-max-frequency = <60000000>; + mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"; pixel-format = <0>; rotation = <270>; width = <480>; From 1ae791bc397f2585ecb13cab22ea300d979401ac Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Sat, 28 Dec 2024 17:17:21 +0100 Subject: [PATCH 05/10] boards: magpie_f777ni: adc: change properties into string In all STM32 ADC nodes, update the st,adc-clock-source properties so they are strings. Signed-off-by: Stephan Linz --- boards/tiac/magpie_f777ni/magpie_f777ni.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/tiac/magpie_f777ni/magpie_f777ni.dts b/boards/tiac/magpie_f777ni/magpie_f777ni.dts index 39010699f2..6ab2e70667 100644 --- a/boards/tiac/magpie_f777ni/magpie_f777ni.dts +++ b/boards/tiac/magpie_f777ni/magpie_f777ni.dts @@ -240,7 +240,7 @@ pinctrl-0 = <&adc3_in9_pf3 /* TMPH4_PF3_ADC39 */ &adc3_in14_pf4 /* TMPH2_PF4_ADC314 */ &adc3_in15_pf5>; /* TMPH2_PF5_ADC315 */ - st,adc-clock-source = ; + st,adc-clock-source = "SYNC"; st,adc-prescaler = <2>; }; // adc3 From fc97c6541b9a152b6ee4334dc780d043c038d4f0 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Sat, 28 Dec 2024 16:17:18 +0100 Subject: [PATCH 06/10] boards: mimxrt1050_evk: switch to variants Switch from using revisions for hyperflash/qspi to using variants, by popular demand. Signed-off-by: Stephan Linz --- .../tests/drivers/watchdog/wdt_basic_api/testcase.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zephyr/alt-config/tests/drivers/watchdog/wdt_basic_api/testcase.yaml b/zephyr/alt-config/tests/drivers/watchdog/wdt_basic_api/testcase.yaml index 1ae48e62d2..cbaeb0f441 100644 --- a/zephyr/alt-config/tests/drivers/watchdog/wdt_basic_api/testcase.yaml +++ b/zephyr/alt-config/tests/drivers/watchdog/wdt_basic_api/testcase.yaml @@ -132,5 +132,5 @@ tests: - mr_canhubk3 drivers.watchdog.mimxrt1050_evk_ti_tps382x: filter: dt_compat_enabled("ti,tps382x") - platform_allow: mimxrt1050_evk + platform_allow: mimxrt1050_evk/mimxrt1052/hyperflash extra_args: DTC_OVERLAY_FILE="boards/mimxrt1050_evk_ti_tps382x.overlay" From 6b82887680ddb86c84276779fd0b809fbcc68e6a Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Fri, 27 Dec 2024 17:08:21 +0100 Subject: [PATCH 07/10] boards: mimxrt1060_evk: convert to variants Convert qspi and hyperflash to variants instead of revisions by popular demand. And convert evkb into a revision instead of a different board. Signed-off-by: Stephan Linz --- boards/extensions/Kconfig.mimxrt1060_evkb | 4 - .../mimxrt1060_evk/Kconfig.defconfig | 9 +- .../extensions/mimxrt1060_evk/doc/index.rst | 4 +- ...xrt1060_evk_mimxrt1062_hyperflash.overlay} | 2 +- .../mimxrt1060_evk_mimxrt1062_qspi.overlay | 6 ++ ... mimxrt1060_evk_mimxrt1062_qspi_B.overlay} | 2 - ...xrt1060_evk_mimxrt1062_hyperflash.overlay} | 2 +- ...=> mimxrt1060_evk_mimxrt1062_qspi.overlay} | 2 +- ...xrt1060_evk_mimxrt1062_hyperflash.overlay} | 2 +- ...=> mimxrt1060_evk_mimxrt1062_qspi.overlay} | 2 +- ...xrt1060_evk_mimxrt1062_hyperflash.overlay} | 2 +- ...=> mimxrt1060_evk_mimxrt1062_qspi.overlay} | 2 +- boards/shields/grove/doc/index.rst | 4 +- boards/shields/grove_btn/doc/index.rst | 8 +- boards/shields/grove_led/doc/index.rst | 8 +- boards/shields/grove_sens/doc/index.rst | 4 +- boards/shields/x_grove_testbed/doc/index.rst | 4 +- doc/bridle/app_boards.rst | 101 +++++++++--------- samples/button/sample.yaml | 5 +- samples/helloshell/sample.yaml | 5 +- samples/ubx_gnss/sample.yaml | 10 +- snippets/usb-console/README.rst | 6 +- snippets/usb-console/snippet.yml | 6 +- tests/quarantine.yaml | 60 +++++------ .../shields/grove/dts_bindings/testcase.yaml | 5 +- .../grove_btn/dts_bindings/testcase.yaml | 5 +- .../grove_led/dts_bindings/testcase.yaml | 65 ++++++----- .../dts_bindings/testcase.yaml | 10 +- 28 files changed, 181 insertions(+), 164 deletions(-) delete mode 100644 boards/extensions/Kconfig.mimxrt1060_evkb rename boards/extensions/mimxrt1060_evk/{mimxrt1060_evk.overlay => mimxrt1060_evk_mimxrt1062_hyperflash.overlay} (66%) create mode 100644 boards/extensions/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.overlay rename boards/extensions/mimxrt1060_evk/{mimxrt1060_evkb.overlay => mimxrt1060_evk_mimxrt1062_qspi_B.overlay} (90%) rename boards/shields/grove/boards/{mimxrt1060_evkb.overlay => mimxrt1060_evk_mimxrt1062_hyperflash.overlay} (68%) rename boards/shields/grove/boards/{mimxrt1060_evk.overlay => mimxrt1060_evk_mimxrt1062_qspi.overlay} (68%) rename boards/shields/grove/boards/seeed_grove_base_v1/{mimxrt1060_evk.overlay => mimxrt1060_evk_mimxrt1062_hyperflash.overlay} (68%) rename boards/shields/grove/boards/seeed_grove_base_v1/{mimxrt1060_evkb.overlay => mimxrt1060_evk_mimxrt1062_qspi.overlay} (68%) rename boards/shields/grove/boards/seeed_grove_base_v2/{mimxrt1060_evk.overlay => mimxrt1060_evk_mimxrt1062_hyperflash.overlay} (68%) rename boards/shields/grove/boards/seeed_grove_base_v2/{mimxrt1060_evkb.overlay => mimxrt1060_evk_mimxrt1062_qspi.overlay} (68%) diff --git a/boards/extensions/Kconfig.mimxrt1060_evkb b/boards/extensions/Kconfig.mimxrt1060_evkb deleted file mode 100644 index 49a6758e29..0000000000 --- a/boards/extensions/Kconfig.mimxrt1060_evkb +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (c) 2024 TiaC Systems -# SPDX-License-Identifier: Apache-2.0 - -rsource "mimxrt1060_evk/Kconfig.defconfig" diff --git a/boards/extensions/mimxrt1060_evk/Kconfig.defconfig b/boards/extensions/mimxrt1060_evk/Kconfig.defconfig index a1373fc641..5709d17745 100644 --- a/boards/extensions/mimxrt1060_evk/Kconfig.defconfig +++ b/boards/extensions/mimxrt1060_evk/Kconfig.defconfig @@ -5,12 +5,11 @@ config USB_SELF_POWERED default y - depends on USB_DEVICE_STACK && (BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVKB) + depends on USB_DEVICE_STACK && BOARD_MIMXRT1060_EVK config USB_MAX_POWER default 0 if BOARD_MIMXRT1060_EVK # 0mA (self powered) - default 0 if BOARD_MIMXRT1060_EVKB # 0mA (self powered) - depends on USB_DEVICE_STACK && (BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVKB) + depends on USB_DEVICE_STACK && BOARD_MIMXRT1060_EVK # Workaround for not being able to have commas in macro arguments DT_CHOSEN_Z_CONSOLE := zephyr,console @@ -21,7 +20,7 @@ DT_COMPAT_NXP_USB := nxp,ehci DT_CHOSEN_CONSOLE_NODE := $(dt_chosen_path,$(DT_CHOSEN_Z_CONSOLE)) DT_CHOSEN_CONSOLE_PARENT := $(dt_node_parent,$(DT_CHOSEN_CONSOLE_NODE)) -if (BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVKB) && \ +if BOARD_MIMXRT1060_EVK && \ $(dt_chosen_enabled,$(DT_CHOSEN_Z_CONSOLE)) && \ $(dt_compat_on_bus,$(DT_COMPAT_Z_CDC_ACM_UART),usb) && \ $(dt_node_has_compat,$(DT_CHOSEN_CONSOLE_PARENT),$(DT_COMPAT_NXP_USB)) @@ -70,5 +69,5 @@ endif # zephyr,cdc-acm-uart # config MASS_STORAGE_DISK_NAME - default "NAND" if (BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVKB) + default "NAND" if BOARD_MIMXRT1060_EVK depends on USB_DEVICE_STACK && USB_MASS_STORAGE diff --git a/boards/extensions/mimxrt1060_evk/doc/index.rst b/boards/extensions/mimxrt1060_evk/doc/index.rst index f83be7d373..fa55cd8cd1 100644 --- a/boards/extensions/mimxrt1060_evk/doc/index.rst +++ b/boards/extensions/mimxrt1060_evk/doc/index.rst @@ -93,8 +93,8 @@ List of extensions * - .. rubric:: NXP MIMXRT1060-EVKB - * - .. literalinclude:: ../mimxrt1060_evkb.overlay - :caption: mimxrt1060_evkb.overlay + * - .. literalinclude:: ../mimxrt1060_evk_mimxrt1062_qspi_B.overlay + :caption: mimxrt1060_evk_mimxrt1062_qspi_B.overlay :language: DTS :encoding: ISO-8859-1 :emphasize-lines: 3,6 diff --git a/boards/extensions/mimxrt1060_evk/mimxrt1060_evk.overlay b/boards/extensions/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.overlay similarity index 66% rename from boards/extensions/mimxrt1060_evk/mimxrt1060_evk.overlay rename to boards/extensions/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.overlay index c5bc48b036..0371a33583 100644 --- a/boards/extensions/mimxrt1060_evk/mimxrt1060_evk.overlay +++ b/boards/extensions/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 TiaC Systems + * Copyright (c) 2023-2024 TiaC Systems * SPDX-License-Identifier: Apache-2.0 */ diff --git a/boards/extensions/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.overlay b/boards/extensions/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.overlay new file mode 100644 index 0000000000..0371a33583 --- /dev/null +++ b/boards/extensions/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.overlay @@ -0,0 +1,6 @@ +/* + * Copyright (c) 2023-2024 TiaC Systems + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "mimxrt1060_evk.dtsi" diff --git a/boards/extensions/mimxrt1060_evk/mimxrt1060_evkb.overlay b/boards/extensions/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_B.overlay similarity index 90% rename from boards/extensions/mimxrt1060_evk/mimxrt1060_evkb.overlay rename to boards/extensions/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_B.overlay index e0c237e11b..bbf3413c06 100644 --- a/boards/extensions/mimxrt1060_evk/mimxrt1060_evkb.overlay +++ b/boards/extensions/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_B.overlay @@ -3,8 +3,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "mimxrt1060_evk.dtsi" - /* FLEXPWM not routed to LED on this EVK revision, thus why board DTS * disables &flexpwm2_pwm3 but neither related &pwmleds node nor alias. */ diff --git a/boards/shields/grove/boards/mimxrt1060_evkb.overlay b/boards/shields/grove/boards/mimxrt1060_evk_mimxrt1062_hyperflash.overlay similarity index 68% rename from boards/shields/grove/boards/mimxrt1060_evkb.overlay rename to boards/shields/grove/boards/mimxrt1060_evk_mimxrt1062_hyperflash.overlay index f6981fb929..ae99839e47 100644 --- a/boards/shields/grove/boards/mimxrt1060_evkb.overlay +++ b/boards/shields/grove/boards/mimxrt1060_evk_mimxrt1062_hyperflash.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 TiaC Systems + * Copyright (c) 2023-2024 TiaC Systems * SPDX-License-Identifier: Apache-2.0 */ diff --git a/boards/shields/grove/boards/mimxrt1060_evk.overlay b/boards/shields/grove/boards/mimxrt1060_evk_mimxrt1062_qspi.overlay similarity index 68% rename from boards/shields/grove/boards/mimxrt1060_evk.overlay rename to boards/shields/grove/boards/mimxrt1060_evk_mimxrt1062_qspi.overlay index f6981fb929..ae99839e47 100644 --- a/boards/shields/grove/boards/mimxrt1060_evk.overlay +++ b/boards/shields/grove/boards/mimxrt1060_evk_mimxrt1062_qspi.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 TiaC Systems + * Copyright (c) 2023-2024 TiaC Systems * SPDX-License-Identifier: Apache-2.0 */ diff --git a/boards/shields/grove/boards/seeed_grove_base_v1/mimxrt1060_evk.overlay b/boards/shields/grove/boards/seeed_grove_base_v1/mimxrt1060_evk_mimxrt1062_hyperflash.overlay similarity index 68% rename from boards/shields/grove/boards/seeed_grove_base_v1/mimxrt1060_evk.overlay rename to boards/shields/grove/boards/seeed_grove_base_v1/mimxrt1060_evk_mimxrt1062_hyperflash.overlay index bbe7c6e039..f1eb9c59cd 100644 --- a/boards/shields/grove/boards/seeed_grove_base_v1/mimxrt1060_evk.overlay +++ b/boards/shields/grove/boards/seeed_grove_base_v1/mimxrt1060_evk_mimxrt1062_hyperflash.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 TiaC Systems + * Copyright (c) 2023-2024 TiaC Systems * SPDX-License-Identifier: Apache-2.0 */ diff --git a/boards/shields/grove/boards/seeed_grove_base_v1/mimxrt1060_evkb.overlay b/boards/shields/grove/boards/seeed_grove_base_v1/mimxrt1060_evk_mimxrt1062_qspi.overlay similarity index 68% rename from boards/shields/grove/boards/seeed_grove_base_v1/mimxrt1060_evkb.overlay rename to boards/shields/grove/boards/seeed_grove_base_v1/mimxrt1060_evk_mimxrt1062_qspi.overlay index bbe7c6e039..f1eb9c59cd 100644 --- a/boards/shields/grove/boards/seeed_grove_base_v1/mimxrt1060_evkb.overlay +++ b/boards/shields/grove/boards/seeed_grove_base_v1/mimxrt1060_evk_mimxrt1062_qspi.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 TiaC Systems + * Copyright (c) 2023-2024 TiaC Systems * SPDX-License-Identifier: Apache-2.0 */ diff --git a/boards/shields/grove/boards/seeed_grove_base_v2/mimxrt1060_evk.overlay b/boards/shields/grove/boards/seeed_grove_base_v2/mimxrt1060_evk_mimxrt1062_hyperflash.overlay similarity index 68% rename from boards/shields/grove/boards/seeed_grove_base_v2/mimxrt1060_evk.overlay rename to boards/shields/grove/boards/seeed_grove_base_v2/mimxrt1060_evk_mimxrt1062_hyperflash.overlay index bbe7c6e039..f1eb9c59cd 100644 --- a/boards/shields/grove/boards/seeed_grove_base_v2/mimxrt1060_evk.overlay +++ b/boards/shields/grove/boards/seeed_grove_base_v2/mimxrt1060_evk_mimxrt1062_hyperflash.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 TiaC Systems + * Copyright (c) 2023-2024 TiaC Systems * SPDX-License-Identifier: Apache-2.0 */ diff --git a/boards/shields/grove/boards/seeed_grove_base_v2/mimxrt1060_evkb.overlay b/boards/shields/grove/boards/seeed_grove_base_v2/mimxrt1060_evk_mimxrt1062_qspi.overlay similarity index 68% rename from boards/shields/grove/boards/seeed_grove_base_v2/mimxrt1060_evkb.overlay rename to boards/shields/grove/boards/seeed_grove_base_v2/mimxrt1060_evk_mimxrt1062_qspi.overlay index bbe7c6e039..f1eb9c59cd 100644 --- a/boards/shields/grove/boards/seeed_grove_base_v2/mimxrt1060_evkb.overlay +++ b/boards/shields/grove/boards/seeed_grove_base_v2/mimxrt1060_evk_mimxrt1062_qspi.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 TiaC Systems + * Copyright (c) 2023-2024 TiaC Systems * SPDX-License-Identifier: Apache-2.0 */ diff --git a/boards/shields/grove/doc/index.rst b/boards/shields/grove/doc/index.rst index 08e8c896c4..41a384701e 100644 --- a/boards/shields/grove/doc/index.rst +++ b/boards/shields/grove/doc/index.rst @@ -862,7 +862,7 @@ example: .. zephyr-app-commands:: :app: bridle/samples/helloshell :build-dir: helloshell-seeed_grove_base_v2 - :board: mimxrt1060_evkb + :board: mimxrt1060_evk@B//qspi :shield: seeed_grove_base_v2 :goals: flash :west-args: -p @@ -875,7 +875,7 @@ example: .. zephyr-app-commands:: :app: bridle/samples/helloshell :build-dir: helloshell-seeed_grove_base_v1 - :board: mimxrt1060_evkb + :board: mimxrt1060_evk@B//qspi :shield: seeed_grove_base_v1 :goals: flash :west-args: -p diff --git a/boards/shields/grove_btn/doc/index.rst b/boards/shields/grove_btn/doc/index.rst index 102fae05ce..0ca1b21566 100644 --- a/boards/shields/grove_btn/doc/index.rst +++ b/boards/shields/grove_btn/doc/index.rst @@ -194,7 +194,7 @@ corresponds to the ordinal number of a signal from the .. zephyr-app-commands:: :app: bridle/samples/helloshell :build-dir: helloshell-seeed_grove_base_v2-grove_btn_d4_inv - :board: mimxrt1060_evkb + :board: mimxrt1060_evk@B//qspi :shield: "seeed_grove_base_v2 grove_btn_d4_inv" :goals: flash :west-args: -p @@ -207,7 +207,7 @@ corresponds to the ordinal number of a signal from the .. zephyr-app-commands:: :app: bridle/samples/helloshell :build-dir: helloshell-seeed_grove_base_v1-grove_btn_d4_inv - :board: mimxrt1060_evkb + :board: mimxrt1060_evk@B//qspi :shield: "seeed_grove_base_v1 grove_btn_d4_inv" :goals: flash :west-args: -p @@ -222,7 +222,7 @@ corresponds to the ordinal number of a signal from the .. zephyr-app-commands:: :app: bridle/samples/helloshell :build-dir: helloshell-seeed_grove_base_v2-grove_btn_d4 - :board: mimxrt1060_evkb + :board: mimxrt1060_evk@B//qspi :shield: "seeed_grove_base_v2 grove_btn_d4" :goals: flash :west-args: -p @@ -235,7 +235,7 @@ corresponds to the ordinal number of a signal from the .. zephyr-app-commands:: :app: bridle/samples/helloshell :build-dir: helloshell-seeed_grove_base_v1-grove_btn_d4 - :board: mimxrt1060_evkb + :board: mimxrt1060_evk@B//qspi :shield: "seeed_grove_base_v1 grove_btn_d4" :goals: flash :west-args: -p diff --git a/boards/shields/grove_led/doc/index.rst b/boards/shields/grove_led/doc/index.rst index 55ea311b0e..066330fdd6 100644 --- a/boards/shields/grove_led/doc/index.rst +++ b/boards/shields/grove_led/doc/index.rst @@ -231,7 +231,7 @@ from the |Laced Grove Signal Interface|. For example: .. zephyr-app-commands:: :app: bridle/samples/helloshell :build-dir: helloshell-seeed_grove_base_v2-grove_led_d5 - :board: mimxrt1060_evkb + :board: mimxrt1060_evk@B//qspi :shield: "seeed_grove_base_v2 grove_led_d5" :goals: flash :west-args: -p @@ -244,7 +244,7 @@ from the |Laced Grove Signal Interface|. For example: .. zephyr-app-commands:: :app: bridle/samples/helloshell :build-dir: helloshell-seeed_grove_base_v2-grove_pwm_led_d5 - :board: mimxrt1060_evkb + :board: mimxrt1060_evk@B//qspi :shield: "seeed_grove_base_v2 grove_pwm_led_d5" :goals: flash :west-args: -p @@ -257,7 +257,7 @@ from the |Laced Grove Signal Interface|. For example: .. zephyr-app-commands:: :app: bridle/samples/helloshell :build-dir: helloshell-seeed_grove_base_v1-grove_led_d5 - :board: mimxrt1060_evkb + :board: mimxrt1060_evk@B//qspi :shield: "seeed_grove_base_v1 grove_led_d5" :goals: flash :west-args: -p @@ -270,7 +270,7 @@ from the |Laced Grove Signal Interface|. For example: .. zephyr-app-commands:: :app: bridle/samples/helloshell :build-dir: helloshell-seeed_grove_base_v1-grove_pwm_led_d5 - :board: mimxrt1060_evkb + :board: mimxrt1060_evk@B//qspi :shield: "seeed_grove_base_v1 grove_pwm_led_d5" :goals: flash :west-args: -p diff --git a/boards/shields/grove_sens/doc/index.rst b/boards/shields/grove_sens/doc/index.rst index c5363eb300..c30a3915f8 100644 --- a/boards/shields/grove_sens/doc/index.rst +++ b/boards/shields/grove_sens/doc/index.rst @@ -191,7 +191,7 @@ corresponds to the exact sensor type. For example: .. zephyr-app-commands:: :app: bridle/samples/helloshell :build-dir: helloshell-seeed_grove_base_v2-grove_sens_bme280 - :board: mimxrt1060_evkb + :board: mimxrt1060_evk@B//qspi :shield: "seeed_grove_base_v2 grove_sens_bme280" :goals: flash :west-args: -p @@ -204,7 +204,7 @@ corresponds to the exact sensor type. For example: .. zephyr-app-commands:: :app: bridle/samples/helloshell :build-dir: helloshell-seeed_grove_base_v1-grove_sens_bmp280 - :board: mimxrt1060_evkb + :board: mimxrt1060_evk@B//qspi :shield: "seeed_grove_base_v1 grove_sens_bmp280" :goals: flash :west-args: -p diff --git a/boards/shields/x_grove_testbed/doc/index.rst b/boards/shields/x_grove_testbed/doc/index.rst index 6c9f80474b..67273478fd 100644 --- a/boards/shields/x_grove_testbed/doc/index.rst +++ b/boards/shields/x_grove_testbed/doc/index.rst @@ -456,7 +456,7 @@ For example: .. zephyr-app-commands:: :app: zephyr/samples/basic/blinky :build-dir: blinky-mimxrt1060_evkb-x_grove_testbed - :board: mimxrt1060_evkb + :board: mimxrt1060_evk@B//qspi :shield: \ "seeed_grove_base_v2 grove_btn_d4 grove_led_d6 x_grove_testbed" :goals: flash @@ -473,7 +473,7 @@ For example: .. zephyr-app-commands:: :app: zephyr/samples/basic/button :build-dir: button-mimxrt1060_evkb-x_grove_testbed - :board: mimxrt1060_evkb + :board: mimxrt1060_evk@B//qspi :shield: \ "seeed_grove_base_v2 grove_btn_d4 grove_led_d6 x_grove_testbed" :goals: flash diff --git a/doc/bridle/app_boards.rst b/doc/bridle/app_boards.rst index 138f855978..05f212ccfe 100644 --- a/doc/bridle/app_boards.rst +++ b/doc/bridle/app_boards.rst @@ -26,56 +26,57 @@ Also see the |zephyr:boards| section in the |ZEPHYR| documentation. Bridle provides some standard board extensions. For more details, see the :ref:`boards-extensions` section in this documentation. -+-------------------+------------------------------------+---------------------------------------+ -| Hardware platform | Board name | Build target | -+===================+====================================+=======================================+ -| Native | |zephyr:board:native_posix| | | ``native_posix`` | -| | | | ``native_posix/native/64`` | -| +------------------------------------+---------------------------------------+ -| | |zephyr:board:native_sim| | | ``native_sim`` | -| | | | ``native_sim/native/64`` | -+-------------------+------------------------------------+---------------------------------------+ -| Emulator | |zephyr:board:qemu_x86| | | ``qemu_x86`` | -| | | | ``qemu_x86_64`` | -| +------------------------------------+---------------------------------------+ -| | |zephyr:board:qemu_cortex_m3| | ``qemu_cortex_m3`` | -+-------------------+------------------------------------+---------------------------------------+ -| ATSAMD21G18A | |zephyr:board:arduino_zero| | ``arduino_zero`` | -| +------------------------------------+---------------------------------------+ -| | |zephyr:board:seeeduino_xiao| | ``seeeduino_xiao`` | -+-------------------+------------------------------------+---------------------------------------+ -| i.MX RT1010 | |zephyr:board:mimxrt1010_evk| | ``mimxrt1010_evk`` | -+-------------------+------------------------------------+---------------------------------------+ -| i.MX RT1060 | |zephyr:board:mimxrt1060_evk| | | ``mimxrt1060_evk`` | -| | | | ``mimxrt1060_evkb`` | -+-------------------+------------------------------------+---------------------------------------+ -| i.MX RT1170 (CM7) | |zephyr:board:mimxrt1170_evk| | | ``mimxrt1170_evk/mimxrt1176/cm4`` | -| | | | ``mimxrt1170_evk/mimxrt1176/cm7`` | -| | | | ``mimxrt1170_evk@B/mimxrt1176/cm4`` | -| | | | ``mimxrt1170_evk@B/mimxrt1176/cm7`` | -+-------------------+------------------------------------+---------------------------------------+ -| nRF52840 | |zephyr:board:nrf52840dk_nrf52840| | ``nrf52840dk/nrf52840`` | -| +------------------------------------+---------------------------------------+ -| | |zephyr:board:nrf9160dk_nrf52840| | ``nrf9160dk/nrf52840`` | -+-------------------+------------------------------------+---------------------------------------+ -| nRF9160 | |zephyr:board:nrf9160dk_nrf9160| | | ``nrf9160dk/nrf9160`` | -| | | | ``nrf9160dk/nrf9160/ns`` | -+-------------------+------------------------------------+---------------------------------------+ -| RP2040 | |zephyr:board:rpi_pico| | | ``rpi_pico`` | -| | | | ``rpi_pico/rp2040/w`` | -+-------------------+------------------------------------+---------------------------------------+ -| STM32F303RE | |zephyr:board:nucleo_f303re| | ``nucleo_f303re`` | -+-------------------+------------------------------------+---------------------------------------+ -| STM32F401RE | |zephyr:board:nucleo_f401re| | ``nucleo_f401re`` | -+-------------------+------------------------------------+---------------------------------------+ -| STM32F413ZH | |zephyr:board:nucleo_f413zh| | ``nucleo_f413zh`` | -+-------------------+------------------------------------+---------------------------------------+ -| STM32F746ZG | |zephyr:board:nucleo_f746zg| | ``nucleo_f746zg`` | -+-------------------+------------------------------------+---------------------------------------+ -| STM32F767ZI | |zephyr:board:nucleo_f767zi| | ``nucleo_f767zi`` | -+-------------------+------------------------------------+---------------------------------------+ -| STM32L496ZG | |zephyr:board:nucleo_l496zg| | ``nucleo_l496zg`` | -+-------------------+------------------------------------+---------------------------------------+ ++-------------------+------------------------------------+----------------------------------------------+ +| Hardware platform | Board name | Build target | ++===================+====================================+==============================================+ +| Native | |zephyr:board:native_posix| | | ``native_posix`` | +| | | | ``native_posix/native/64`` | +| +------------------------------------+----------------------------------------------+ +| | |zephyr:board:native_sim| | | ``native_sim`` | +| | | | ``native_sim/native/64`` | ++-------------------+------------------------------------+----------------------------------------------+ +| Emulator | |zephyr:board:qemu_x86| | | ``qemu_x86`` | +| | | | ``qemu_x86_64`` | +| +------------------------------------+----------------------------------------------+ +| | |zephyr:board:qemu_cortex_m3| | ``qemu_cortex_m3`` | ++-------------------+------------------------------------+----------------------------------------------+ +| ATSAMD21G18A | |zephyr:board:arduino_zero| | ``arduino_zero`` | +| +------------------------------------+----------------------------------------------+ +| | |zephyr:board:seeeduino_xiao| | ``seeeduino_xiao`` | ++-------------------+------------------------------------+----------------------------------------------+ +| i.MX RT1010 | |zephyr:board:mimxrt1010_evk| | ``mimxrt1010_evk`` | ++-------------------+------------------------------------+----------------------------------------------+ +| i.MX RT1060 | |zephyr:board:mimxrt1060_evk| | | ``mimxrt1060_evk@A/mimxrt1062/hyperflash`` | +| | | | ``mimxrt1060_evk@A/mimxrt1062/qspi`` | +| | | | ``mimxrt1060_evk@B/mimxrt1062/qspi`` | ++-------------------+------------------------------------+----------------------------------------------+ +| i.MX RT1170 (CM7) | |zephyr:board:mimxrt1170_evk| | | ``mimxrt1170_evk/mimxrt1176/cm4`` | +| | | | ``mimxrt1170_evk/mimxrt1176/cm7`` | +| | | | ``mimxrt1170_evk@B/mimxrt1176/cm4`` | +| | | | ``mimxrt1170_evk@B/mimxrt1176/cm7`` | ++-------------------+------------------------------------+----------------------------------------------+ +| nRF52840 | |zephyr:board:nrf52840dk_nrf52840| | ``nrf52840dk/nrf52840`` | +| +------------------------------------+----------------------------------------------+ +| | |zephyr:board:nrf9160dk_nrf52840| | ``nrf9160dk/nrf52840`` | ++-------------------+------------------------------------+----------------------------------------------+ +| nRF9160 | |zephyr:board:nrf9160dk_nrf9160| | | ``nrf9160dk/nrf9160`` | +| | | | ``nrf9160dk/nrf9160/ns`` | ++-------------------+------------------------------------+----------------------------------------------+ +| RP2040 | |zephyr:board:rpi_pico| | | ``rpi_pico`` | +| | | | ``rpi_pico/rp2040/w`` | ++-------------------+------------------------------------+----------------------------------------------+ +| STM32F303RE | |zephyr:board:nucleo_f303re| | ``nucleo_f303re`` | ++-------------------+------------------------------------+----------------------------------------------+ +| STM32F401RE | |zephyr:board:nucleo_f401re| | ``nucleo_f401re`` | ++-------------------+------------------------------------+----------------------------------------------+ +| STM32F413ZH | |zephyr:board:nucleo_f413zh| | ``nucleo_f413zh`` | ++-------------------+------------------------------------+----------------------------------------------+ +| STM32F746ZG | |zephyr:board:nucleo_f746zg| | ``nucleo_f746zg`` | ++-------------------+------------------------------------+----------------------------------------------+ +| STM32F767ZI | |zephyr:board:nucleo_f767zi| | ``nucleo_f767zi`` | ++-------------------+------------------------------------+----------------------------------------------+ +| STM32L496ZG | |zephyr:board:nucleo_l496zg| | ``nucleo_l496zg`` | ++-------------------+------------------------------------+----------------------------------------------+ Boards included in tiac-bridle diff --git a/samples/button/sample.yaml b/samples/button/sample.yaml index c8ef1a6a73..89006db4f0 100644 --- a/samples/button/sample.yaml +++ b/samples/button/sample.yaml @@ -11,8 +11,9 @@ common: - cytron_maker_nano_rp2040 - cytron_maker_pi_rp2040 - mimxrt1010_evk - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - mimxrt1170_evk/mimxrt1176/cm4 - mimxrt1170_evk/mimxrt1176/cm7 - mimxrt1170_evk@B/mimxrt1176/cm4 diff --git a/samples/helloshell/sample.yaml b/samples/helloshell/sample.yaml index de990b31d8..f969c787d7 100644 --- a/samples/helloshell/sample.yaml +++ b/samples/helloshell/sample.yaml @@ -58,8 +58,9 @@ common: - cytron_maker_nano_rp2040 - cytron_maker_pi_rp2040 - mimxrt1010_evk - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - mimxrt1170_evk/mimxrt1176/cm4 - mimxrt1170_evk/mimxrt1176/cm7 - mimxrt1170_evk@B/mimxrt1176/cm4 diff --git a/samples/ubx_gnss/sample.yaml b/samples/ubx_gnss/sample.yaml index 97072dcfd1..aa43628224 100644 --- a/samples/ubx_gnss/sample.yaml +++ b/samples/ubx_gnss/sample.yaml @@ -9,8 +9,9 @@ common: sysbuild: false platform_allow: - mimxrt1010_evk - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - mimxrt1170_evk/mimxrt1176/cm7 - mimxrt1170_evk@B/mimxrt1176/cm7 - nrf52840dk/nrf52840 @@ -23,8 +24,9 @@ common: - nucleo_l496zg integration_platforms: - mimxrt1010_evk - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - mimxrt1170_evk/mimxrt1176/cm7 - mimxrt1170_evk@B/mimxrt1176/cm7 - nrf52840dk/nrf52840 diff --git a/snippets/usb-console/README.rst b/snippets/usb-console/README.rst index b67f74cfae..3b12b4c2d5 100644 --- a/snippets/usb-console/README.rst +++ b/snippets/usb-console/README.rst @@ -72,9 +72,9 @@ specified as required. * - |mimxrt1060_evk_URB_VID| - |mimxrt1060_evk_URB_PID_CON| - - | :code:`mimxrt1060_evk` - | :code:`mimxrt1060_evkb` - | :code:`mimxrt1060_evk_hyperflash` + - | :code:`mimxrt1060_evk@B/mimxrt1062/qspi` + | :code:`mimxrt1060_evk@A/mimxrt1062/qspi` + | :code:`mimxrt1060_evk@A/mimxrt1062/hyperflash` - |NXP Semiconductors|_ - |MIMXRT1060-EVK (CDC ACM)| - derived VID from part number MIMXRT1062DVL6A diff --git a/snippets/usb-console/snippet.yml b/snippets/usb-console/snippet.yml index 6633791531..86e616c7fc 100644 --- a/snippets/usb-console/snippet.yml +++ b/snippets/usb-console/snippet.yml @@ -12,11 +12,7 @@ boards: append: EXTRA_CONF_FILE: boards/mimxrt1010_evk.conf EXTRA_DTC_OVERLAY_FILE: boards/mimxrt1010_evk.overlay - mimxrt1060_evk/mimxrt1062: - append: - EXTRA_CONF_FILE: boards/mimxrt1060_evk.conf - EXTRA_DTC_OVERLAY_FILE: boards/mimxrt1060_evk.overlay - mimxrt1060_evkb/mimxrt1062: + /mimxrt1060_evk.*/mimxrt1062/.*/: append: EXTRA_CONF_FILE: boards/mimxrt1060_evk.conf EXTRA_DTC_OVERLAY_FILE: boards/mimxrt1060_evk.overlay diff --git a/tests/quarantine.yaml b/tests/quarantine.yaml index d026729d46..16c363842d 100644 --- a/tests/quarantine.yaml +++ b/tests/quarantine.yaml @@ -55,9 +55,9 @@ - grove.connectors.x_grove_testbed.pwm.b7l6 platforms: - mimxrt1010_evk/mimxrt1011 - - mimxrt1060_evk/mimxrt1062 - - mimxrt1060_evk@qspi/mimxrt1062 - - mimxrt1060_evkb/mimxrt1062 + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - comment: "shield(grove.base.x_grove_testbed.pwm.b4l6): invalid board/shield condition." scenarios: @@ -198,9 +198,9 @@ - cytron_maker_nano_rp2040/rp2040 - cytron_maker_pi_rp2040/rp2040 - mimxrt1010_evk/mimxrt1011 - - mimxrt1060_evk/mimxrt1062 - - mimxrt1060_evk@qspi/mimxrt1062 - - mimxrt1060_evkb/mimxrt1062 + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re/stm32f303xe - nucleo_f401re/stm32f401xe - nucleo_f413zh/stm32f413xx @@ -249,9 +249,9 @@ - cytron_maker_nano_rp2040/rp2040 - cytron_maker_pi_rp2040/rp2040 - mimxrt1010_evk/mimxrt1011 - - mimxrt1060_evk/mimxrt1062 - - mimxrt1060_evk@qspi/mimxrt1062 - - mimxrt1060_evkb/mimxrt1062 + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re/stm32f303xe - nucleo_f401re/stm32f401xe - nucleo_f413zh/stm32f413xx @@ -307,9 +307,9 @@ - cytron_maker_nano_rp2040/rp2040 - cytron_maker_pi_rp2040/rp2040 - mimxrt1010_evk/mimxrt1011 - - mimxrt1060_evk/mimxrt1062 - - mimxrt1060_evk@qspi/mimxrt1062 - - mimxrt1060_evkb/mimxrt1062 + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re/stm32f303xe - nucleo_f401re/stm32f401xe - nucleo_f413zh/stm32f413xx @@ -338,9 +338,9 @@ - cytron_maker_nano_rp2040/rp2040 - cytron_maker_pi_rp2040/rp2040 - mimxrt1010_evk/mimxrt1011 - - mimxrt1060_evk/mimxrt1062 - - mimxrt1060_evk@qspi/mimxrt1062 - - mimxrt1060_evkb/mimxrt1062 + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re/stm32f303xe - nucleo_f401re/stm32f401xe - nucleo_f413zh/stm32f413xx @@ -376,9 +376,9 @@ platforms: - arduino_zero/samd21g18a - mimxrt1010_evk/mimxrt1011 - - mimxrt1060_evk/mimxrt1062 - - mimxrt1060_evk@qspi/mimxrt1062 - - mimxrt1060_evkb/mimxrt1062 + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re/stm32f303xe - nucleo_f401re/stm32f401xe - nucleo_f413zh/stm32f413xx @@ -672,9 +672,9 @@ - comment: "shield(grove.base.grove_led): mimxrt1060_evk(b): invalid board condition." platforms: - - mimxrt1060_evk/mimxrt1062 - - mimxrt1060_evk@qspi/mimxrt1062 - - mimxrt1060_evkb/mimxrt1062 + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi scenarios: - grove.base.(v2|v1).grove_led.pwm.d0 - grove.base.(v2|v1).grove_led.pwm.d1 @@ -759,9 +759,9 @@ - cytron_maker_nano_rp2040/rp2040 - cytron_maker_pi_rp2040/rp2040 - mimxrt1010_evk/mimxrt1011 - - mimxrt1060_evk/mimxrt1062 - - mimxrt1060_evk@qspi/mimxrt1062 - - mimxrt1060_evkb/mimxrt1062 + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re/stm32f303xe - nucleo_f401re/stm32f401xe - nucleo_f413zh/stm32f413xx @@ -799,9 +799,9 @@ - cytron_maker_nano_rp2040/rp2040 - cytron_maker_pi_rp2040/rp2040 - mimxrt1010_evk/mimxrt1011 - - mimxrt1060_evk/mimxrt1062 - - mimxrt1060_evk@qspi/mimxrt1062 - - mimxrt1060_evkb/mimxrt1062 + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re/stm32f303xe - nucleo_f401re/stm32f401xe - nucleo_f413zh/stm32f413xx @@ -831,9 +831,9 @@ platforms: - arduino_zero/samd21g18a - mimxrt1010_evk/mimxrt1011 - - mimxrt1060_evk/mimxrt1062 - - mimxrt1060_evk@qspi/mimxrt1062 - - mimxrt1060_evkb/mimxrt1062 + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re/stm32f303xe - nucleo_f401re/stm32f401xe - nucleo_f413zh/stm32f413xx diff --git a/tests/shields/grove/dts_bindings/testcase.yaml b/tests/shields/grove/dts_bindings/testcase.yaml index c5bfd5bad4..a91f37ca90 100644 --- a/tests/shields/grove/dts_bindings/testcase.yaml +++ b/tests/shields/grove/dts_bindings/testcase.yaml @@ -27,8 +27,9 @@ common: integration_platforms: - arduino_zero - mimxrt1010_evk - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re - nucleo_f401re - nucleo_f413zh diff --git a/tests/shields/grove_btn/dts_bindings/testcase.yaml b/tests/shields/grove_btn/dts_bindings/testcase.yaml index dd29d7d964..e63766f784 100644 --- a/tests/shields/grove_btn/dts_bindings/testcase.yaml +++ b/tests/shields/grove_btn/dts_bindings/testcase.yaml @@ -29,8 +29,9 @@ common: - cytron_maker_nano_rp2040 - cytron_maker_pi_rp2040 - mimxrt1010_evk - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re - nucleo_f401re - nucleo_f413zh diff --git a/tests/shields/grove_led/dts_bindings/testcase.yaml b/tests/shields/grove_led/dts_bindings/testcase.yaml index d8e0f81d7e..4309bb43a5 100644 --- a/tests/shields/grove_led/dts_bindings/testcase.yaml +++ b/tests/shields/grove_led/dts_bindings/testcase.yaml @@ -29,8 +29,9 @@ common: - cytron_maker_nano_rp2040 - cytron_maker_pi_rp2040 - mimxrt1010_evk - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re - nucleo_f401re - nucleo_f413zh @@ -385,8 +386,9 @@ tests: extra_args: SHIELD=seeed_grove_base_v2;grove_pwm_led_d2 platform_allow: - arduino_zero - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re - nucleo_f401re - seeeduino_cm0 @@ -400,8 +402,9 @@ tests: extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d2 platform_allow: - arduino_zero - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re - nucleo_f401re - seeeduino_cm0 @@ -415,8 +418,9 @@ tests: extra_args: SHIELD=seeed_grove_base_v2;grove_pwm_led_d3 platform_allow: - arduino_zero - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re - nucleo_f401re - nucleo_f413zh @@ -432,8 +436,9 @@ tests: extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d3 platform_allow: - arduino_zero - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re - nucleo_f401re - nucleo_f413zh @@ -449,8 +454,9 @@ tests: extra_args: SHIELD=seeed_grove_base_v2;grove_pwm_led_d4 platform_allow: - arduino_zero - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re - seeeduino_cm0 - seeeduino_lotus @@ -463,8 +469,9 @@ tests: extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d4 platform_allow: - arduino_zero - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re - seeeduino_cm0 - seeeduino_lotus @@ -477,8 +484,9 @@ tests: extra_args: SHIELD=seeed_grove_base_v2;grove_pwm_led_d5 platform_allow: - arduino_zero - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re - nucleo_f401re - nucleo_f413zh @@ -494,8 +502,9 @@ tests: extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d5 platform_allow: - arduino_zero - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re - nucleo_f401re - nucleo_f413zh @@ -627,8 +636,9 @@ tests: extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d10 platform_allow: - arduino_zero - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re - nucleo_f401re - nucleo_f413zh @@ -645,8 +655,9 @@ tests: extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d11 platform_allow: - arduino_zero - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re - nucleo_f401re - nucleo_f413zh @@ -663,8 +674,9 @@ tests: extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d12 platform_allow: - arduino_zero - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re - nucleo_f413zh - nucleo_f767zi @@ -680,8 +692,9 @@ tests: extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d13 platform_allow: - arduino_zero - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re - nucleo_f401re - nucleo_f413zh diff --git a/tests/shields/x_grove_testbed/dts_bindings/testcase.yaml b/tests/shields/x_grove_testbed/dts_bindings/testcase.yaml index bb3e4a5f8a..bb5bedfe4f 100644 --- a/tests/shields/x_grove_testbed/dts_bindings/testcase.yaml +++ b/tests/shields/x_grove_testbed/dts_bindings/testcase.yaml @@ -29,8 +29,9 @@ common: - cytron_maker_nano_rp2040 - cytron_maker_pi_rp2040 - mimxrt1010_evk - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi - nucleo_f303re - nucleo_f401re - nucleo_f413zh @@ -61,8 +62,9 @@ tests: SHIELD=seeed_grove_base_v2;grove_btn_d4;grove_led_d6;x_grove_testbed platform_allow: - mimxrt1010_evk - - mimxrt1060_evk - - mimxrt1060_evkb + - mimxrt1060_evk@A/mimxrt1062/hyperflash + - mimxrt1060_evk@A/mimxrt1062/qspi + - mimxrt1060_evk@B/mimxrt1062/qspi grove.base.v2.x_grove_testbed.pwm.b4l6: depends_on: arduino_gpio filter: dt_nodelabel_enabled("grove_d4_header") and From d2f86e4eb8b726f8faa311be91c0dd97f1ca99aa Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Sat, 28 Dec 2024 09:30:51 +0100 Subject: [PATCH 08/10] tests: fix YAML lists in Twister specifications The `depends_on` entry have to be a mutli-line list when more than one element must be defined. Signed-off-by: Stephan Linz --- .../grove_led/dts_bindings/testcase.yaml | 128 +++++++++++++----- .../dts_bindings/testcase.yaml | 12 +- 2 files changed, 105 insertions(+), 35 deletions(-) diff --git a/tests/shields/grove_led/dts_bindings/testcase.yaml b/tests/shields/grove_led/dts_bindings/testcase.yaml index 4309bb43a5..ecde18e970 100644 --- a/tests/shields/grove_led/dts_bindings/testcase.yaml +++ b/tests/shields/grove_led/dts_bindings/testcase.yaml @@ -1616,7 +1616,9 @@ tests: # Grove LED by dedicated PWM on Grove Connectors # grove.connectors.grove_led.pwm.d0: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d0") and ( dt_nodelabel_enabled("grove_d0_header") or dt_nodelabel_enabled("grove_uart_header") ) and @@ -1626,7 +1628,9 @@ tests: - cytron_maker_nano_rp2040 - cytron_maker_pi_rp2040 grove.connectors.grove_led.pwm.d1: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d1") and ( dt_nodelabel_enabled("grove_d1_header") or dt_nodelabel_enabled("grove_d0_header") or @@ -1637,7 +1641,9 @@ tests: - cytron_maker_nano_rp2040 - cytron_maker_pi_rp2040 grove.connectors.grove_led.pwm.d2: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d2") and ( dt_nodelabel_enabled("grove_d2_header") or dt_nodelabel_enabled("grove_d1_header") ) and @@ -1647,7 +1653,9 @@ tests: - cytron_maker_pi_rp2040 - seeeduino_lotus grove.connectors.grove_led.pwm.d3: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d3") and ( dt_nodelabel_enabled("grove_d3_header") or dt_nodelabel_enabled("grove_d2_header") ) and @@ -1657,7 +1665,9 @@ tests: - cytron_maker_pi_rp2040 - seeeduino_lotus grove.connectors.grove_led.pwm.d4: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d4") and ( dt_nodelabel_enabled("grove_d4_header") or dt_nodelabel_enabled("grove_d3_header") ) and @@ -1667,7 +1677,9 @@ tests: - cytron_maker_pi_rp2040 - seeeduino_lotus grove.connectors.grove_led.pwm.d5: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d5") and ( dt_nodelabel_enabled("grove_d5_header") or dt_nodelabel_enabled("grove_d4_header") ) and @@ -1677,7 +1689,9 @@ tests: - cytron_maker_pi_rp2040 - seeeduino_lotus grove.connectors.grove_led.pwm.d6: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d6") and ( dt_nodelabel_enabled("grove_d6_header") or dt_nodelabel_enabled("grove_d5_header") ) and @@ -1687,7 +1701,9 @@ tests: - cytron_maker_pi_rp2040 - seeeduino_lotus grove.connectors.grove_led.pwm.d7: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d7") and ( dt_nodelabel_enabled("grove_d7_header") or dt_nodelabel_enabled("grove_d6_header") ) and @@ -1697,7 +1713,9 @@ tests: - cytron_maker_pi_rp2040 - seeeduino_lotus grove.connectors.grove_led.pwm.d8: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d8") and ( dt_nodelabel_enabled("grove_d8_header") or dt_nodelabel_enabled("grove_d7_header") ) and @@ -1706,7 +1724,9 @@ tests: platform_allow: - seeeduino_lotus grove.connectors.grove_led.pwm.d9: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d9") and ( dt_nodelabel_enabled("grove_d9_header") or dt_nodelabel_enabled("grove_d8_header") ) and @@ -1714,7 +1734,9 @@ tests: extra_args: SHIELD=grove_pwm_led_d9 skip: true grove.connectors.grove_led.pwm.d10: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d10") and ( dt_nodelabel_enabled("grove_d10_header") or dt_nodelabel_enabled("grove_d9_header") ) and @@ -1722,7 +1744,9 @@ tests: extra_args: SHIELD=grove_pwm_led_d10 skip: true grove.connectors.grove_led.pwm.d11: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d11") and ( dt_nodelabel_enabled("grove_d11_header") or dt_nodelabel_enabled("grove_d10_header") ) and @@ -1730,7 +1754,9 @@ tests: extra_args: SHIELD=grove_pwm_led_d11 skip: true grove.connectors.grove_led.pwm.d12: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d12") and ( dt_nodelabel_enabled("grove_d12_header") or dt_nodelabel_enabled("grove_d11_header") ) and @@ -1738,7 +1764,9 @@ tests: extra_args: SHIELD=grove_pwm_led_d12 skip: true grove.connectors.grove_led.pwm.d13: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d13") and ( dt_nodelabel_enabled("grove_d13_header") or dt_nodelabel_enabled("grove_d12_header") ) and @@ -1746,7 +1774,9 @@ tests: extra_args: SHIELD=grove_pwm_led_d13 skip: true grove.connectors.grove_led.pwm.d14: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d14") and ( dt_nodelabel_enabled("grove_d14_header") or dt_nodelabel_enabled("grove_d13_header") or @@ -1756,7 +1786,9 @@ tests: platform_allow: - cytron_maker_nano_rp2040 grove.connectors.grove_led.pwm.d15: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d15") and ( dt_nodelabel_enabled("grove_d15_header") or dt_nodelabel_enabled("grove_d14_header") or @@ -1767,7 +1799,9 @@ tests: platform_allow: - cytron_maker_nano_rp2040 grove.connectors.grove_led.pwm.d16: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d16") and ( dt_nodelabel_enabled("grove_d16_header") or dt_nodelabel_enabled("grove_d15_header") or @@ -1778,7 +1812,9 @@ tests: platform_allow: - cytron_maker_pi_rp2040 grove.connectors.grove_led.pwm.d17: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d17") and ( dt_nodelabel_enabled("grove_d17_header") or dt_nodelabel_enabled("grove_d16_header") or @@ -1789,7 +1825,9 @@ tests: platform_allow: - cytron_maker_pi_rp2040 grove.connectors.grove_led.pwm.d18: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d18") and ( dt_nodelabel_enabled("grove_d18_header") or dt_nodelabel_enabled("grove_i2c_header") or @@ -1797,7 +1835,9 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d18", "pwm-leds") extra_args: SHIELD=grove_pwm_led_d18 grove.connectors.grove_led.pwm.d19: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d19") and ( dt_nodelabel_enabled("grove_d19_header") or dt_nodelabel_enabled("grove_i2c_header") or @@ -1805,7 +1845,9 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d19", "pwm-leds") extra_args: SHIELD=grove_pwm_led_d19 grove.connectors.grove_led.pwm.d20: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d20") and ( dt_nodelabel_enabled("grove_d20_header") or dt_nodelabel_enabled("grove_a6_header") ) and @@ -1813,7 +1855,9 @@ tests: extra_args: SHIELD=grove_pwm_led_d20 skip: true grove.connectors.grove_led.pwm.d21: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d21") and ( dt_nodelabel_enabled("grove_d21_header") or dt_nodelabel_enabled("grove_d20_header") ) and @@ -1821,7 +1865,9 @@ tests: extra_args: SHIELD=grove_pwm_led_d21 skip: true grove.connectors.grove_led.pwm.d22: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d22") and ( dt_nodelabel_enabled("grove_d22_header") or dt_nodelabel_enabled("grove_d21_header") ) and @@ -1829,7 +1875,9 @@ tests: extra_args: SHIELD=grove_pwm_led_d22 skip: true grove.connectors.grove_led.pwm.d23: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d23") and ( dt_nodelabel_enabled("grove_d23_header") or dt_nodelabel_enabled("grove_d22_header") ) and @@ -1837,7 +1885,9 @@ tests: extra_args: SHIELD=grove_pwm_led_d23 skip: true grove.connectors.grove_led.pwm.d24: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d24") and ( dt_nodelabel_enabled("grove_d24_header") or dt_nodelabel_enabled("grove_d23_header") ) and @@ -1845,7 +1895,9 @@ tests: extra_args: SHIELD=grove_pwm_led_d24 skip: true grove.connectors.grove_led.pwm.d25: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d25") and ( dt_nodelabel_enabled("grove_d25_header") or dt_nodelabel_enabled("grove_d24_header") ) and @@ -1853,7 +1905,9 @@ tests: extra_args: SHIELD=grove_pwm_led_d25 skip: true grove.connectors.grove_led.pwm.d26: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d26") and ( dt_nodelabel_enabled("grove_d26_header") or dt_nodelabel_enabled("grove_d25_header") ) and @@ -1862,7 +1916,9 @@ tests: platform_allow: - cytron_maker_pi_rp2040 grove.connectors.grove_led.pwm.d27: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d27") and ( dt_nodelabel_enabled("grove_d27_header") or dt_nodelabel_enabled("grove_d26_header") ) and @@ -1871,7 +1927,9 @@ tests: platform_allow: - cytron_maker_pi_rp2040 grove.connectors.grove_led.pwm.d28: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d28") and ( dt_nodelabel_enabled("grove_d28_header") or dt_nodelabel_enabled("grove_d27_header") ) and @@ -1880,7 +1938,9 @@ tests: platform_allow: - cytron_maker_pi_rp2040 grove.connectors.grove_led.pwm.d29: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d29") and ( dt_nodelabel_enabled("grove_d29_header") or dt_nodelabel_enabled("grove_d28_header") ) and @@ -1888,7 +1948,9 @@ tests: extra_args: SHIELD=grove_pwm_led_d29 skip: true grove.connectors.grove_led.pwm.d30: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d30") and ( dt_nodelabel_enabled("grove_d30_header") or dt_nodelabel_enabled("grove_d29_header") ) and @@ -1896,7 +1958,9 @@ tests: extra_args: SHIELD=grove_pwm_led_d30 skip: true grove.connectors.grove_led.pwm.d31: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_pwm_d31") and ( dt_nodelabel_enabled("grove_d31_header") or dt_nodelabel_enabled("grove_d30_header") ) and diff --git a/tests/shields/x_grove_testbed/dts_bindings/testcase.yaml b/tests/shields/x_grove_testbed/dts_bindings/testcase.yaml index bb5bedfe4f..9766ac85a6 100644 --- a/tests/shields/x_grove_testbed/dts_bindings/testcase.yaml +++ b/tests/shields/x_grove_testbed/dts_bindings/testcase.yaml @@ -120,7 +120,9 @@ tests: - waveshare_rp2040_plus - waveshare_rp2040_plus@16mb grove.connectors.x_grove_testbed.pwm.b0l15: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_d15_header") and dt_label_with_parent_compat_enabled("grove_pwm_led_d15", "pwm-leds") and dt_label_with_parent_compat_enabled("grove_led_d15", "gpio-leds") and @@ -131,7 +133,9 @@ tests: platform_allow: - cytron_maker_nano_rp2040 grove.connectors.x_grove_testbed.pwm.b3l5: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_d5_header") and dt_label_with_parent_compat_enabled("grove_pwm_led_d5", "pwm-leds") and dt_label_with_parent_compat_enabled("grove_led_d5", "gpio-leds") and @@ -142,7 +146,9 @@ tests: platform_allow: - cytron_maker_pi_rp2040 grove.connectors.x_grove_testbed.pwm.b7l6: - depends_on: grove_gpio grove_pwm + depends_on: + - grove_gpio + - grove_pwm filter: dt_nodelabel_enabled("grove_d6_header") and dt_label_with_parent_compat_enabled("grove_pwm_led_d6", "pwm-leds") and dt_label_with_parent_compat_enabled("grove_led_d6", "gpio-leds") and From f3b9207621021b8e52638dfd4cb5e42007eea181 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Sat, 28 Dec 2024 16:19:08 +0100 Subject: [PATCH 09/10] tests: drivers: watchdog: add integration platforms Add `integration_platforms` to the watchdoc basic API testcase copy. Signed-off-by: Stephan Linz --- .../tests/drivers/watchdog/wdt_basic_api/testcase.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zephyr/alt-config/tests/drivers/watchdog/wdt_basic_api/testcase.yaml b/zephyr/alt-config/tests/drivers/watchdog/wdt_basic_api/testcase.yaml index cbaeb0f441..b078361aeb 100644 --- a/zephyr/alt-config/tests/drivers/watchdog/wdt_basic_api/testcase.yaml +++ b/zephyr/alt-config/tests/drivers/watchdog/wdt_basic_api/testcase.yaml @@ -130,6 +130,8 @@ tests: - s32z2xxdc2@D/s32z270/rtu0 - s32z2xxdc2@D/s32z270/rtu1 - mr_canhubk3 + integration_platforms: + - s32z2xxdc2/s32z270/rtu0 drivers.watchdog.mimxrt1050_evk_ti_tps382x: filter: dt_compat_enabled("ti,tps382x") platform_allow: mimxrt1050_evk/mimxrt1052/hyperflash From 7135fa00e7c4b7c319639b4fb40349428a7b3624 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Sat, 28 Dec 2024 17:15:16 +0100 Subject: [PATCH 10/10] twister: update alternative specifications Synchronize with Zephyr upstream. Signed-off-by: Stephan Linz --- .../samples/basic/rgb_led/sample.yaml | 11 +++++++-- .../samples/drivers/display/sample.yaml | 5 ++-- .../drivers/{ => led}/led_strip/sample.yaml | 5 ++-- .../subsys/input/input_dump/sample.yaml | 5 ++-- .../drivers/i2c/i2c_target_api/testcase.yaml | 23 +++++++++++++++++++ 5 files changed, 41 insertions(+), 8 deletions(-) rename zephyr/alt-config/samples/drivers/{ => led}/led_strip/sample.yaml (94%) diff --git a/zephyr/alt-config/samples/basic/rgb_led/sample.yaml b/zephyr/alt-config/samples/basic/rgb_led/sample.yaml index 6ad3f5bab9..a639ed4a4c 100644 --- a/zephyr/alt-config/samples/basic/rgb_led/sample.yaml +++ b/zephyr/alt-config/samples/basic/rgb_led/sample.yaml @@ -8,9 +8,16 @@ common: - drivers - pwm depends_on: pwm - harness: led - build_only: true + harness: console + harness_config: + fixture: fixture_led tests: + sample.basic.rgb_led: + filter: dt_alias_exists("red-pwm-led") and + dt_alias_exists("green-pwm-led") and + dt_alias_exists("blue-pwm-led") + integration_platforms: + - nrf52840_mdk # # shield: PiMoroni Pico LCD 1.14 # diff --git a/zephyr/alt-config/samples/drivers/display/sample.yaml b/zephyr/alt-config/samples/drivers/display/sample.yaml index b2ca753a44..45ec2e7dc0 100644 --- a/zephyr/alt-config/samples/drivers/display/sample.yaml +++ b/zephyr/alt-config/samples/drivers/display/sample.yaml @@ -8,8 +8,9 @@ common: - drivers - display depends_on: spi - harness: display - build_only: true + harness: console + harness_config: + fixture: fixture_display tests: # # shield: GeeekPi Pico Breadboard Kit (EP-0164) diff --git a/zephyr/alt-config/samples/drivers/led_strip/sample.yaml b/zephyr/alt-config/samples/drivers/led/led_strip/sample.yaml similarity index 94% rename from zephyr/alt-config/samples/drivers/led_strip/sample.yaml rename to zephyr/alt-config/samples/drivers/led/led_strip/sample.yaml index 7264582975..fa377babcc 100644 --- a/zephyr/alt-config/samples/drivers/led_strip/sample.yaml +++ b/zephyr/alt-config/samples/drivers/led/led_strip/sample.yaml @@ -8,8 +8,9 @@ common: - drivers - led filter: dt_alias_exists("led-strip") - harness: led_strip - build_only: true + harness: console + harness_config: + fixture: fixture_led_strip tests: # # boards with LED strip diff --git a/zephyr/alt-config/samples/subsys/input/input_dump/sample.yaml b/zephyr/alt-config/samples/subsys/input/input_dump/sample.yaml index 41d4b7df8f..24824762fd 100644 --- a/zephyr/alt-config/samples/subsys/input/input_dump/sample.yaml +++ b/zephyr/alt-config/samples/subsys/input/input_dump/sample.yaml @@ -6,9 +6,10 @@ common: - zephyr - shield - input - build_only: true depends_on: pico_gpio - harness: input + harness: console + harness_config: + fixture: fixture_input tests: # # shield: GeeekPi Pico Breadboard Kit (EP-0164) diff --git a/zephyr/alt-config/tests/drivers/i2c/i2c_target_api/testcase.yaml b/zephyr/alt-config/tests/drivers/i2c/i2c_target_api/testcase.yaml index 36f262f4e5..504dd38d82 100644 --- a/zephyr/alt-config/tests/drivers/i2c/i2c_target_api/testcase.yaml +++ b/zephyr/alt-config/tests/drivers/i2c/i2c_target_api/testcase.yaml @@ -11,6 +11,7 @@ tests: drivers.i2c.target_api.dual_role: platform_allow: - magpie_f777ni + - b_u585i_iot02a - nucleo_f746zg - nucleo_g474re - nucleo_f091rc @@ -34,3 +35,25 @@ tests: - nucleo_f091rc extra_configs: - CONFIG_APP_DUAL_ROLE_I2C=y + drivers.i2c.target_api.single_role: + platform_allow: + - frdm_mcxn947/mcxn947/cpu0 + - mimxrt1170_evk@B/mimxrt1176/cm7 + - mimxrt1170_evk/mimxrt1176/cm7 + - mimxrt1180_evk/mimxrt1189/cm33 + - mimxrt1180_evk/mimxrt1189/cm7 + - mimxrt1040_evk + - mimxrt1060_evk/mimxrt1062/qspi + - frdm_ke17z512 + - frdm_mcxn236 + - frdm_mcxa156 + - max32655evkit/max32655/m4 + - max32662evkit + - max32666evkit/max32666/cpu0 + - max32670evkit + - max32672evkit + - max32675evkit + - max32680evkit/max32680/m4 + - max32690evkit/max32690/m4 + integration_platforms: + - max32690evkit/max32690/m4