From bd49812c2a33a7ca59fa6fcecbc3ff9cef49a3c1 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Mon, 25 Sep 2023 06:03:10 +0200 Subject: [PATCH 01/22] snippets: usb-console: add CDC ACM UART console This snippet is based on zephyr/snippets/cdc-acm-console. Since it's a snippet, it can be used in any application as long as its requirements are met. This makes it more general purpose. Signed-off-by: Stephan Linz --- snippets/usb-console/README.rst | 115 +++++++++++++++++++++++ snippets/usb-console/snippet.yml | 4 + snippets/usb-console/usb-console.conf | 15 +++ snippets/usb-console/usb-console.overlay | 16 ++++ 4 files changed, 150 insertions(+) create mode 100644 snippets/usb-console/README.rst create mode 100644 snippets/usb-console/snippet.yml create mode 100644 snippets/usb-console/usb-console.conf create mode 100644 snippets/usb-console/usb-console.overlay diff --git a/snippets/usb-console/README.rst b/snippets/usb-console/README.rst new file mode 100644 index 0000000000..e6b06938ac --- /dev/null +++ b/snippets/usb-console/README.rst @@ -0,0 +1,115 @@ +.. _snippet-usb-console: + +USB Console Snippet (usb-console) +################################# + +.. code-block:: console + + west build -S usb-console [...] + +Overview +******** + +This snippet redirects serial console output to a |CDC ACM| UART. The USB +device which should be used is configured using :ref:`zephyr:devicetree`. + +.. tsn-include:: connectivity/usb/device/usb_device.rst + :docset: zephyr + :start-after: Below is a description of the different use cases and some pitfalls. + :end-before: CDC ACM UART node is supposed to be child of a USB device controller node. + +.. tsn-include:: connectivity/usb/device/usb_device.rst + :docset: zephyr + :start-after: .. _usb_device_vid_pid: + :end-before: Each USB :ref:`sample` has its own unique Product ID. + +Board specific identifiers +========================== + +In the basic configuration, the standard Zephyr USB manufacturer and product +identification is used. However, manufacturer defined values can also be +specified as required. + +.. list-table:: USB manufacturer and product identification + :class: longtable + :align: center + :widths: 10, 5, 5, 15, 15, 40, 10 + :header-rows: 1 + :stub-columns: 3 + + * - Board + - VID + - PID + - Manufacturer + - Product + - Specifications and requirements + - Chosen + + * - + - :code:`0x2FE3` + - :code:`0x0004` + - Zephyr Project + - Console over USB CDC ACM + - |Zephyr USB Vendor and Product identifiers| + - | |zephyr,console| + +How to add support of a new board +********************************* + +* add board configuration and devicetree overlay to this snippet; +* which overwrites following options: + + - :kconfig:option:`CONFIG_USB_DEVICE_VID` + - :kconfig:option:`CONFIG_USB_DEVICE_PID` + - :kconfig:option:`CONFIG_USB_DEVICE_MANUFACTURER` + - :kconfig:option:`CONFIG_USB_DEVICE_PRODUCT` + - :kconfig:option:`CONFIG_USB_DEVICE_PRODUCT` + +Requirements +************ + +Hardware support for: + +- :kconfig:option:`CONFIG_USB_DEVICE_STACK` +- :kconfig:option:`CONFIG_SERIAL` +- :kconfig:option:`CONFIG_CONSOLE` +- :kconfig:option:`CONFIG_UART_CONSOLE` +- :kconfig:option:`CONFIG_UART_LINE_CTRL` + +A devicetree node with node label ``zephyr_udc0`` that points to an enabled USB +device node with driver support. This should look roughly like this in +:ref:`your devicetree `: + +.. code-block:: DTS + + zephyr_udc0: usbd@deadbeef { + compatible = "vnd,usb-device"; + /* ... */ + }; + +References +********** + +.. target-notes:: + +.. _Arduino USB product ID list with SAM3X CPU: + https://github.com/arduino/ArduinoCore-sam/blob/master/boards.txt + +.. _Arduino USB product ID list with SAMD21 CPU: + https://github.com/arduino/ArduinoCore-samd/blob/master/boards.txt + +.. _Seeeduino USB product ID list with SAMD21 CPU: + https://github.com/Seeed-Studio/ArduinoCore-samd/blob/master/boards.txt + +.. _Raspberry Pi USB product ID list: + https://github.com/raspberrypi/usb-pid + +.. |CDC ACM| replace:: :ref:`zephyr:usb_device_cdc_acm` + +.. |Zephyr USB Vendor and Product identifiers| replace:: + Zephyr :ref:`zephyr:usb_device_vid_pid` + +.. |zephyr,console| replace:: + :ref:`zephyr,console ` +.. |zephyr,shell-uart| replace:: + :ref:`zephyr,shell-uart ` diff --git a/snippets/usb-console/snippet.yml b/snippets/usb-console/snippet.yml new file mode 100644 index 0000000000..0749527863 --- /dev/null +++ b/snippets/usb-console/snippet.yml @@ -0,0 +1,4 @@ +name: usb-console +append: + EXTRA_CONF_FILE: usb-console.conf + EXTRA_DTC_OVERLAY_FILE: usb-console.overlay diff --git a/snippets/usb-console/usb-console.conf b/snippets/usb-console/usb-console.conf new file mode 100644 index 0000000000..1f2bd2139e --- /dev/null +++ b/snippets/usb-console/usb-console.conf @@ -0,0 +1,15 @@ +# Copyright (c) 2023 TiaC Systems +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_USB_DEVICE_STACK=y + +# Zephyr Project @ USB console sample +CONFIG_USB_DEVICE_VID=0x2FE3 +CONFIG_USB_DEVICE_PID=0x0004 +CONFIG_USB_DEVICE_MANUFACTURER="Zephyr Project" +CONFIG_USB_DEVICE_PRODUCT="Console over USB CDC ACM" + +CONFIG_SERIAL=y +CONFIG_CONSOLE=y +CONFIG_UART_CONSOLE=y +CONFIG_UART_LINE_CTRL=y diff --git a/snippets/usb-console/usb-console.overlay b/snippets/usb-console/usb-console.overlay new file mode 100644 index 0000000000..e4f37268a2 --- /dev/null +++ b/snippets/usb-console/usb-console.overlay @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2023 TiaC Systems + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + chosen { + zephyr,console = &snippet_cdc_acm_console_uart; + }; +}; + +&zephyr_udc0 { + snippet_cdc_acm_console_uart: snippet_cdc_acm_console_uart { + compatible = "zephyr,cdc-acm-uart"; + }; +}; From f58f8b8c8ea876146231ecb9be01cec5af02933e Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Mon, 25 Sep 2023 07:00:11 +0200 Subject: [PATCH 02/22] snippets: usb-console: add Arduino Zero support Signed-off-by: Stephan Linz --- snippets/usb-console/README.rst | 15 +++++++++++++++ snippets/usb-console/boards/arduino_zero.conf | 10 ++++++++++ snippets/usb-console/boards/arduino_zero.overlay | 14 ++++++++++++++ snippets/usb-console/snippet.yml | 6 ++++++ 4 files changed, 45 insertions(+) create mode 100644 snippets/usb-console/boards/arduino_zero.conf create mode 100644 snippets/usb-console/boards/arduino_zero.overlay diff --git a/snippets/usb-console/README.rst b/snippets/usb-console/README.rst index e6b06938ac..4b919546fb 100644 --- a/snippets/usb-console/README.rst +++ b/snippets/usb-console/README.rst @@ -45,6 +45,15 @@ specified as required. - Specifications and requirements - Chosen + * - :code:`arduino_zero` + - :code:`0x2341` + - :code:`0x804D` + - |Arduino LLC|_ + - |Arduino Zero (CDC ACM)| + - `Arduino USB product ID list with SAMD21 CPU`_ + - | |zephyr,console| + | |zephyr,shell-uart| + * - - :code:`0x2FE3` - :code:`0x0004` @@ -92,6 +101,12 @@ References .. target-notes:: +.. _Arduino LLC: https://devicehunt.com/view/type/usb/vendor/2341 +.. |Arduino LLC| replace:: :strong:`Arduino LLC` + +.. |Arduino Zero (CDC ACM)| replace:: + :ref:`Arduino Zero (CDC ACM) ` + .. _Arduino USB product ID list with SAM3X CPU: https://github.com/arduino/ArduinoCore-sam/blob/master/boards.txt diff --git a/snippets/usb-console/boards/arduino_zero.conf b/snippets/usb-console/boards/arduino_zero.conf new file mode 100644 index 0000000000..015fa7eea4 --- /dev/null +++ b/snippets/usb-console/boards/arduino_zero.conf @@ -0,0 +1,10 @@ +# Copyright (c) 2023 TiaC Systems +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y + +# Atmel Corp. SAMD21 @ Arduino Zero +CONFIG_USB_DEVICE_VID=0x2341 +CONFIG_USB_DEVICE_PID=0x804d +CONFIG_USB_DEVICE_MANUFACTURER="Arduino LLC" +CONFIG_USB_DEVICE_PRODUCT="Arduino Zero (CDC ACM)" diff --git a/snippets/usb-console/boards/arduino_zero.overlay b/snippets/usb-console/boards/arduino_zero.overlay new file mode 100644 index 0000000000..a000702dac --- /dev/null +++ b/snippets/usb-console/boards/arduino_zero.overlay @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2023 TiaC Systems + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + model = "Arduino Zero @ USB-CDC/ACM Concole"; + compatible = "arduino,zero-usbcons", "arduino,zero", + "atmel,samd21g18a", "atmel,samd21"; + + chosen { + zephyr,shell-uart = &snippet_cdc_acm_console_uart; + }; +}; diff --git a/snippets/usb-console/snippet.yml b/snippets/usb-console/snippet.yml index 0749527863..63f67f8343 100644 --- a/snippets/usb-console/snippet.yml +++ b/snippets/usb-console/snippet.yml @@ -2,3 +2,9 @@ name: usb-console append: EXTRA_CONF_FILE: usb-console.conf EXTRA_DTC_OVERLAY_FILE: usb-console.overlay + +boards: + arduino_zero: + append: + EXTRA_CONF_FILE: boards/arduino_zero.conf + EXTRA_DTC_OVERLAY_FILE: boards/arduino_zero.overlay From ea699f5962c815a38da333d7b122c4b9be6f2e64 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Mon, 25 Sep 2023 07:16:53 +0200 Subject: [PATCH 03/22] boards: arduino_zero: use USB concole snippet - remove the special board revisions '@uartcons' and '@usbcons' - adapt documentation and link to usb-console snippet Signed-off-by: Stephan Linz --- boards/arm/arduino_zero/Kconfig.defconfig | 14 ++++--- boards/arm/arduino_zero/arduino_zero.dts | 6 +++ .../arduino_zero_uartcons.overlay | 15 ------- .../arduino_zero/arduino_zero_usbcons.conf | 12 ------ .../arduino_zero/arduino_zero_usbcons.overlay | 21 ---------- .../arduino_zero/arduino_zero_usbcons.yaml | 28 ------------- boards/arm/arduino_zero/doc/index.rst | 39 ++++++++++--------- boards/arm/arduino_zero/revision.cmake | 13 ------- 8 files changed, 35 insertions(+), 113 deletions(-) delete mode 100644 boards/arm/arduino_zero/arduino_zero_uartcons.overlay delete mode 100644 boards/arm/arduino_zero/arduino_zero_usbcons.conf delete mode 100644 boards/arm/arduino_zero/arduino_zero_usbcons.overlay delete mode 100644 boards/arm/arduino_zero/arduino_zero_usbcons.yaml delete mode 100644 boards/arm/arduino_zero/revision.cmake diff --git a/boards/arm/arduino_zero/Kconfig.defconfig b/boards/arm/arduino_zero/Kconfig.defconfig index 95702094a0..6da2bcbf85 100644 --- a/boards/arm/arduino_zero/Kconfig.defconfig +++ b/boards/arm/arduino_zero/Kconfig.defconfig @@ -17,7 +17,8 @@ DT_COMPAT_ATMEL_USB := atmel,sam0-usb DT_CHOSEN_CONSOLE_NODE := $(dt_chosen_path,$(DT_CHOSEN_Z_CONSOLE)) DT_CHOSEN_CONSOLE_PARENT := $(dt_node_parent,$(DT_CHOSEN_CONSOLE_NODE)) -if $(dt_chosen_enabled,$(DT_CHOSEN_Z_CONSOLE)) && \ +if BOARD_ARDUINO_ZERO && \ + $(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_ATMEL_USB)) @@ -25,22 +26,25 @@ config BOOTLOADER_BOSSA_DEVICE_NAME default "$(dt_chosen_label,$(DT_CHOSEN_Z_CONSOLE))" depends on USB_CDC_ACM -if LOG - # Logger cannot use itself to log choice USB_CDC_ACM_LOG_LEVEL_CHOICE default USB_CDC_ACM_LOG_LEVEL_OFF + depends on LOG endchoice # Set USB log level to error only choice USB_DEVICE_LOG_LEVEL_CHOICE default USB_DEVICE_LOG_LEVEL_ERR + depends on LOG endchoice # Wait 4000ms at startup for logging config LOG_PROCESS_THREAD_STARTUP_DELAY_MS default 4000 + depends on LOG -endif # LOG +# Wait 4000ms at startup for USB enumeration on host side +config BOOT_DELAY + default 4000 -endif # @usbcons +endif # zephyr,cdc-acm-uart diff --git a/boards/arm/arduino_zero/arduino_zero.dts b/boards/arm/arduino_zero/arduino_zero.dts index 59051ff94e..19bb932a1c 100644 --- a/boards/arm/arduino_zero/arduino_zero.dts +++ b/boards/arm/arduino_zero/arduino_zero.dts @@ -14,7 +14,13 @@ #include / { + model = "Arduino Zero @ UART Concole"; + compatible = "arduino,zero-uartcons", "arduino,zero", + "atmel,samd21g18a", "atmel,samd21"; + chosen { + zephyr,console = &sercom5; + zephyr,shell-uart = &sercom5; zephyr,sram = &sram0; zephyr,flash = &flash0; zephyr,code-partition = &code_partition; diff --git a/boards/arm/arduino_zero/arduino_zero_uartcons.overlay b/boards/arm/arduino_zero/arduino_zero_uartcons.overlay deleted file mode 100644 index 8e15662512..0000000000 --- a/boards/arm/arduino_zero/arduino_zero_uartcons.overlay +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Arduino Zero @ UART Concole"; - compatible = "arduino,zero-uartcons", "arduino,zero", - "atmel,samd21g18a", "atmel,samd21"; - - chosen { - zephyr,console = &sercom5; - zephyr,shell-uart = &sercom5; - }; -}; diff --git a/boards/arm/arduino_zero/arduino_zero_usbcons.conf b/boards/arm/arduino_zero/arduino_zero_usbcons.conf deleted file mode 100644 index 329f3efc1e..0000000000 --- a/boards/arm/arduino_zero/arduino_zero_usbcons.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2023 TiaC Systems -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y -CONFIG_USB_CDC_ACM=y - -# Atmel Corp. SAMD21 @ Arduino Zero -CONFIG_USB_DEVICE_VID=0x2341 -CONFIG_USB_DEVICE_PID=0x804d -CONFIG_USB_DEVICE_MANUFACTURER="Arduino LLC" -CONFIG_USB_DEVICE_PRODUCT="Arduino Zero (CDC ACM)" diff --git a/boards/arm/arduino_zero/arduino_zero_usbcons.overlay b/boards/arm/arduino_zero/arduino_zero_usbcons.overlay deleted file mode 100644 index 4c37f77d5a..0000000000 --- a/boards/arm/arduino_zero/arduino_zero_usbcons.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Arduino Zero @ USB-CDC/ACM Concole"; - compatible = "arduino,zero-usbcons", "arduino,zero", - "atmel,samd21g18a", "atmel,samd21"; - - chosen { - zephyr,console = &cdc_acm_uart0; - zephyr,shell-uart = &cdc_acm_uart0; - }; -}; - -&zephyr_udc0 { - cdc_acm_uart0: cdc-acm-uart-0 { - compatible = "zephyr,cdc-acm-uart"; - }; -}; diff --git a/boards/arm/arduino_zero/arduino_zero_usbcons.yaml b/boards/arm/arduino_zero/arduino_zero_usbcons.yaml deleted file mode 100644 index b52e80a43a..0000000000 --- a/boards/arm/arduino_zero/arduino_zero_usbcons.yaml +++ /dev/null @@ -1,28 +0,0 @@ -identifier: arduino_zero@usbcons -name: Arduino Zero with USB-CDC/ACM Concole -type: mcu -arch: arm -ram: 32 -flash: 256 -toolchain: - - zephyr - - gnuarmemb - - xtools -supported: - - arduino_gpio - - arduino_i2c - - arduino_spi - - arduino_serial - - adc - - counter - - dac - - dma - - gpio - - hwinfo - - pwm - - spi - - i2c - - uart - - usb_cdc - - usb_device - - watchdog diff --git a/boards/arm/arduino_zero/doc/index.rst b/boards/arm/arduino_zero/doc/index.rst index 801a112219..11b3766276 100644 --- a/boards/arm/arduino_zero/doc/index.rst +++ b/boards/arm/arduino_zero/doc/index.rst @@ -79,20 +79,20 @@ Other hardware features are not currently supported by Zephyr. The default configuration can be found in the Kconfig :bridle_file:`boards/arm/arduino_zero/arduino_zero_defconfig`. -Board Revisions -=============== +Board Configurations +==================== -The :code:`arduino_zero` board can be configured for the following revisions. -These are not really specific hardware revisions, rather than specific -configurations for different use cases. +The :code:`arduino_zero` board can be configured for the following different +use cases. -.. rubric:: :code:`arduino_zero@uartcons` +.. rubric:: :command:`west build -b arduino_zero` Use the serial port SERCOM5 over EDBG as Zephyr console and for the shell. -.. rubric:: :code:`arduino_zero@usbcons` +.. rubric:: :command:`west build -b arduino_zero -S usb-console` -Use the native USB device port with CDC-ACM as Zephyr console and for the shell. +Use the native USB device port with CDC-ACM as Zephyr console and for the shell, +see :ref:`snippet-usb-console`. Connections and IOs =================== @@ -153,8 +153,8 @@ Serial Port The SAMD21 MCU has 6 SERCOM based USARTs. One of the USARTs (SERCOM5) is connected to the onboard Atmel Embedded Debugger (EDBG) and is the Zephyr -console. This is captured by the standard board revision ``uartcons``. -SERCOM0 is available on the D0 (RX) and D1 (TX) of the |Arduino UNO R3| header. +console. This is captured by the standard board configuration. SERCOM0 is +available on the D0 (RX) and D1 (TX) of the |Arduino UNO R3| header. USB Device Port =============== @@ -165,14 +165,14 @@ USB Device Port :alt: Arduino Zero Native and Programming USB Ports The SAMD21 MCU has a (native) USB device port that can be used to communicate -with a host PC. See the :ref:`zephyr:usb-samples` sample applications for more, -such as the :doc:`zephyr:samples/subsys/usb/cdc_acm/README` sample which sets -up a virtual serial port that echos characters back to the host PC. As an -alternative to the default Zephyr console on serial port the special board -revision ``usbcons`` can be used to enable :ref:`zephyr:usb_device_cdc_acm` -and switch the console to USB:: - - USB device idVendor=2341, idProduct=804d, bcdDevice= 3.03 +with a host PC. See Zephyr :ref:`zephyr:usb-samples` for more, such as the +:doc:`zephyr:samples/subsys/usb/cdc_acm/README` sample which sets up a virtual +serial port that echos characters back to the host PC. As an alternative to the +default Zephyr console on serial port the Bridle :ref:`snippet-usb-console` +can be used to enable :ref:`zephyr:usb_device_cdc_acm` and switch the console +to USB:: + + USB device idVendor=2341, idProduct=804d, bcdDevice= 3.04 USB device strings: Mfr=1, Product=2, SerialNumber=3 Product: Arduino Zero (CDC ACM) Manufacturer: Arduino LLC @@ -380,7 +380,8 @@ Hello Shell with USB-CDC/ACM Console .. zephyr-app-commands:: :app: bridle/samples/helloshell - :board: arduino_zero@usbcons + :board: arduino_zero + :west-args: -S usb-console :goals: flash :compact: diff --git a/boards/arm/arduino_zero/revision.cmake b/boards/arm/arduino_zero/revision.cmake deleted file mode 100644 index dd6727d126..0000000000 --- a/boards/arm/arduino_zero/revision.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2023 TiaC Systems -# SPDX-License-Identifier: Apache-2.0 - -set(LOTUS_REVISIONS "uartcons" "usbcons") -if (NOT DEFINED BOARD_REVISION) - set(BOARD_REVISION "uartcons") -else() - if (NOT BOARD_REVISION IN_LIST LOTUS_REVISIONS) - message(FATAL_ERROR - "${BOARD_REVISION} is not a valid revision for Lotus. " - "Accepted revisions: ${LOTUS_REVISIONS}") - endif() -endif() From 1abbc3dcd387ae3c52c511c23fe72ffce1255e43 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Mon, 25 Sep 2023 07:19:43 +0200 Subject: [PATCH 04/22] boards: arduino_zero: set USB max power to 500mA Signed-off-by: Stephan Linz --- boards/arm/arduino_zero/Kconfig.defconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/boards/arm/arduino_zero/Kconfig.defconfig b/boards/arm/arduino_zero/Kconfig.defconfig index 6da2bcbf85..7b127ed9db 100644 --- a/boards/arm/arduino_zero/Kconfig.defconfig +++ b/boards/arm/arduino_zero/Kconfig.defconfig @@ -8,6 +8,14 @@ config BOARD default "arduino_zero" depends on BOARD_ARDUINO_ZERO +config USB_SELF_POWERED + default n + depends on USB_DEVICE_STACK && BOARD_ARDUINO_ZERO + +config USB_MAX_POWER + default 250 if BOARD_ARDUINO_ZERO # 500mA + depends on USB_DEVICE_STACK && BOARD_ARDUINO_ZERO + # Workaround for not being able to have commas in macro arguments DT_CHOSEN_Z_CONSOLE := zephyr,console DT_COMPAT_Z_CDC_ACM_UART := zephyr,cdc-acm-uart From 449a5b5a555b30f09f820e9ecc0a68adedd313ea Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Mon, 25 Sep 2023 07:20:18 +0200 Subject: [PATCH 05/22] boards: arduino_zero: provide HEX output for OpenOCD Signed-off-by: Stephan Linz --- boards/arm/arduino_zero/arduino_zero_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/boards/arm/arduino_zero/arduino_zero_defconfig b/boards/arm/arduino_zero/arduino_zero_defconfig index 7d5b9e8d22..82372b0fee 100644 --- a/boards/arm/arduino_zero/arduino_zero_defconfig +++ b/boards/arm/arduino_zero/arduino_zero_defconfig @@ -11,4 +11,5 @@ CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_SERIAL=y CONFIG_BOOTLOADER_BOSSA=y CONFIG_BOOTLOADER_BOSSA_ARDUINO=y +CONFIG_BUILD_OUTPUT_HEX=y CONFIG_BUILD_OUTPUT_UF2=y From d7e473b007d44aa8110722b49bcc1617a42ff9d7 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Tue, 26 Sep 2023 20:43:06 +0200 Subject: [PATCH 06/22] snippets: usb-console: add Seeeduino Lotus Cortex-M0+ Signed-off-by: Stephan Linz --- snippets/usb-console/README.rst | 15 +++++++++++++++ snippets/usb-console/boards/seeeduino_lotus.conf | 10 ++++++++++ .../usb-console/boards/seeeduino_lotus.overlay | 13 +++++++++++++ snippets/usb-console/snippet.yml | 4 ++++ 4 files changed, 42 insertions(+) create mode 100644 snippets/usb-console/boards/seeeduino_lotus.conf create mode 100644 snippets/usb-console/boards/seeeduino_lotus.overlay diff --git a/snippets/usb-console/README.rst b/snippets/usb-console/README.rst index 4b919546fb..5c3d2b2833 100644 --- a/snippets/usb-console/README.rst +++ b/snippets/usb-console/README.rst @@ -54,6 +54,15 @@ specified as required. - | |zephyr,console| | |zephyr,shell-uart| + * - :code:`seeeduino_lotus` + - :code:`0x2886` + - :code:`0x8026` + - |Seeed LLC|_ + - |Seeeduino Lotus Cortex-M0+ (CDC ACM)| + - `Seeeduino USB product ID list with SAMD21 CPU`_ + - | |zephyr,console| + | |zephyr,shell-uart| + * - - :code:`0x2FE3` - :code:`0x0004` @@ -104,9 +113,15 @@ References .. _Arduino LLC: https://devicehunt.com/view/type/usb/vendor/2341 .. |Arduino LLC| replace:: :strong:`Arduino LLC` +.. _Seeed LLC: https://devicehunt.com/view/type/usb/vendor/2886 +.. |Seeed LLC| replace:: :strong:`Seeed LLC` + .. |Arduino Zero (CDC ACM)| replace:: :ref:`Arduino Zero (CDC ACM) ` +.. |Seeeduino Lotus Cortex-M0+ (CDC ACM)| replace:: + :ref:`Seeeduino Lotus Cortex-M0+ (CDC ACM) ` + .. _Arduino USB product ID list with SAM3X CPU: https://github.com/arduino/ArduinoCore-sam/blob/master/boards.txt diff --git a/snippets/usb-console/boards/seeeduino_lotus.conf b/snippets/usb-console/boards/seeeduino_lotus.conf new file mode 100644 index 0000000000..f86375ff97 --- /dev/null +++ b/snippets/usb-console/boards/seeeduino_lotus.conf @@ -0,0 +1,10 @@ +# Copyright (c) 2023 TiaC Systems +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y + +# Atmel Corp. SAMD21 @ Seeeduino Lotus Cortex-M0+ +CONFIG_USB_DEVICE_VID=0x2886 +CONFIG_USB_DEVICE_PID=0x8026 +CONFIG_USB_DEVICE_MANUFACTURER="Seeed LLC" +CONFIG_USB_DEVICE_PRODUCT="Seeeduino Lotus Cortex-M0+ (CDC ACM)" diff --git a/snippets/usb-console/boards/seeeduino_lotus.overlay b/snippets/usb-console/boards/seeeduino_lotus.overlay new file mode 100644 index 0000000000..6c58ff6f32 --- /dev/null +++ b/snippets/usb-console/boards/seeeduino_lotus.overlay @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2023 TiaC Systems + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + model = "Seeeduino Lotus Cortex-M0+ @ USB-CDC/ACM Concole"; + compatible = "seeed,seeeduino-lotus", "seeed,seeeduino-lotus-usbcons"; + + chosen { + zephyr,shell-uart = &snippet_cdc_acm_console_uart; + }; +}; diff --git a/snippets/usb-console/snippet.yml b/snippets/usb-console/snippet.yml index 63f67f8343..56a1e97108 100644 --- a/snippets/usb-console/snippet.yml +++ b/snippets/usb-console/snippet.yml @@ -8,3 +8,7 @@ boards: append: EXTRA_CONF_FILE: boards/arduino_zero.conf EXTRA_DTC_OVERLAY_FILE: boards/arduino_zero.overlay + seeeduino_lotus: + append: + EXTRA_CONF_FILE: boards/seeeduino_lotus.conf + EXTRA_DTC_OVERLAY_FILE: boards/seeeduino_lotus.overlay From 58c2270495a87ac9d1a57614825eeb42eb4ac649 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Tue, 26 Sep 2023 20:49:06 +0200 Subject: [PATCH 07/22] boards: seeeduino_lotus: use USB concole snippet - remove the special board revisions '@uartcons' and '@usbcons' - adapt documentation and link to usb-console snippet Signed-off-by: Stephan Linz --- boards/arm/seeeduino_lotus/Kconfig.defconfig | 14 +++++--- boards/arm/seeeduino_lotus/doc/index.rst | 31 +++++++++--------- boards/arm/seeeduino_lotus/revision.cmake | 13 -------- .../arm/seeeduino_lotus/seeeduino_lotus.dts | 5 +++ .../seeeduino_lotus_uartcons.overlay | 14 -------- .../seeeduino_lotus_usbcons.conf | 12 ------- .../seeeduino_lotus_usbcons.overlay | 20 ------------ .../seeeduino_lotus_usbcons.yaml | 32 ------------------- 8 files changed, 29 insertions(+), 112 deletions(-) delete mode 100644 boards/arm/seeeduino_lotus/revision.cmake delete mode 100644 boards/arm/seeeduino_lotus/seeeduino_lotus_uartcons.overlay delete mode 100644 boards/arm/seeeduino_lotus/seeeduino_lotus_usbcons.conf delete mode 100644 boards/arm/seeeduino_lotus/seeeduino_lotus_usbcons.overlay delete mode 100644 boards/arm/seeeduino_lotus/seeeduino_lotus_usbcons.yaml diff --git a/boards/arm/seeeduino_lotus/Kconfig.defconfig b/boards/arm/seeeduino_lotus/Kconfig.defconfig index 49acc542a7..5024b8cada 100644 --- a/boards/arm/seeeduino_lotus/Kconfig.defconfig +++ b/boards/arm/seeeduino_lotus/Kconfig.defconfig @@ -16,7 +16,8 @@ DT_COMPAT_ATMEL_USB := atmel,sam0-usb DT_CHOSEN_CONSOLE_NODE := $(dt_chosen_path,$(DT_CHOSEN_Z_CONSOLE)) DT_CHOSEN_CONSOLE_PARENT := $(dt_node_parent,$(DT_CHOSEN_CONSOLE_NODE)) -if $(dt_chosen_enabled,$(DT_CHOSEN_Z_CONSOLE)) && \ +if BOARD_SEEEDUINO_LOTUS && \ + $(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_ATMEL_USB)) @@ -24,22 +25,25 @@ config BOOTLOADER_BOSSA_DEVICE_NAME default "$(dt_chosen_label,$(DT_CHOSEN_Z_CONSOLE))" depends on USB_CDC_ACM -if LOG - # Logger cannot use itself to log choice USB_CDC_ACM_LOG_LEVEL_CHOICE default USB_CDC_ACM_LOG_LEVEL_OFF + depends on LOG endchoice # Set USB log level to error only choice USB_DEVICE_LOG_LEVEL_CHOICE default USB_DEVICE_LOG_LEVEL_ERR + depends on LOG endchoice # Wait 4000ms at startup for logging config LOG_PROCESS_THREAD_STARTUP_DELAY_MS default 4000 + depends on LOG -endif # LOG +# Wait 4000ms at startup for USB enumeration on host side +config BOOT_DELAY + default 4000 -endif # @usbcons +endif # zephyr,cdc-acm-uart diff --git a/boards/arm/seeeduino_lotus/doc/index.rst b/boards/arm/seeeduino_lotus/doc/index.rst index aa5a1d900f..f6ff231257 100644 --- a/boards/arm/seeeduino_lotus/doc/index.rst +++ b/boards/arm/seeeduino_lotus/doc/index.rst @@ -73,18 +73,17 @@ Other hardware features are not currently supported by Zephyr. The default configuration can be found in the Kconfig file :bridle_file:`boards/arm/seeeduino_lotus/seeeduino_lotus_defconfig`. -Board Revisions -=============== +Board Configurations +==================== -The :code:`seeeduino_lotus` board can be configured for the following -revisions. These are not really specific hardware revisions, rather than -specific configurations for different use cases. +The :code:`seeeduino_lotus` board can be configured for the following different +use cases. -.. rubric:: :code:`seeeduino_lotus@uartcons` +.. rubric:: :command:`west build -b seeeduino_lotus` Use the serial port SERCOM2 as Zephyr console and for the shell. -.. rubric:: :code:`seeeduino_lotus@usbcons` +.. rubric:: :command:`west build -b seeeduino_lotus -S usb-console` Use the USB device port with CDC-ACM as Zephyr console and for the shell. @@ -332,9 +331,8 @@ Serial Port The SAMD21 MCU has 6 SERCOM based USARTs. On the Lotus Cortex-M0+, SERCOM2 is available on D0 (RX) and D1 (TX) of the |Arduino UNO R3| header and is the -Zephyr console. This is captured by the standard board revision ``uartcons``. -SERCOM5 is available on pin 1 (RX) and pin 2 (TX) of the Grove UART connector -and is an optional second serial port for applications. +Zephyr console. SERCOM5 is available on pin 1 (RX) and pin 2 (TX) of the Grove +UART connector and is an optional second serial port for applications. USB Device Port =============== @@ -343,13 +341,13 @@ The SAMD21 MCU has a (native) USB device port that can be used to communicate with a host PC. See the :ref:`zephyr:usb-samples` sample applications for more, such as the :doc:`zephyr:samples/subsys/usb/cdc_acm/README` sample which sets up a virtual serial port that echos characters back to the host PC. As an -alternative to the default Zephyr console on serial port the special board -revision ``usbcons`` can be used to enable :ref:`zephyr:usb_device_cdc_acm` -and switch the console to USB:: +alternative to the default Zephyr console on serial port the Bridle +:ref:`snippet-usb-console` can be used to enable +:ref:`zephyr:usb_device_cdc_acm` and switch the console to USB:: - USB device idVendor=2886, idProduct=8026, bcdDevice= 3.03 + USB device idVendor=2886, idProduct=8026, bcdDevice= 3.04 USB device strings: Mfr=1, Product=2, SerialNumber=3 - Product: Seeeduino_lotus + Product: Seeeduino Lotus Cortex-M0+ (CDC ACM) Manufacturer: Seeed LLC SerialNumber: 9973734CA4207846 @@ -488,7 +486,8 @@ Hello Shell with USB-CDC/ACM Console .. zephyr-app-commands:: :app: bridle/samples/helloshell - :board: seeeduino_lotus@usbcons + :board: seeeduino_lotus + :west-args: -S usb-console :goals: flash :compact: diff --git a/boards/arm/seeeduino_lotus/revision.cmake b/boards/arm/seeeduino_lotus/revision.cmake deleted file mode 100644 index dd6727d126..0000000000 --- a/boards/arm/seeeduino_lotus/revision.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2023 TiaC Systems -# SPDX-License-Identifier: Apache-2.0 - -set(LOTUS_REVISIONS "uartcons" "usbcons") -if (NOT DEFINED BOARD_REVISION) - set(BOARD_REVISION "uartcons") -else() - if (NOT BOARD_REVISION IN_LIST LOTUS_REVISIONS) - message(FATAL_ERROR - "${BOARD_REVISION} is not a valid revision for Lotus. " - "Accepted revisions: ${LOTUS_REVISIONS}") - endif() -endif() diff --git a/boards/arm/seeeduino_lotus/seeeduino_lotus.dts b/boards/arm/seeeduino_lotus/seeeduino_lotus.dts index 8c2b31cfba..34e95b659e 100644 --- a/boards/arm/seeeduino_lotus/seeeduino_lotus.dts +++ b/boards/arm/seeeduino_lotus/seeeduino_lotus.dts @@ -14,7 +14,12 @@ #include / { + model = "Seeeduino Lotus Cortex-M0+ @ UART Concole"; + compatible = "seeed,seeeduino-lotus", "seeed,seeeduino-lotus-uartcons"; + chosen { + zephyr,console = &sercom2; + zephyr,shell-uart = &sercom2; zephyr,sram = &sram0; zephyr,flash = &flash0; zephyr,code-partition = &code_partition; diff --git a/boards/arm/seeeduino_lotus/seeeduino_lotus_uartcons.overlay b/boards/arm/seeeduino_lotus/seeeduino_lotus_uartcons.overlay deleted file mode 100644 index 548f9e1d34..0000000000 --- a/boards/arm/seeeduino_lotus/seeeduino_lotus_uartcons.overlay +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Seeeduino Lotus Cortex-M0+ @ UART Concole"; - compatible = "seeed,seeeduino-lotus", "seeed,seeeduino-lotus-uartcons"; - - chosen { - zephyr,console = &sercom2; - zephyr,shell-uart = &sercom2; - }; -}; diff --git a/boards/arm/seeeduino_lotus/seeeduino_lotus_usbcons.conf b/boards/arm/seeeduino_lotus/seeeduino_lotus_usbcons.conf deleted file mode 100644 index be5d60e3b1..0000000000 --- a/boards/arm/seeeduino_lotus/seeeduino_lotus_usbcons.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2023 TiaC Systems -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y -CONFIG_USB_CDC_ACM=y - -# Atmel Corp. SAMD21 @ Seeeduino Lotus Cortex-M0+ -CONFIG_USB_DEVICE_VID=0x2886 -CONFIG_USB_DEVICE_PID=0x8026 -CONFIG_USB_DEVICE_MANUFACTURER="Seeed LLC" -CONFIG_USB_DEVICE_PRODUCT="Seeeduino_lotus" diff --git a/boards/arm/seeeduino_lotus/seeeduino_lotus_usbcons.overlay b/boards/arm/seeeduino_lotus/seeeduino_lotus_usbcons.overlay deleted file mode 100644 index 42d43ff936..0000000000 --- a/boards/arm/seeeduino_lotus/seeeduino_lotus_usbcons.overlay +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Seeeduino Lotus Cortex-M0+ @ USB-CDC/ACM Concole"; - compatible = "seeed,seeeduino-lotus", "seeed,seeeduino-lotus-usbcons"; - - chosen { - zephyr,console = &cdc_acm_uart0; - zephyr,shell-uart = &cdc_acm_uart0; - }; -}; - -&zephyr_udc0 { - cdc_acm_uart0: cdc-acm-uart-0 { - compatible = "zephyr,cdc-acm-uart"; - }; -}; diff --git a/boards/arm/seeeduino_lotus/seeeduino_lotus_usbcons.yaml b/boards/arm/seeeduino_lotus/seeeduino_lotus_usbcons.yaml deleted file mode 100644 index df15d6439f..0000000000 --- a/boards/arm/seeeduino_lotus/seeeduino_lotus_usbcons.yaml +++ /dev/null @@ -1,32 +0,0 @@ -identifier: seeeduino_lotus@usbcons -name: Seeeduino Lotus Cortex-M0+ with USB-CDC/ACM Concole -type: mcu -arch: arm -ram: 32 -flash: 256 -toolchain: - - zephyr - - gnuarmemb - - xtools -supported: - - arduino_gpio - - arduino_i2c - - arduino_spi - - arduino_serial - - grove_gpio - - grove_pwm - - grove_i2c - - grove_serial - - hwinfo - - adc - - counter - - dac - - dma - - pwm - - gpio - - i2c - - spi - - uart - - usb_cdc - - usb_device - - watchdog From fe8a1e0c58bf313030b5cc4ed263a7de4456caae Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Tue, 26 Sep 2023 20:50:22 +0200 Subject: [PATCH 08/22] boards: seeeduino_lotus: set USB max power to 500mA Signed-off-by: Stephan Linz --- boards/arm/seeeduino_lotus/Kconfig.defconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/boards/arm/seeeduino_lotus/Kconfig.defconfig b/boards/arm/seeeduino_lotus/Kconfig.defconfig index 5024b8cada..e6145782c0 100644 --- a/boards/arm/seeeduino_lotus/Kconfig.defconfig +++ b/boards/arm/seeeduino_lotus/Kconfig.defconfig @@ -7,6 +7,14 @@ config BOARD default "seeeduino_lotus" depends on BOARD_SEEEDUINO_LOTUS +config USB_SELF_POWERED + default n + depends on USB_DEVICE_STACK && BOARD_SEEEDUINO_LOTUS + +config USB_MAX_POWER + default 250 if BOARD_SEEEDUINO_LOTUS # 500mA + depends on USB_DEVICE_STACK && BOARD_SEEEDUINO_LOTUS + # Workaround for not being able to have commas in macro arguments DT_CHOSEN_Z_CONSOLE := zephyr,console DT_COMPAT_Z_CDC_ACM_UART := zephyr,cdc-acm-uart From e650e54ee91058c5c6c7d075c094646c87934691 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Tue, 26 Sep 2023 20:50:53 +0200 Subject: [PATCH 09/22] boards: seeeduino_lotus: provide HEX output for OpenOCD Signed-off-by: Stephan Linz --- boards/arm/seeeduino_lotus/seeeduino_lotus_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/boards/arm/seeeduino_lotus/seeeduino_lotus_defconfig b/boards/arm/seeeduino_lotus/seeeduino_lotus_defconfig index 7434d67fc2..45b3ad3534 100644 --- a/boards/arm/seeeduino_lotus/seeeduino_lotus_defconfig +++ b/boards/arm/seeeduino_lotus/seeeduino_lotus_defconfig @@ -12,4 +12,5 @@ CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_SERIAL=y CONFIG_BOOTLOADER_BOSSA=y CONFIG_BOOTLOADER_BOSSA_ARDUINO=y +CONFIG_BUILD_OUTPUT_HEX=y CONFIG_BUILD_OUTPUT_UF2=y From 21b1b7531aab5725b9af8daa97847ce990cf35fd Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Tue, 26 Sep 2023 21:49:55 +0200 Subject: [PATCH 10/22] snippets: usb-console: add Seeed XIAO SAMD21 support Signed-off-by: Stephan Linz --- snippets/usb-console/README.rst | 15 +++++++++++++++ .../usb-console/boards/seeed_xiao_samd21.conf | 10 ++++++++++ .../boards/seeed_xiao_samd21.overlay | 18 ++++++++++++++++++ snippets/usb-console/snippet.yml | 4 ++++ 4 files changed, 47 insertions(+) create mode 100644 snippets/usb-console/boards/seeed_xiao_samd21.conf create mode 100644 snippets/usb-console/boards/seeed_xiao_samd21.overlay diff --git a/snippets/usb-console/README.rst b/snippets/usb-console/README.rst index 5c3d2b2833..8a94546539 100644 --- a/snippets/usb-console/README.rst +++ b/snippets/usb-console/README.rst @@ -63,6 +63,15 @@ specified as required. - | |zephyr,console| | |zephyr,shell-uart| + * - :code:`seeed_xiao_samd21` + - :code:`0x2886` + - :code:`0x802F` + - |Seeed Studio|_ + - |XIAO SAMD21 (CDC ACM)|, Seeeduino XIAO + - `Seeeduino USB product ID list with SAMD21 CPU`_ + - | |zephyr,console| + | |zephyr,shell-uart| + * - - :code:`0x2FE3` - :code:`0x0004` @@ -116,12 +125,18 @@ References .. _Seeed LLC: https://devicehunt.com/view/type/usb/vendor/2886 .. |Seeed LLC| replace:: :strong:`Seeed LLC` +.. _Seeed Studio: https://devicehunt.com/view/type/usb/vendor/2886 +.. |Seeed Studio| replace:: :strong:`Seeed Studio` + .. |Arduino Zero (CDC ACM)| replace:: :ref:`Arduino Zero (CDC ACM) ` .. |Seeeduino Lotus Cortex-M0+ (CDC ACM)| replace:: :ref:`Seeeduino Lotus Cortex-M0+ (CDC ACM) ` +.. |XIAO SAMD21 (CDC ACM)| replace:: + :ref:`XIAO SAMD21 (CDC ACM) ` + .. _Arduino USB product ID list with SAM3X CPU: https://github.com/arduino/ArduinoCore-sam/blob/master/boards.txt diff --git a/snippets/usb-console/boards/seeed_xiao_samd21.conf b/snippets/usb-console/boards/seeed_xiao_samd21.conf new file mode 100644 index 0000000000..7fe0c532eb --- /dev/null +++ b/snippets/usb-console/boards/seeed_xiao_samd21.conf @@ -0,0 +1,10 @@ +# Copyright (c) 2023 TiaC Systems +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y + +# Atmel Corp. SAMD21 @ Seeeduino XIAO SAMD21 +CONFIG_USB_DEVICE_VID=0x2886 +CONFIG_USB_DEVICE_PID=0x802f +CONFIG_USB_DEVICE_MANUFACTURER="Seeed Studio" +CONFIG_USB_DEVICE_PRODUCT="XIAO SAMD21 (CDC ACM)" diff --git a/snippets/usb-console/boards/seeed_xiao_samd21.overlay b/snippets/usb-console/boards/seeed_xiao_samd21.overlay new file mode 100644 index 0000000000..11c9def30b --- /dev/null +++ b/snippets/usb-console/boards/seeed_xiao_samd21.overlay @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2023 TiaC Systems + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + model = "Seeed Studio XIAO SAMD21 (Seeeduino XIAO) @ USB-CDC/ACM Concole"; + compatible = "seeed,seeed-xiao-samd21-usbcons", + "seeed,seeed-xiao-samd21", + "seeed,seeeduino-xiao-usbcons", + "seeed,seeeduino-xiao", + "atmel,samd21g18a", + "atmel,samd21"; + + chosen { + zephyr,shell-uart = &snippet_cdc_acm_console_uart; + }; +}; diff --git a/snippets/usb-console/snippet.yml b/snippets/usb-console/snippet.yml index 56a1e97108..a99184ef47 100644 --- a/snippets/usb-console/snippet.yml +++ b/snippets/usb-console/snippet.yml @@ -12,3 +12,7 @@ boards: append: EXTRA_CONF_FILE: boards/seeeduino_lotus.conf EXTRA_DTC_OVERLAY_FILE: boards/seeeduino_lotus.overlay + seeed_xiao_samd21: + append: + EXTRA_CONF_FILE: boards/seeed_xiao_samd21.conf + EXTRA_DTC_OVERLAY_FILE: boards/seeed_xiao_samd21.overlay From c70e9aced6664896dab085c156c12ff886d8d94d Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Tue, 26 Sep 2023 21:52:23 +0200 Subject: [PATCH 11/22] boards: seeed_xiao_samd21: use USB concole snippet - remove the special board revisions '@uartcons' and '@usbcons' - adapt documentation and link to usb-console snippet Signed-off-by: Stephan Linz --- .../arm/seeed_xiao_samd21/Kconfig.defconfig | 14 +++++---- boards/arm/seeed_xiao_samd21/doc/index.rst | 29 +++++++++---------- boards/arm/seeed_xiao_samd21/revision.cmake | 13 --------- .../seeed_xiao_samd21/seeed_xiao_samd21.dts | 10 +++++++ .../seeed_xiao_samd21_uartcons.overlay | 19 ------------ .../seeed_xiao_samd21_usbcons.conf | 12 -------- .../seeed_xiao_samd21_usbcons.overlay | 25 ---------------- .../seeed_xiao_samd21_usbcons.yaml | 25 ---------------- 8 files changed, 33 insertions(+), 114 deletions(-) delete mode 100644 boards/arm/seeed_xiao_samd21/revision.cmake delete mode 100644 boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_uartcons.overlay delete mode 100644 boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_usbcons.conf delete mode 100644 boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_usbcons.overlay delete mode 100644 boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_usbcons.yaml diff --git a/boards/arm/seeed_xiao_samd21/Kconfig.defconfig b/boards/arm/seeed_xiao_samd21/Kconfig.defconfig index 305be60ab7..208a18107a 100644 --- a/boards/arm/seeed_xiao_samd21/Kconfig.defconfig +++ b/boards/arm/seeed_xiao_samd21/Kconfig.defconfig @@ -17,7 +17,8 @@ DT_COMPAT_ATMEL_USB := atmel,sam0-usb DT_CHOSEN_CONSOLE_NODE := $(dt_chosen_path,$(DT_CHOSEN_Z_CONSOLE)) DT_CHOSEN_CONSOLE_PARENT := $(dt_node_parent,$(DT_CHOSEN_CONSOLE_NODE)) -if $(dt_chosen_enabled,$(DT_CHOSEN_Z_CONSOLE)) && \ +if BOARD_SEEED_XIAO_SAMD21 && \ + $(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_ATMEL_USB)) @@ -25,22 +26,25 @@ config BOOTLOADER_BOSSA_DEVICE_NAME default "$(dt_chosen_label,$(DT_CHOSEN_Z_CONSOLE))" depends on USB_CDC_ACM -if LOG - # Logger cannot use itself to log choice USB_CDC_ACM_LOG_LEVEL_CHOICE default USB_CDC_ACM_LOG_LEVEL_OFF + depends on LOG endchoice # Set USB log level to error only choice USB_DEVICE_LOG_LEVEL_CHOICE default USB_DEVICE_LOG_LEVEL_ERR + depends on LOG endchoice # Wait 4000ms at startup for logging config LOG_PROCESS_THREAD_STARTUP_DELAY_MS default 4000 + depends on LOG -endif # LOG +# Wait 4000ms at startup for USB enumeration on host side +config BOOT_DELAY + default 4000 -endif # @usbcons +endif # zephyr,cdc-acm-uart diff --git a/boards/arm/seeed_xiao_samd21/doc/index.rst b/boards/arm/seeed_xiao_samd21/doc/index.rst index 9b71cf88e7..6b395c79f8 100644 --- a/boards/arm/seeed_xiao_samd21/doc/index.rst +++ b/boards/arm/seeed_xiao_samd21/doc/index.rst @@ -77,19 +77,18 @@ Other hardware features are not currently supported by Zephyr. The default configuration can be found in the Kconfig file :bridle_file:`boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_defconfig`. -Board Revisions -=============== +Board Configurations +==================== The :code:`seeed_xiao_samd21` board can be configured for the following -revisions. These are not really specific hardware revisions, rather than -specific configurations for different use cases. +different use cases. -.. rubric:: :code:`seeed_xiao_samd21@uartcons` +.. rubric:: :command:`west build -b seeed_xiao_samd21` Use the serial port SERCOM5 over |Seeed XIAO| header as Zephyr console and for the shell. -.. rubric:: :code:`seeed_xiao_samd21@usbcons` +.. rubric:: :command:`west build -b seeed_xiao_samd21 -S usb-console` Use the native USB device port with CDC-ACM as Zephyr console and for the shell. @@ -173,8 +172,7 @@ Serial Port The SAMD21 MCU has 6 SERCOM based USARTs. On the Seeed Studio XIAO SAMD21, SERCOM4 is the Zephyr console and is available on the |Seeed XIAO| header -pins 7 (RX) and 6 (TX). This is captured by the standard board revision -``uartcons``. +pins 7 (RX) and 6 (TX). USB Device Port =============== @@ -183,13 +181,13 @@ The SAMD21 MCU has a (native) USB device port that can be used to communicate with a host PC. See the :ref:`zephyr:usb-samples` sample applications for more, such as the :doc:`zephyr:samples/subsys/usb/cdc_acm/README` sample which sets up a virtual serial port that echos characters back to the host PC. As an -alternative to the default Zephyr console on serial port the special board -revision ``usbcons`` can be used to enable :ref:`zephyr:usb_device_cdc_acm` -and switch the console to USB:: +alternative to the default Zephyr console on serial port the Bridle +:ref:`snippet-usb-console` can be used to enable +:ref:`zephyr:usb_device_cdc_acm` and switch the console to USB:: - USB device idVendor=2886, idProduct=802f, bcdDevice= 3.03 + USB device idVendor=2886, idProduct=802f, bcdDevice= 3.04 USB device strings: Mfr=1, Product=2, SerialNumber=3 - Product: Seeeduino XIAO (CDC ACM) + Product: XIAO SAMD21 (CDC ACM) Manufacturer: Seeed Studio SerialNumber: AC3FB5052F48A3F7 @@ -289,7 +287,7 @@ Debugging .. zephyr-app-commands:: :app: zephyr/samples/hello_world :board: seeed_xiao_samd21 - :gen-args: -DCONFIG_BUILD_OUTPUT_HEX=y -DBOARD_FLASH_RUNNER=openocd + :gen-args: -DBOARD_FLASH_RUNNER=openocd :goals: debug :compact: @@ -330,7 +328,8 @@ Hello Shell with USB-CDC/ACM Console .. zephyr-app-commands:: :app: bridle/samples/helloshell - :board: seeed_xiao_samd21@usbcons + :board: seeed_xiao_samd21 + :west-args: -S usb-console :goals: flash :compact: diff --git a/boards/arm/seeed_xiao_samd21/revision.cmake b/boards/arm/seeed_xiao_samd21/revision.cmake deleted file mode 100644 index 698429538a..0000000000 --- a/boards/arm/seeed_xiao_samd21/revision.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2023 TiaC Systems -# SPDX-License-Identifier: Apache-2.0 - -set(XIAO_REVISIONS "uartcons" "usbcons") -if (NOT DEFINED BOARD_REVISION) - set(BOARD_REVISION "uartcons") -else() - if (NOT BOARD_REVISION IN_LIST XIAO_REVISIONS) - message(FATAL_ERROR - "${BOARD_REVISION} is not a valid revision for Seeed Studio XIAO SAMD21. " - "Accepted revisions: ${XIAO_REVISIONS}") - endif() -endif() diff --git a/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21.dts b/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21.dts index 59e363b8c2..c0dabdd5eb 100644 --- a/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21.dts +++ b/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21.dts @@ -15,7 +15,17 @@ #include / { + model = "Seeed Studio XIAO SAMD21 (Seeeduino XIAO) @ UART Concole"; + compatible = "seeed,seeed-xiao-samd21-uartcons", + "seeed,seeed-xiao-samd21", + "seeed,seeeduino-xiao-uartcons", + "seeed,seeeduino-xiao", + "atmel,samd21g18a", + "atmel,samd21"; + chosen { + zephyr,console = &sercom4; + zephyr,shell-uart = &sercom4; zephyr,sram = &sram0; zephyr,flash = &flash0; zephyr,code-partition = &code_partition; diff --git a/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_uartcons.overlay b/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_uartcons.overlay deleted file mode 100644 index 51c146bd5f..0000000000 --- a/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_uartcons.overlay +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Seeed Studio XIAO SAMD21 (Seeeduino XIAO) @ UART Concole"; - compatible = "seeed,seeed-xiao-samd21-uartcons", - "seeed,seeed-xiao-samd21", - "seeed,seeeduino-xiao-uartcons", - "seeed,seeeduino-xiao", - "atmel,samd21g18a", - "atmel,samd21"; - - chosen { - zephyr,console = &sercom4; - zephyr,shell-uart = &sercom4; - }; -}; diff --git a/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_usbcons.conf b/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_usbcons.conf deleted file mode 100644 index 9770f1cbb1..0000000000 --- a/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_usbcons.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2023 TiaC Systems -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y -CONFIG_USB_CDC_ACM=y - -# Atmel Corp. SAMD21 @ Arduino Zero -CONFIG_USB_DEVICE_VID=0x2886 -CONFIG_USB_DEVICE_PID=0x802f -CONFIG_USB_DEVICE_MANUFACTURER="Seeed Studio" -CONFIG_USB_DEVICE_PRODUCT="Seeeduino XIAO (CDC ACM)" diff --git a/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_usbcons.overlay b/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_usbcons.overlay deleted file mode 100644 index b7b86dfb43..0000000000 --- a/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_usbcons.overlay +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Seeed Studio XIAO SAMD21 (Seeeduino XIAO) @ USB-CDC/ACM Concole"; - compatible = "seeed,seeed-xiao-samd21-usbcons", - "seeed,seeed-xiao-samd21", - "seeed,seeeduino-xiao-usbcons", - "seeed,seeeduino-xiao", - "atmel,samd21g18a", - "atmel,samd21"; - - chosen { - zephyr,console = &cdc_acm_uart0; - zephyr,shell-uart = &cdc_acm_uart0; - }; -}; - -&zephyr_udc0 { - cdc_acm_uart0: cdc-acm-uart-0 { - compatible = "zephyr,cdc-acm-uart"; - }; -}; diff --git a/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_usbcons.yaml b/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_usbcons.yaml deleted file mode 100644 index de16e62e4b..0000000000 --- a/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_usbcons.yaml +++ /dev/null @@ -1,25 +0,0 @@ -identifier: seeed_xiao_samd21@usbcons -name: Seeed Studio XIAO SAMD21 (Seeeduino XIAO) with USB-CDC/ACM Concole -type: mcu -arch: arm -ram: 32 -flash: 256 -toolchain: - - zephyr - - gnuarmemb - - xtools -supported: - - xiao_gpio - - xiao_i2c - - xiao_spi - - xiao_serial - - dma - - gpio - - hwinfo - - pwm - - spi - - i2c - - uart - - usb_cdc - - usb_device - - watchdog From 407c92494b9f18f51557512d0bcbf48491782003 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Tue, 26 Sep 2023 21:52:57 +0200 Subject: [PATCH 12/22] boards: seeed_xiao_samd21: set USB max power to 500mA Signed-off-by: Stephan Linz --- boards/arm/seeed_xiao_samd21/Kconfig.defconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/boards/arm/seeed_xiao_samd21/Kconfig.defconfig b/boards/arm/seeed_xiao_samd21/Kconfig.defconfig index 208a18107a..69665a9f06 100644 --- a/boards/arm/seeed_xiao_samd21/Kconfig.defconfig +++ b/boards/arm/seeed_xiao_samd21/Kconfig.defconfig @@ -8,6 +8,14 @@ config BOARD default "seeed_xiao_samd21" depends on BOARD_SEEED_XIAO_SAMD21 +config USB_SELF_POWERED + default n + depends on USB_DEVICE_STACK && BOARD_SEEED_XIAO_SAMD21 + +config USB_MAX_POWER + default 250 if BOARD_SEEED_XIAO_SAMD21 # 500mA + depends on USB_DEVICE_STACK && BOARD_SEEED_XIAO_SAMD21 + # Workaround for not being able to have commas in macro arguments DT_CHOSEN_Z_CONSOLE := zephyr,console DT_COMPAT_Z_CDC_ACM_UART := zephyr,cdc-acm-uart From 750221b4d964c17b167db63cf9f5cf3e56659430 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Tue, 26 Sep 2023 21:53:13 +0200 Subject: [PATCH 13/22] boards: seeed_xiao_samd21: provide HEX output for OpenOCD Signed-off-by: Stephan Linz --- boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_defconfig b/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_defconfig index defb92e0da..b6f77d6cb6 100644 --- a/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_defconfig +++ b/boards/arm/seeed_xiao_samd21/seeed_xiao_samd21_defconfig @@ -1,3 +1,4 @@ +# Copyright (c) 2023 TiaC Systems # SPDX-License-Identifier: Apache-2.0 CONFIG_SOC_SERIES_SAMD21=y @@ -11,4 +12,5 @@ CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_SERIAL=y CONFIG_BOOTLOADER_BOSSA=y CONFIG_BOOTLOADER_BOSSA_ADAFRUIT_UF2=y +CONFIG_BUILD_OUTPUT_HEX=y CONFIG_BUILD_OUTPUT_UF2=y From ef64b9f6dff818def421d6fd427e52531c72fe4a Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Wed, 27 Sep 2023 05:15:54 +0200 Subject: [PATCH 14/22] snippets: usb-console: add Waveshare RP2040 support Signed-off-by: Stephan Linz --- snippets/usb-console/README.rst | 87 +++++++++++++++++++ .../boards/waveshare_rp2040_eth.conf | 10 +++ .../boards/waveshare_rp2040_eth.overlay | 13 +++ .../boards/waveshare_rp2040_lcd_0_96.conf | 10 +++ .../boards/waveshare_rp2040_lcd_0_96.overlay | 13 +++ .../boards/waveshare_rp2040_matrix.conf | 10 +++ .../boards/waveshare_rp2040_matrix.overlay | 13 +++ .../boards/waveshare_rp2040_one.conf | 10 +++ .../boards/waveshare_rp2040_one.overlay | 13 +++ .../boards/waveshare_rp2040_plus.conf | 10 +++ .../boards/waveshare_rp2040_plus.overlay | 13 +++ .../boards/waveshare_rp2040_tiny.conf | 10 +++ .../boards/waveshare_rp2040_tiny.overlay | 13 +++ .../boards/waveshare_rp2040_zero.conf | 10 +++ .../boards/waveshare_rp2040_zero.overlay | 13 +++ snippets/usb-console/snippet.yml | 28 ++++++ 16 files changed, 276 insertions(+) create mode 100644 snippets/usb-console/boards/waveshare_rp2040_eth.conf create mode 100644 snippets/usb-console/boards/waveshare_rp2040_eth.overlay create mode 100644 snippets/usb-console/boards/waveshare_rp2040_lcd_0_96.conf create mode 100644 snippets/usb-console/boards/waveshare_rp2040_lcd_0_96.overlay create mode 100644 snippets/usb-console/boards/waveshare_rp2040_matrix.conf create mode 100644 snippets/usb-console/boards/waveshare_rp2040_matrix.overlay create mode 100644 snippets/usb-console/boards/waveshare_rp2040_one.conf create mode 100644 snippets/usb-console/boards/waveshare_rp2040_one.overlay create mode 100644 snippets/usb-console/boards/waveshare_rp2040_plus.conf create mode 100644 snippets/usb-console/boards/waveshare_rp2040_plus.overlay create mode 100644 snippets/usb-console/boards/waveshare_rp2040_tiny.conf create mode 100644 snippets/usb-console/boards/waveshare_rp2040_tiny.overlay create mode 100644 snippets/usb-console/boards/waveshare_rp2040_zero.conf create mode 100644 snippets/usb-console/boards/waveshare_rp2040_zero.overlay diff --git a/snippets/usb-console/README.rst b/snippets/usb-console/README.rst index 8a94546539..ce75044ea9 100644 --- a/snippets/usb-console/README.rst +++ b/snippets/usb-console/README.rst @@ -72,6 +72,69 @@ specified as required. - | |zephyr,console| | |zephyr,shell-uart| + * - :code:`waveshare_rp2040_one` + - :code:`0x2E8A` + - :code:`0x000A` + - |Waveshare (Raspberry Pi)|_ + - |RP2040-One (CDC ACM)|, Raspberry Pi Pico SDK CDC UART + - `Raspberry Pi USB product ID list`_ + - | |zephyr,console| + | |zephyr,shell-uart| + + * - :code:`waveshare_rp2040_zero` + - :code:`0x2E8A` + - :code:`0x000A` + - |Waveshare (Raspberry Pi)|_ + - |RP2040-Zero (CDC ACM)|, Raspberry Pi Pico SDK CDC UART + - `Raspberry Pi USB product ID list`_ + - | |zephyr,console| + | |zephyr,shell-uart| + + * - :code:`waveshare_rp2040_matrix` + - :code:`0x2E8A` + - :code:`0x000A` + - |Waveshare (Raspberry Pi)|_ + - |RP2040-Matrix (CDC ACM)|, Raspberry Pi Pico SDK CDC UART + - `Raspberry Pi USB product ID list`_ + - | |zephyr,console| + | |zephyr,shell-uart| + + * - :code:`waveshare_rp2040_tiny` + - :code:`0x2E8A` + - :code:`0x000A` + - |Waveshare (Raspberry Pi)|_ + - |RP2040-Tiny (CDC ACM)|, Raspberry Pi Pico SDK CDC UART + - `Raspberry Pi USB product ID list`_ + - | |zephyr,console| + | |zephyr,shell-uart| + + * - :code:`waveshare_rp2040_eth` + - :code:`0x2E8A` + - :code:`0x000A` + - |Waveshare (Raspberry Pi)|_ + - |RP2040-ETH (CDC ACM)|, Raspberry Pi Pico SDK CDC UART + - `Raspberry Pi USB product ID list`_ + - | |zephyr,console| + | |zephyr,shell-uart| + + * - :code:`waveshare_rp2040_lcd_0_96` + - :code:`0x2E8A` + - :code:`0x000A` + - |Waveshare (Raspberry Pi)|_ + - |RP2040-LCD-0.96 (CDC ACM)|, Raspberry Pi Pico SDK CDC UART + - `Raspberry Pi USB product ID list`_ + - | |zephyr,console| + | |zephyr,shell-uart| + + * - :code:`waveshare_rp2040_plus` + - :code:`0x2E8A` + - :code:`0x000A` + - |Waveshare (Raspberry Pi)|_ + - |RP2040-Plus (CDC ACM)|, Raspberry Pi Pico SDK CDC UART + - `Raspberry Pi USB product ID list`_ + - | |zephyr,console| + | |zephyr,shell-uart| + * - - :code:`0x2FE3` - :code:`0x0004` @@ -137,6 +200,30 @@ References .. |XIAO SAMD21 (CDC ACM)| replace:: :ref:`XIAO SAMD21 (CDC ACM) ` +.. _Waveshare (Raspberry Pi): https://devicehunt.com/view/type/usb/vendor/2e8a +.. |Waveshare (Raspberry Pi)| replace:: :strong:`Waveshare (Raspberry Pi)` + +.. |RP2040-One (CDC ACM)| replace:: + :ref:`RP2040-One (CDC ACM) ` + +.. |RP2040-Zero (CDC ACM)| replace:: + :ref:`RP2040-Zero (CDC ACM) ` + +.. |RP2040-Matrix (CDC ACM)| replace:: + :ref:`RP2040-Matrix (CDC ACM) ` + +.. |RP2040-Tiny (CDC ACM)| replace:: + :ref:`RP2040-Tiny (CDC ACM) ` + +.. |RP2040-ETH (CDC ACM)| replace:: + :ref:`RP2040-ETH (CDC ACM) ` + +.. |RP2040-LCD-0.96 (CDC ACM)| replace:: + :ref:`RP2040-LCD-0.96 (CDC ACM) ` + +.. |RP2040-Plus (CDC ACM)| replace:: + :ref:`RP2040-Plus (CDC ACM) ` + .. _Arduino USB product ID list with SAM3X CPU: https://github.com/arduino/ArduinoCore-sam/blob/master/boards.txt diff --git a/snippets/usb-console/boards/waveshare_rp2040_eth.conf b/snippets/usb-console/boards/waveshare_rp2040_eth.conf new file mode 100644 index 0000000000..2857e11749 --- /dev/null +++ b/snippets/usb-console/boards/waveshare_rp2040_eth.conf @@ -0,0 +1,10 @@ +# Copyright (c) 2023 TiaC Systems +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y + +# Waveshare @ RP2040-ETH +CONFIG_USB_DEVICE_VID=0x2e8a +CONFIG_USB_DEVICE_PID=0x000a +CONFIG_USB_DEVICE_MANUFACTURER="Waveshare (Raspberry Pi)" +CONFIG_USB_DEVICE_PRODUCT="RP2040-ETH (CDC ACM)" diff --git a/snippets/usb-console/boards/waveshare_rp2040_eth.overlay b/snippets/usb-console/boards/waveshare_rp2040_eth.overlay new file mode 100644 index 0000000000..2522280a94 --- /dev/null +++ b/snippets/usb-console/boards/waveshare_rp2040_eth.overlay @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2023 TiaC Systems + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + model = "Waveshare RP2040-ETH @ USB-CDC/ACM Concole"; + compatible = "waveshare,rp2040-eth", "waveshare,rp2040-eth-usbcons"; + + chosen { + zephyr,shell-uart = &snippet_cdc_acm_console_uart; + }; +}; diff --git a/snippets/usb-console/boards/waveshare_rp2040_lcd_0_96.conf b/snippets/usb-console/boards/waveshare_rp2040_lcd_0_96.conf new file mode 100644 index 0000000000..9c80b3eb4b --- /dev/null +++ b/snippets/usb-console/boards/waveshare_rp2040_lcd_0_96.conf @@ -0,0 +1,10 @@ +# Copyright (c) 2023 TiaC Systems +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y + +# Waveshare @ RP2040-LCD-0.96 +CONFIG_USB_DEVICE_VID=0x2e8a +CONFIG_USB_DEVICE_PID=0x000a +CONFIG_USB_DEVICE_MANUFACTURER="Waveshare (Raspberry Pi)" +CONFIG_USB_DEVICE_PRODUCT="RP2040-LCD-0.96 (CDC ACM)" diff --git a/snippets/usb-console/boards/waveshare_rp2040_lcd_0_96.overlay b/snippets/usb-console/boards/waveshare_rp2040_lcd_0_96.overlay new file mode 100644 index 0000000000..54bdc25349 --- /dev/null +++ b/snippets/usb-console/boards/waveshare_rp2040_lcd_0_96.overlay @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2023 TiaC Systems + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + model = "Waveshare RP2040-LCD-0.96 @ USB-CDC/ACM Concole"; + compatible = "waveshare,rp2040-lcd-0.96", "waveshare,rp2040-lcd-0.96-usbcons"; + + chosen { + zephyr,shell-uart = &snippet_cdc_acm_console_uart; + }; +}; diff --git a/snippets/usb-console/boards/waveshare_rp2040_matrix.conf b/snippets/usb-console/boards/waveshare_rp2040_matrix.conf new file mode 100644 index 0000000000..072b227711 --- /dev/null +++ b/snippets/usb-console/boards/waveshare_rp2040_matrix.conf @@ -0,0 +1,10 @@ +# Copyright (c) 2023 TiaC Systems +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y + +# Waveshare @ RP2040-Matrix +CONFIG_USB_DEVICE_VID=0x2e8a +CONFIG_USB_DEVICE_PID=0x000a +CONFIG_USB_DEVICE_MANUFACTURER="Waveshare (Raspberry Pi)" +CONFIG_USB_DEVICE_PRODUCT="RP2040-Matrix (CDC ACM)" diff --git a/snippets/usb-console/boards/waveshare_rp2040_matrix.overlay b/snippets/usb-console/boards/waveshare_rp2040_matrix.overlay new file mode 100644 index 0000000000..f67a471516 --- /dev/null +++ b/snippets/usb-console/boards/waveshare_rp2040_matrix.overlay @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2023 TiaC Systems + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + model = "Waveshare RP2040-Matrix @ USB-CDC/ACM Concole"; + compatible = "waveshare,rp2040-matrix", "waveshare,rp2040-matrix-usbcons"; + + chosen { + zephyr,shell-uart = &snippet_cdc_acm_console_uart; + }; +}; diff --git a/snippets/usb-console/boards/waveshare_rp2040_one.conf b/snippets/usb-console/boards/waveshare_rp2040_one.conf new file mode 100644 index 0000000000..eecb68e190 --- /dev/null +++ b/snippets/usb-console/boards/waveshare_rp2040_one.conf @@ -0,0 +1,10 @@ +# Copyright (c) 2023 TiaC Systems +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y + +# Waveshare @ RP2040-One +CONFIG_USB_DEVICE_VID=0x2e8a +CONFIG_USB_DEVICE_PID=0x000a +CONFIG_USB_DEVICE_MANUFACTURER="Waveshare (Raspberry Pi)" +CONFIG_USB_DEVICE_PRODUCT="RP2040-One (CDC ACM)" diff --git a/snippets/usb-console/boards/waveshare_rp2040_one.overlay b/snippets/usb-console/boards/waveshare_rp2040_one.overlay new file mode 100644 index 0000000000..e0db1536f5 --- /dev/null +++ b/snippets/usb-console/boards/waveshare_rp2040_one.overlay @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2023 TiaC Systems + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + model = "Waveshare RP2040-One @ USB-CDC/ACM Concole"; + compatible = "waveshare,rp2040-one", "waveshare,rp2040-one-usbcons"; + + chosen { + zephyr,shell-uart = &snippet_cdc_acm_console_uart; + }; +}; diff --git a/snippets/usb-console/boards/waveshare_rp2040_plus.conf b/snippets/usb-console/boards/waveshare_rp2040_plus.conf new file mode 100644 index 0000000000..ebf84c145e --- /dev/null +++ b/snippets/usb-console/boards/waveshare_rp2040_plus.conf @@ -0,0 +1,10 @@ +# Copyright (c) 2023 TiaC Systems +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y + +# Waveshare @ RP2040-Plus (4MB) +CONFIG_USB_DEVICE_VID=0x2e8a +CONFIG_USB_DEVICE_PID=0x000a +CONFIG_USB_DEVICE_MANUFACTURER="Waveshare (Raspberry Pi)" +CONFIG_USB_DEVICE_PRODUCT="RP2040-Plus (CDC ACM)" diff --git a/snippets/usb-console/boards/waveshare_rp2040_plus.overlay b/snippets/usb-console/boards/waveshare_rp2040_plus.overlay new file mode 100644 index 0000000000..e2519b93d5 --- /dev/null +++ b/snippets/usb-console/boards/waveshare_rp2040_plus.overlay @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2023 TiaC Systems + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + model = "Waveshare RP2040-Plus @ USB-CDC/ACM Concole"; + compatible = "waveshare,rp2040-plus", "waveshare,rp2040-plus-usbcons"; + + chosen { + zephyr,shell-uart = &snippet_cdc_acm_console_uart; + }; +}; diff --git a/snippets/usb-console/boards/waveshare_rp2040_tiny.conf b/snippets/usb-console/boards/waveshare_rp2040_tiny.conf new file mode 100644 index 0000000000..eb92eaf232 --- /dev/null +++ b/snippets/usb-console/boards/waveshare_rp2040_tiny.conf @@ -0,0 +1,10 @@ +# Copyright (c) 2023 TiaC Systems +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y + +# Waveshare @ RP2040-Tiny +CONFIG_USB_DEVICE_VID=0x2e8a +CONFIG_USB_DEVICE_PID=0x000a +CONFIG_USB_DEVICE_MANUFACTURER="Waveshare (Raspberry Pi)" +CONFIG_USB_DEVICE_PRODUCT="RP2040-Tiny (CDC ACM)" diff --git a/snippets/usb-console/boards/waveshare_rp2040_tiny.overlay b/snippets/usb-console/boards/waveshare_rp2040_tiny.overlay new file mode 100644 index 0000000000..84dad9bf86 --- /dev/null +++ b/snippets/usb-console/boards/waveshare_rp2040_tiny.overlay @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2023 TiaC Systems + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + model = "Waveshare RP2040-Tiny @ USB-CDC/ACM Concole"; + compatible = "waveshare,rp2040-tiny", "waveshare,rp2040-tiny-usbcons"; + + chosen { + zephyr,shell-uart = &snippet_cdc_acm_console_uart; + }; +}; diff --git a/snippets/usb-console/boards/waveshare_rp2040_zero.conf b/snippets/usb-console/boards/waveshare_rp2040_zero.conf new file mode 100644 index 0000000000..4d6e35bcf5 --- /dev/null +++ b/snippets/usb-console/boards/waveshare_rp2040_zero.conf @@ -0,0 +1,10 @@ +# Copyright (c) 2023 TiaC Systems +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y + +# Waveshare @ RP2040-Zero +CONFIG_USB_DEVICE_VID=0x2e8a +CONFIG_USB_DEVICE_PID=0x000a +CONFIG_USB_DEVICE_MANUFACTURER="Waveshare (Raspberry Pi)" +CONFIG_USB_DEVICE_PRODUCT="RP2040-Zero (CDC ACM)" diff --git a/snippets/usb-console/boards/waveshare_rp2040_zero.overlay b/snippets/usb-console/boards/waveshare_rp2040_zero.overlay new file mode 100644 index 0000000000..abb7a20cf9 --- /dev/null +++ b/snippets/usb-console/boards/waveshare_rp2040_zero.overlay @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2023 TiaC Systems + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + model = "Waveshare RP2040-Zero @ USB-CDC/ACM Concole"; + compatible = "waveshare,rp2040-zero", "waveshare,rp2040-zero-usbcons"; + + chosen { + zephyr,shell-uart = &snippet_cdc_acm_console_uart; + }; +}; diff --git a/snippets/usb-console/snippet.yml b/snippets/usb-console/snippet.yml index a99184ef47..3fc290cf90 100644 --- a/snippets/usb-console/snippet.yml +++ b/snippets/usb-console/snippet.yml @@ -16,3 +16,31 @@ boards: append: EXTRA_CONF_FILE: boards/seeed_xiao_samd21.conf EXTRA_DTC_OVERLAY_FILE: boards/seeed_xiao_samd21.overlay + waveshare_rp2040_one: + append: + EXTRA_CONF_FILE: boards/waveshare_rp2040_one.conf + EXTRA_DTC_OVERLAY_FILE: boards/waveshare_rp2040_one.overlay + waveshare_rp2040_zero: + append: + EXTRA_CONF_FILE: boards/waveshare_rp2040_zero.conf + EXTRA_DTC_OVERLAY_FILE: boards/waveshare_rp2040_zero.overlay + waveshare_rp2040_matrix: + append: + EXTRA_CONF_FILE: boards/waveshare_rp2040_matrix.conf + EXTRA_DTC_OVERLAY_FILE: boards/waveshare_rp2040_matrix.overlay + waveshare_rp2040_tiny: + append: + EXTRA_CONF_FILE: boards/waveshare_rp2040_tiny.conf + EXTRA_DTC_OVERLAY_FILE: boards/waveshare_rp2040_tiny.overlay + waveshare_rp2040_eth: + append: + EXTRA_CONF_FILE: boards/waveshare_rp2040_eth.conf + EXTRA_DTC_OVERLAY_FILE: boards/waveshare_rp2040_eth.overlay + waveshare_rp2040_lcd_0_96: + append: + EXTRA_CONF_FILE: boards/waveshare_rp2040_lcd_0_96.conf + EXTRA_DTC_OVERLAY_FILE: boards/waveshare_rp2040_lcd_0_96.overlay + waveshare_rp2040_plus: + append: + EXTRA_CONF_FILE: boards/waveshare_rp2040_plus.conf + EXTRA_DTC_OVERLAY_FILE: boards/waveshare_rp2040_plus.overlay From 74d2db3ce72f27d27665dd04bde6bf1f6369a775 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Wed, 27 Sep 2023 06:11:26 +0200 Subject: [PATCH 15/22] boards: waveshare_rp2040: use USB concole snippet - remove the special board revisions '@uartcons' and '@usbcons' - adapt documentation and link to usb-console snippet Signed-off-by: Stephan Linz --- boards/arm/waveshare_rp2040/Kconfig.defconfig | 2 +- boards/arm/waveshare_rp2040/doc/index.rst | 101 ++++++++---------- boards/arm/waveshare_rp2040/revision.cmake | 22 ++-- .../waveshare_rp2040/waveshare_rp2040_eth.dts | 10 ++ .../waveshare_rp2040_eth_uartcons.overlay | 14 --- .../waveshare_rp2040_eth_usbcons.conf | 12 --- .../waveshare_rp2040_eth_usbcons.overlay | 20 ---- .../waveshare_rp2040_eth_usbcons.yaml | 27 ----- .../waveshare_rp2040_lcd_0_96.dts | 10 ++ ...waveshare_rp2040_lcd_0_96_uartcons.overlay | 14 --- .../waveshare_rp2040_lcd_0_96_usbcons.conf | 12 --- .../waveshare_rp2040_lcd_0_96_usbcons.overlay | 20 ---- .../waveshare_rp2040_lcd_0_96_usbcons.yaml | 27 ----- .../waveshare_rp2040_matrix.dts | 10 ++ .../waveshare_rp2040_matrix_uartcons.overlay | 14 --- .../waveshare_rp2040_matrix_usbcons.conf | 12 --- .../waveshare_rp2040_matrix_usbcons.overlay | 20 ---- .../waveshare_rp2040_matrix_usbcons.yaml | 27 ----- .../waveshare_rp2040/waveshare_rp2040_one.dts | 10 ++ .../waveshare_rp2040_one_uartcons.overlay | 14 --- .../waveshare_rp2040_one_usbcons.conf | 12 --- .../waveshare_rp2040_one_usbcons.overlay | 20 ---- .../waveshare_rp2040_one_usbcons.yaml | 27 ----- .../waveshare_rp2040_plus.dts | 11 ++ .../waveshare_rp2040_plus_16mb.overlay | 5 - ...aveshare_rp2040_plus_16mb@uartcons.overlay | 17 --- .../waveshare_rp2040_plus_16mb@uartcons.yaml | 26 ----- .../waveshare_rp2040_plus_16mb@usbcons.conf | 12 --- ...waveshare_rp2040_plus_16mb@usbcons.overlay | 23 ---- .../waveshare_rp2040_plus_16mb@usbcons.yaml | 27 ----- .../waveshare_rp2040_plus_uartcons.overlay | 15 --- .../waveshare_rp2040_plus_usbcons.conf | 12 --- .../waveshare_rp2040_plus_usbcons.overlay | 21 ---- .../waveshare_rp2040_plus_usbcons.yaml | 27 ----- .../waveshare_rp2040_tiny.dts | 10 ++ .../waveshare_rp2040_tiny_uartcons.overlay | 14 --- .../waveshare_rp2040_tiny_usbcons.conf | 12 --- .../waveshare_rp2040_tiny_usbcons.overlay | 20 ---- .../waveshare_rp2040_tiny_usbcons.yaml | 27 ----- .../waveshare_rp2040_zero.dts | 10 ++ .../waveshare_rp2040_zero_uartcons.overlay | 14 --- .../waveshare_rp2040_zero_usbcons.conf | 12 --- .../waveshare_rp2040_zero_usbcons.overlay | 20 ---- .../waveshare_rp2040_zero_usbcons.yaml | 27 ----- 44 files changed, 128 insertions(+), 691 deletions(-) delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_eth_uartcons.overlay delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_eth_usbcons.conf delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_eth_usbcons.overlay delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_eth_usbcons.yaml delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96_uartcons.overlay delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96_usbcons.conf delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96_usbcons.overlay delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96_usbcons.yaml delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_matrix_uartcons.overlay delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_matrix_usbcons.conf delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_matrix_usbcons.overlay delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_matrix_usbcons.yaml delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_one_uartcons.overlay delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_one_usbcons.conf delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_one_usbcons.overlay delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_one_usbcons.yaml delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@uartcons.overlay delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@uartcons.yaml delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@usbcons.conf delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@usbcons.overlay delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@usbcons.yaml delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_plus_uartcons.overlay delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_plus_usbcons.conf delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_plus_usbcons.overlay delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_plus_usbcons.yaml delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_tiny_uartcons.overlay delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_tiny_usbcons.conf delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_tiny_usbcons.overlay delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_tiny_usbcons.yaml delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_zero_uartcons.overlay delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_zero_usbcons.conf delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_zero_usbcons.overlay delete mode 100644 boards/arm/waveshare_rp2040/waveshare_rp2040_zero_usbcons.yaml diff --git a/boards/arm/waveshare_rp2040/Kconfig.defconfig b/boards/arm/waveshare_rp2040/Kconfig.defconfig index 4cb7d1679c..9cd6713650 100644 --- a/boards/arm/waveshare_rp2040/Kconfig.defconfig +++ b/boards/arm/waveshare_rp2040/Kconfig.defconfig @@ -102,4 +102,4 @@ config LOG_PROCESS_THREAD_STARTUP_DELAY_MS config BOOT_DELAY default 4000 -endif # @usbcons +endif # zephyr,cdc-acm-uart diff --git a/boards/arm/waveshare_rp2040/doc/index.rst b/boards/arm/waveshare_rp2040/doc/index.rst index 89fafc8fe3..0f100e8241 100644 --- a/boards/arm/waveshare_rp2040/doc/index.rst +++ b/boards/arm/waveshare_rp2040/doc/index.rst @@ -260,114 +260,106 @@ configuration can be found in the different Kconfig files: - :bridle_file:`boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96_defconfig` - :bridle_file:`boards/arm/waveshare_rp2040/waveshare_rp2040_plus_defconfig` -Board Revisions -=============== +Board Configurations +==================== -The Waveshare RP2040 boards can be configured for the following revisions. -These are not really specific hardware revisions, rather than specific -configurations for different use cases. Only the |RP2040-Plus| board offers an -assembly option with 16㎆ Flash, which is also mapped as a hardware revision. +The Waveshare RP2040 boards can be configured for the following different +use cases. The |RP2040-Plus| board offers an assembly option with 16㎆ Flash, +which is mapped as a hardware revision. .. tabs:: .. group-tab:: RP2040-One - .. rubric:: :code:`waveshare_rp2040_one@uartcons` + .. rubric:: :command:`west build -b waveshare_rp2040_one` Use the serial port UART0 on edge header as Zephyr console and for the shell. - .. rubric:: :code:`waveshare_rp2040_one@usbcons` + .. rubric:: :command:`west build -b waveshare_rp2040_one -S usb-console` Use the native USB device port with CDC-ACM as Zephyr console and for the shell. .. group-tab:: RP2040-Zero - .. rubric:: :code:`waveshare_rp2040_zero@uartcons` + .. rubric:: :command:`west build -b waveshare_rp2040_zero` Use the serial port UART0 on edge header as Zephyr console and for the shell. - .. rubric:: :code:`waveshare_rp2040_zero@usbcons` + .. rubric:: :command:`west build -b waveshare_rp2040_zero -S usb-console` Use the native USB device port with CDC-ACM as Zephyr console and for the shell. .. group-tab:: RP2040-Matrix - .. rubric:: :code:`waveshare_rp2040_matrix@uartcons` + .. rubric:: :command:`west build -b waveshare_rp2040_matrix` Use the serial port UART0 on edge header as Zephyr console and for the shell. - .. rubric:: :code:`waveshare_rp2040_matrix@usbcons` + .. rubric:: :command:`west build -b waveshare_rp2040_matrix -S usb-console` Use the native USB device port with CDC-ACM as Zephyr console and for the shell. .. group-tab:: RP2040-Tiny - .. rubric:: :code:`waveshare_rp2040_tiny@uartcons` + .. rubric:: :command:`west build -b waveshare_rp2040_tiny` Use the serial port UART0 on edge header as Zephyr console and for the shell. - .. rubric:: :code:`waveshare_rp2040_tiny@usbcons` + .. rubric:: :command:`west build -b waveshare_rp2040_tiny -S usb-console` Use the native USB device port with CDC-ACM as Zephyr console and for the shell. .. group-tab:: RP2040-ETH - .. rubric:: :code:`waveshare_rp2040_eth@uartcons` + .. rubric:: :command:`west build -b waveshare_rp2040_eth` Use the serial port UART0 on edge header as Zephyr console and for the shell. - .. rubric:: :code:`waveshare_rp2040_eth@usbcons` + .. rubric:: :command:`west build -b waveshare_rp2040_eth -S usb-console` Use the native USB device port with CDC-ACM as Zephyr console and for the shell. .. group-tab:: RP2040-LCD-0.96 - .. rubric:: :code:`waveshare_rp2040_lcd_0_96@uartcons` + .. rubric:: :command:`west build -b waveshare_rp2040_lcd_0_96` Use the serial port UART0 on edge header as Zephyr console and for the shell. - .. rubric:: :code:`waveshare_rp2040_lcd_0_96@usbcons` + .. rubric:: :command:`west build -b waveshare_rp2040_lcd_0_96 -S usb-console` Use the native USB device port with CDC-ACM as Zephyr console and for the shell. .. group-tab:: RP2040-Plus - .. rubric:: :code:`waveshare_rp2040_plus@uartcons` + .. rubric:: :command:`west build -b waveshare_rp2040_plus` Use the serial port UART0 on edge header as Zephyr console and for the shell. - .. rubric:: :code:`waveshare_rp2040_plus@usbcons` + .. rubric:: :command:`west build -b waveshare_rp2040_plus -S usb-console` Use the native USB device port with CDC-ACM as Zephyr console and for the shell. - .. rubric:: :code:`waveshare_rp2040_plus@16mb` + .. rubric:: :command:`west build -b waveshare_rp2040_plus@16mb` Setup QSPI Flash controller to work with 16㎆ and use the serial port UART0 on edge header as Zephyr - console and for the shell. It is the same as - :code:`waveshare_rp2040_plus@16mb@uartcons`. - - .. rubric:: :code:`waveshare_rp2040_plus@16mb@uartcons` - - Setup QSPI Flash controller to work with 16㎆ and - use the serial port UART0 on edge header as - Zephyr console and for the shell. + console and for the shell. - .. rubric:: :code:`waveshare_rp2040_plus@16mb@usbcons` + .. rubric:: :command:`west build -b waveshare_rp2040_plus@16mb -S usb-console` Setup QSPI Flash controller to work with 16㎆ and use the native USB device port with CDC-ACM as @@ -440,8 +432,7 @@ Serial Port The `RP2040 `_ MCU has 2 UARTs. One of the UARTs (UART0) is connected to external devices over GP0 (TX) and GP1 (RX) on both the |Raspberry Pi Pico| and the |Waveshare RP2040 Mini| header in same manner -and is the Zephyr console. This is captured by the standard board revision -``uartcons``. +and is the Zephyr console. USB Device Port =============== @@ -451,12 +442,12 @@ used to communicate with a host PC. See the :ref:`zephyr:usb-samples` sample applications for more, such as the :doc:`zephyr:samples/subsys/usb/cdc_acm/README` sample which sets up a virtual serial port that echos characters back to the host PC. As an alternative to the default Zephyr console on serial port the -special board revision ``usbcons`` can be used to enable +Bridle :ref:`snippet-usb-console` can be used to enable :ref:`zephyr:usb_device_cdc_acm` and switch the console to USB:: USB device idVendor=2e8a, idProduct=000a, bcdDevice= 3.04 USB device strings: Mfr=1, Product=2, SerialNumber=3 - Product: RP2040-Plus (16MB, CDC ACM) + Product: RP2040-Plus (CDC ACM) Manufacturer: Waveshare (Raspberry Pi) SerialNumber: B69F8448A6E91514 @@ -955,13 +946,13 @@ Hello Shell with USB-CDC/ACM Console .. group-tab:: RP2040-One - .. rubric:: Hello Shell on ``usbcons`` revision + .. rubric:: Hello Shell .. zephyr-app-commands:: :app: bridle/samples/helloshell - :board: waveshare_rp2040_one@usbcons + :board: waveshare_rp2040_one :build-dir: waveshare_rp2040 - :west-args: -p + :west-args: -p -S usb-console :goals: flash :compact: @@ -975,13 +966,13 @@ Hello Shell with USB-CDC/ACM Console .. group-tab:: RP2040-Zero - .. rubric:: Hello Shell on ``usbcons`` revision + .. rubric:: Hello Shell .. zephyr-app-commands:: :app: bridle/samples/helloshell - :board: waveshare_rp2040_zero@usbcons + :board: waveshare_rp2040_zero :build-dir: waveshare_rp2040 - :west-args: -p + :west-args: -p -S usb-console :goals: flash :compact: @@ -995,13 +986,13 @@ Hello Shell with USB-CDC/ACM Console .. group-tab:: RP2040-Matrix - .. rubric:: Hello Shell on ``usbcons`` revision + .. rubric:: Hello Shell .. zephyr-app-commands:: :app: bridle/samples/helloshell - :board: waveshare_rp2040_matrix@usbcons + :board: waveshare_rp2040_matrix :build-dir: waveshare_rp2040 - :west-args: -p + :west-args: -p -S usb-console :goals: flash :compact: @@ -1015,13 +1006,13 @@ Hello Shell with USB-CDC/ACM Console .. group-tab:: RP2040-Tiny - .. rubric:: Hello Shell on ``usbcons`` revision + .. rubric:: Hello Shell .. zephyr-app-commands:: :app: bridle/samples/helloshell - :board: waveshare_rp2040_tiny@usbcons + :board: waveshare_rp2040_tiny :build-dir: waveshare_rp2040 - :west-args: -p + :west-args: -p -S usb-console :goals: flash :compact: @@ -1035,13 +1026,13 @@ Hello Shell with USB-CDC/ACM Console .. group-tab:: RP2040-ETH - .. rubric:: Hello Shell on ``usbcons`` revision + .. rubric:: Hello Shell .. zephyr-app-commands:: :app: bridle/samples/helloshell - :board: waveshare_rp2040_eth@usbcons + :board: waveshare_rp2040_eth :build-dir: waveshare_rp2040 - :west-args: -p + :west-args: -p -S usb-console :goals: flash :compact: @@ -1055,13 +1046,13 @@ Hello Shell with USB-CDC/ACM Console .. group-tab:: RP2040-LCD-0.96 - .. rubric:: Hello Shell on ``usbcons`` revision + .. rubric:: Hello Shell .. zephyr-app-commands:: :app: bridle/samples/helloshell - :board: waveshare_rp2040_lcd_0_96@usbcons + :board: waveshare_rp2040_lcd_0_96 :build-dir: waveshare_rp2040 - :west-args: -p + :west-args: -p -S usb-console :goals: flash :compact: @@ -1075,13 +1066,13 @@ Hello Shell with USB-CDC/ACM Console .. group-tab:: RP2040-Plus - .. rubric:: Hello Shell on ``usbcons`` and ``16㎆`` revision + .. rubric:: Hello Shell on ``16㎆`` revision .. zephyr-app-commands:: :app: bridle/samples/helloshell - :board: waveshare_rp2040_plus@16mb@usbcons + :board: waveshare_rp2040_plus@16mb :build-dir: waveshare_rp2040 - :west-args: -p + :west-args: -p -S usb-console :goals: flash :compact: diff --git a/boards/arm/waveshare_rp2040/revision.cmake b/boards/arm/waveshare_rp2040/revision.cmake index f3d591afe9..edeffa014f 100644 --- a/boards/arm/waveshare_rp2040/revision.cmake +++ b/boards/arm/waveshare_rp2040/revision.cmake @@ -1,17 +1,15 @@ # Copyright (c) 2023 TiaC Systems # SPDX-License-Identifier: Apache-2.0 -set(WAVESHARE_RP2040_REVISIONS "uartcons" "usbcons") -set(WAVESHARE_RP2040_16MB_BOARDS "waveshare_rp2040_plus") -if (BOARD IN_LIST WAVESHARE_RP2040_16MB_BOARDS) - list(APPEND WAVESHARE_RP2040_REVISIONS "16mb" "16mb@uartcons" "16mb@usbcons") -endif() -if (NOT DEFINED BOARD_REVISION) - set(BOARD_REVISION "uartcons") -else() - if (NOT BOARD_REVISION IN_LIST WAVESHARE_RP2040_REVISIONS) - message(FATAL_ERROR - "${BOARD_REVISION} is not a valid revision for Waveshare RP2040. " - "Accepted revisions: ${WAVESHARE_RP2040_REVISIONS}") +if (BOARD IN_LIST "waveshare_rp2040_plus") + set(WAVESHARE_RP2040_REVISIONS "4mb" "16mb") + if (NOT DEFINED BOARD_REVISION) + set(BOARD_REVISION "4mb") + else() + if (NOT BOARD_REVISION IN_LIST WAVESHARE_RP2040_REVISIONS) + message(FATAL_ERROR + "${BOARD_REVISION} is not a valid revision for Waveshare RP2040. " + "Accepted revisions: ${WAVESHARE_RP2040_REVISIONS}") + endif() endif() endif() diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_eth.dts b/boards/arm/waveshare_rp2040/waveshare_rp2040_eth.dts index 3d3f525f7a..fa7b0377c1 100644 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_eth.dts +++ b/boards/arm/waveshare_rp2040/waveshare_rp2040_eth.dts @@ -5,6 +5,16 @@ /dts-v1/; +/ { + model = "Waveshare RP2040-ETH @ UART Concole"; + compatible = "waveshare,rp2040-eth", "waveshare,rp2040-eth-uartcons"; + + chosen { + zephyr,console = &uart0; + zephyr,shell-uart = &uart0; + }; +}; + #include "waveshare_rp2040-mini.dtsi" #include "waveshare_rp2040-4mb.dtsi" diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_eth_uartcons.overlay b/boards/arm/waveshare_rp2040/waveshare_rp2040_eth_uartcons.overlay deleted file mode 100644 index f1d11ac753..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_eth_uartcons.overlay +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Waveshare RP2040-ETH @ UART Concole"; - compatible = "waveshare,rp2040-eth", "waveshare,rp2040-eth-uartcons"; - - chosen { - zephyr,console = &uart0; - zephyr,shell-uart = &uart0; - }; -}; diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_eth_usbcons.conf b/boards/arm/waveshare_rp2040/waveshare_rp2040_eth_usbcons.conf deleted file mode 100644 index 6cfcf2c5d7..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_eth_usbcons.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2023 TiaC Systems -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y -CONFIG_USB_CDC_ACM=y - -# Waveshare @ RP2040-ETH -CONFIG_USB_DEVICE_VID=0x2e8a -CONFIG_USB_DEVICE_PID=0x000a -CONFIG_USB_DEVICE_MANUFACTURER="Waveshare (Raspberry Pi)" -CONFIG_USB_DEVICE_PRODUCT="RP2040-ETH (CDC ACM)" diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_eth_usbcons.overlay b/boards/arm/waveshare_rp2040/waveshare_rp2040_eth_usbcons.overlay deleted file mode 100644 index abe9698ba0..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_eth_usbcons.overlay +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Waveshare RP2040-ETH @ USB-CDC/ACM Concole"; - compatible = "waveshare,rp2040-eth", "waveshare,rp2040-eth-usbcons"; - - chosen { - zephyr,console = &cdc_acm_uart0; - zephyr,shell-uart = &cdc_acm_uart0; - }; -}; - -&zephyr_udc0 { - cdc_acm_uart0: cdc-acm-uart-0 { - compatible = "zephyr,cdc-acm-uart"; - }; -}; diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_eth_usbcons.yaml b/boards/arm/waveshare_rp2040/waveshare_rp2040_eth_usbcons.yaml deleted file mode 100644 index d90bf73e3e..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_eth_usbcons.yaml +++ /dev/null @@ -1,27 +0,0 @@ -identifier: waveshare_rp2040_eth@usbcons -name: Waveshare RP2040-ETH with USB-CDC/ACM Concole -type: mcu -arch: arm -flash: 4096 -ram: 264 -toolchain: - - zephyr - - gnuarmemb - - xtools -supported: - - rpipico_serial - - rpipico_spi - - rpipico_i2c - - uart - - gpio - - adc - - i2c - - spi - - hwinfo - - watchdog - - pwm - - flash - - dma - - counter - - usb_cdc - - usb_device diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96.dts b/boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96.dts index c02b172fcc..4b74054833 100644 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96.dts +++ b/boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96.dts @@ -5,6 +5,16 @@ /dts-v1/; +/ { + model = "Waveshare RP2040-LCD-0.96 @ UART Concole"; + compatible = "waveshare,rp2040-lcd-0.96", "waveshare,rp2040-lcd-0.96-uartcons"; + + chosen { + zephyr,console = &uart0; + zephyr,shell-uart = &uart0; + }; +}; + #include "waveshare_rp2040-pico.dtsi" #include "waveshare_rp2040-2mb.dtsi" diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96_uartcons.overlay b/boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96_uartcons.overlay deleted file mode 100644 index 975b4c5438..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96_uartcons.overlay +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Waveshare RP2040-LCD-0.96 @ UART Concole"; - compatible = "waveshare,rp2040-lcd-0.96", "waveshare,rp2040-lcd-0.96-uartcons"; - - chosen { - zephyr,console = &uart0; - zephyr,shell-uart = &uart0; - }; -}; diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96_usbcons.conf b/boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96_usbcons.conf deleted file mode 100644 index 6064606c2a..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96_usbcons.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2023 TiaC Systems -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y -CONFIG_USB_CDC_ACM=y - -# Waveshare @ RP2040-LCD-0.96 -CONFIG_USB_DEVICE_VID=0x2e8a -CONFIG_USB_DEVICE_PID=0x000a -CONFIG_USB_DEVICE_MANUFACTURER="Waveshare (Raspberry Pi)" -CONFIG_USB_DEVICE_PRODUCT="RP2040-LCD-0.96 (CDC ACM)" diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96_usbcons.overlay b/boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96_usbcons.overlay deleted file mode 100644 index 3a9e428166..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96_usbcons.overlay +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Waveshare RP2040-LCD-0.96 @ USB-CDC/ACM Concole"; - compatible = "waveshare,rp2040-lcd-0.96", "waveshare,rp2040-lcd-0.96-usbcons"; - - chosen { - zephyr,console = &cdc_acm_uart0; - zephyr,shell-uart = &cdc_acm_uart0; - }; -}; - -&zephyr_udc0 { - cdc_acm_uart0: cdc-acm-uart-0 { - compatible = "zephyr,cdc-acm-uart"; - }; -}; diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96_usbcons.yaml b/boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96_usbcons.yaml deleted file mode 100644 index 07bf973e1a..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_lcd_0_96_usbcons.yaml +++ /dev/null @@ -1,27 +0,0 @@ -identifier: waveshare_rp2040_lcd_0_96@usbcons -name: Waveshare RP2040-LCD-0.96 with USB-CDC/ACM Concole -type: mcu -arch: arm -flash: 2048 -ram: 264 -toolchain: - - zephyr - - gnuarmemb - - xtools -supported: - - rpipico_serial - - rpipico_spi - - rpipico_i2c - - uart - - gpio - - adc - - i2c - - spi - - hwinfo - - watchdog - - pwm - - flash - - dma - - counter - - usb_cdc - - usb_device diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_matrix.dts b/boards/arm/waveshare_rp2040/waveshare_rp2040_matrix.dts index 31f7bddbd1..e54688fc06 100644 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_matrix.dts +++ b/boards/arm/waveshare_rp2040/waveshare_rp2040_matrix.dts @@ -5,6 +5,16 @@ /dts-v1/; +/ { + model = "Waveshare RP2040-Matrix @ UART Concole"; + compatible = "waveshare,rp2040-matrix", "waveshare,rp2040-matrix-uartcons"; + + chosen { + zephyr,console = &uart0; + zephyr,shell-uart = &uart0; + }; +}; + #include "waveshare_rp2040-mini.dtsi" #include "waveshare_rp2040-2mb.dtsi" diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_matrix_uartcons.overlay b/boards/arm/waveshare_rp2040/waveshare_rp2040_matrix_uartcons.overlay deleted file mode 100644 index f8a5d2f758..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_matrix_uartcons.overlay +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Waveshare RP2040-Matrix @ UART Concole"; - compatible = "waveshare,rp2040-matrix", "waveshare,rp2040-matrix-uartcons"; - - chosen { - zephyr,console = &uart0; - zephyr,shell-uart = &uart0; - }; -}; diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_matrix_usbcons.conf b/boards/arm/waveshare_rp2040/waveshare_rp2040_matrix_usbcons.conf deleted file mode 100644 index d2a47fa5b2..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_matrix_usbcons.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2023 TiaC Systems -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y -CONFIG_USB_CDC_ACM=y - -# Waveshare @ RP2040-Matrix -CONFIG_USB_DEVICE_VID=0x2e8a -CONFIG_USB_DEVICE_PID=0x000a -CONFIG_USB_DEVICE_MANUFACTURER="Waveshare (Raspberry Pi)" -CONFIG_USB_DEVICE_PRODUCT="RP2040-Matrix (CDC ACM)" diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_matrix_usbcons.overlay b/boards/arm/waveshare_rp2040/waveshare_rp2040_matrix_usbcons.overlay deleted file mode 100644 index 4502101995..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_matrix_usbcons.overlay +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Waveshare RP2040-Matrix @ USB-CDC/ACM Concole"; - compatible = "waveshare,rp2040-matrix", "waveshare,rp2040-matrix-usbcons"; - - chosen { - zephyr,console = &cdc_acm_uart0; - zephyr,shell-uart = &cdc_acm_uart0; - }; -}; - -&zephyr_udc0 { - cdc_acm_uart0: cdc-acm-uart-0 { - compatible = "zephyr,cdc-acm-uart"; - }; -}; diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_matrix_usbcons.yaml b/boards/arm/waveshare_rp2040/waveshare_rp2040_matrix_usbcons.yaml deleted file mode 100644 index 9bf37556e4..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_matrix_usbcons.yaml +++ /dev/null @@ -1,27 +0,0 @@ -identifier: waveshare_rp2040_matrix@usbcons -name: Waveshare RP2040-Matrix with USB-CDC/ACM Concole -type: mcu -arch: arm -flash: 2048 -ram: 264 -toolchain: - - zephyr - - gnuarmemb - - xtools -supported: - - rp2040mini_serial - - rp2040mini_spi - - rp2040mini_i2c - - uart - - gpio - - adc - - i2c - - spi - - hwinfo - - watchdog - - pwm - - flash - - dma - - counter - - usb_cdc - - usb_device diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_one.dts b/boards/arm/waveshare_rp2040/waveshare_rp2040_one.dts index c513d7e549..874307106b 100644 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_one.dts +++ b/boards/arm/waveshare_rp2040/waveshare_rp2040_one.dts @@ -5,6 +5,16 @@ /dts-v1/; +/ { + model = "Waveshare RP2040-One @ UART Concole"; + compatible = "waveshare,rp2040-one", "waveshare,rp2040-one-uartcons"; + + chosen { + zephyr,console = &uart0; + zephyr,shell-uart = &uart0; + }; +}; + #include "waveshare_rp2040-mini.dtsi" #include "waveshare_rp2040-4mb.dtsi" diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_one_uartcons.overlay b/boards/arm/waveshare_rp2040/waveshare_rp2040_one_uartcons.overlay deleted file mode 100644 index 9d79ec005a..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_one_uartcons.overlay +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Waveshare RP2040-One @ UART Concole"; - compatible = "waveshare,rp2040-one", "waveshare,rp2040-one-uartcons"; - - chosen { - zephyr,console = &uart0; - zephyr,shell-uart = &uart0; - }; -}; diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_one_usbcons.conf b/boards/arm/waveshare_rp2040/waveshare_rp2040_one_usbcons.conf deleted file mode 100644 index e04b724be2..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_one_usbcons.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2023 TiaC Systems -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y -CONFIG_USB_CDC_ACM=y - -# Waveshare @ RP2040-One -CONFIG_USB_DEVICE_VID=0x2e8a -CONFIG_USB_DEVICE_PID=0x000a -CONFIG_USB_DEVICE_MANUFACTURER="Waveshare (Raspberry Pi)" -CONFIG_USB_DEVICE_PRODUCT="RP2040-One (CDC ACM)" diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_one_usbcons.overlay b/boards/arm/waveshare_rp2040/waveshare_rp2040_one_usbcons.overlay deleted file mode 100644 index a450ac9597..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_one_usbcons.overlay +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Waveshare RP2040-One @ USB-CDC/ACM Concole"; - compatible = "waveshare,rp2040-one", "waveshare,rp2040-one-usbcons"; - - chosen { - zephyr,console = &cdc_acm_uart0; - zephyr,shell-uart = &cdc_acm_uart0; - }; -}; - -&zephyr_udc0 { - cdc_acm_uart0: cdc-acm-uart-0 { - compatible = "zephyr,cdc-acm-uart"; - }; -}; diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_one_usbcons.yaml b/boards/arm/waveshare_rp2040/waveshare_rp2040_one_usbcons.yaml deleted file mode 100644 index 4e56c029be..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_one_usbcons.yaml +++ /dev/null @@ -1,27 +0,0 @@ -identifier: waveshare_rp2040_one@usbcons -name: Waveshare RP2040-One with USB-CDC/ACM Concole -type: mcu -arch: arm -flash: 4096 -ram: 264 -toolchain: - - zephyr - - gnuarmemb - - xtools -supported: - - rp2040mini_serial - - rp2040mini_spi - - rp2040mini_i2c - - uart - - gpio - - adc - - i2c - - spi - - hwinfo - - watchdog - - pwm - - flash - - dma - - counter - - usb_cdc - - usb_device diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus.dts b/boards/arm/waveshare_rp2040/waveshare_rp2040_plus.dts index d658308700..d445ad0408 100644 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus.dts +++ b/boards/arm/waveshare_rp2040/waveshare_rp2040_plus.dts @@ -5,6 +5,17 @@ /dts-v1/; +/ { + model = "Waveshare RP2040-Plus (4MB) @ UART Concole"; + compatible = "waveshare,rp2040-plus", "waveshare,rp2040-plus-uartcons", + "waveshare,rp2040-plus-4mb", "waveshare,rp2040-plus-4mb-uartcons"; + + chosen { + zephyr,console = &uart0; + zephyr,shell-uart = &uart0; + }; +}; + #include "waveshare_rp2040-pico.dtsi" #include "waveshare_rp2040-4mb.dtsi" diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb.overlay b/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb.overlay index 11b2760041..c0543f3f3f 100644 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb.overlay +++ b/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb.overlay @@ -9,9 +9,4 @@ model = "Waveshare RP2040-Plus (16MB) @ UART Concole"; compatible = "waveshare,rp2040-plus", "waveshare,rp2040-plus-uartcons", "waveshare,rp2040-plus-16mb", "waveshare,rp2040-plus-16mb-uartcons"; - - chosen { - zephyr,console = &uart0; - zephyr,shell-uart = &uart0; - }; }; diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@uartcons.overlay b/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@uartcons.overlay deleted file mode 100644 index 11b2760041..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@uartcons.overlay +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -#include "waveshare_rp2040-16mb.dtsi" - -/ { - model = "Waveshare RP2040-Plus (16MB) @ UART Concole"; - compatible = "waveshare,rp2040-plus", "waveshare,rp2040-plus-uartcons", - "waveshare,rp2040-plus-16mb", "waveshare,rp2040-plus-16mb-uartcons"; - - chosen { - zephyr,console = &uart0; - zephyr,shell-uart = &uart0; - }; -}; diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@uartcons.yaml b/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@uartcons.yaml deleted file mode 100644 index 970283235f..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@uartcons.yaml +++ /dev/null @@ -1,26 +0,0 @@ -identifier: waveshare_rp2040_plus@16mb@uartcons -name: Waveshare RP2040-Plus (16MB) -type: mcu -arch: arm -flash: 16384 -ram: 264 -toolchain: - - zephyr - - gnuarmemb - - xtools -supported: - - rpipico_serial - - rpipico_spi - - rpipico_i2c - - uart - - gpio - - adc - - i2c - - spi - - hwinfo - - watchdog - - pwm - - flash - - dma - - counter - - usb_device diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@usbcons.conf b/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@usbcons.conf deleted file mode 100644 index 0981b38700..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@usbcons.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2023 TiaC Systems -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y -CONFIG_USB_CDC_ACM=y - -# Waveshare @ RP2040-Plus (16MB) -CONFIG_USB_DEVICE_VID=0x2e8a -CONFIG_USB_DEVICE_PID=0x000a -CONFIG_USB_DEVICE_MANUFACTURER="Waveshare (Raspberry Pi)" -CONFIG_USB_DEVICE_PRODUCT="RP2040-Plus (16MB, CDC ACM)" diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@usbcons.overlay b/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@usbcons.overlay deleted file mode 100644 index 685b243959..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@usbcons.overlay +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -#include "waveshare_rp2040-16mb.dtsi" - -/ { - model = "Waveshare RP2040-Plus (16MB) @ USB-CDC/ACM Concole"; - compatible = "waveshare,rp2040-plus", "waveshare,rp2040-plus-usbcons", - "waveshare,rp2040-plus-16mb", "waveshare,rp2040-plus-16mb-usbcons"; - - chosen { - zephyr,console = &cdc_acm_uart0; - zephyr,shell-uart = &cdc_acm_uart0; - }; -}; - -&zephyr_udc0 { - cdc_acm_uart0: cdc-acm-uart-0 { - compatible = "zephyr,cdc-acm-uart"; - }; -}; diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@usbcons.yaml b/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@usbcons.yaml deleted file mode 100644 index fe66a87bd7..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_16mb@usbcons.yaml +++ /dev/null @@ -1,27 +0,0 @@ -identifier: waveshare_rp2040_plus@16mb@usbcons -name: Waveshare RP2040-Plus (16MB) with USB-CDC/ACM Concole -type: mcu -arch: arm -flash: 16384 -ram: 264 -toolchain: - - zephyr - - gnuarmemb - - xtools -supported: - - rpipico_serial - - rpipico_spi - - rpipico_i2c - - uart - - gpio - - adc - - i2c - - spi - - hwinfo - - watchdog - - pwm - - flash - - dma - - counter - - usb_cdc - - usb_device diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_uartcons.overlay b/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_uartcons.overlay deleted file mode 100644 index 30e544da45..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_uartcons.overlay +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Waveshare RP2040-Plus (4MB) @ UART Concole"; - compatible = "waveshare,rp2040-plus", "waveshare,rp2040-plus-uartcons", - "waveshare,rp2040-plus-4mb", "waveshare,rp2040-plus-4mb-uartcons"; - - chosen { - zephyr,console = &uart0; - zephyr,shell-uart = &uart0; - }; -}; diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_usbcons.conf b/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_usbcons.conf deleted file mode 100644 index c2d27f7797..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_usbcons.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2023 TiaC Systems -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y -CONFIG_USB_CDC_ACM=y - -# Waveshare @ RP2040-Plus (4MB) -CONFIG_USB_DEVICE_VID=0x2e8a -CONFIG_USB_DEVICE_PID=0x000a -CONFIG_USB_DEVICE_MANUFACTURER="Waveshare (Raspberry Pi)" -CONFIG_USB_DEVICE_PRODUCT="RP2040-Plus (4MB, CDC ACM)" diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_usbcons.overlay b/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_usbcons.overlay deleted file mode 100644 index 585a0d7d86..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_usbcons.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Waveshare RP2040-Plus (4MB) @ USB-CDC/ACM Concole"; - compatible = "waveshare,rp2040-plus", "waveshare,rp2040-plus-usbcons", - "waveshare,rp2040-plus-4mb", "waveshare,rp2040-plus-4mb-usbcons"; - - chosen { - zephyr,console = &cdc_acm_uart0; - zephyr,shell-uart = &cdc_acm_uart0; - }; -}; - -&zephyr_udc0 { - cdc_acm_uart0: cdc-acm-uart-0 { - compatible = "zephyr,cdc-acm-uart"; - }; -}; diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_usbcons.yaml b/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_usbcons.yaml deleted file mode 100644 index 3a7391c581..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_plus_usbcons.yaml +++ /dev/null @@ -1,27 +0,0 @@ -identifier: waveshare_rp2040_plus@usbcons -name: Waveshare RP2040-Plus (4MB) with USB-CDC/ACM Concole -type: mcu -arch: arm -flash: 4096 -ram: 264 -toolchain: - - zephyr - - gnuarmemb - - xtools -supported: - - rpipico_serial - - rpipico_spi - - rpipico_i2c - - uart - - gpio - - adc - - i2c - - spi - - hwinfo - - watchdog - - pwm - - flash - - dma - - counter - - usb_cdc - - usb_device diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_tiny.dts b/boards/arm/waveshare_rp2040/waveshare_rp2040_tiny.dts index c2e4ee9b46..df3e04bd39 100644 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_tiny.dts +++ b/boards/arm/waveshare_rp2040/waveshare_rp2040_tiny.dts @@ -5,6 +5,16 @@ /dts-v1/; +/ { + model = "Waveshare RP2040-Tiny @ UART Concole"; + compatible = "waveshare,rp2040-tiny", "waveshare,rp2040-tiny-uartcons"; + + chosen { + zephyr,console = &uart0; + zephyr,shell-uart = &uart0; + }; +}; + #include "waveshare_rp2040-mini.dtsi" #include "waveshare_rp2040-2mb.dtsi" diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_tiny_uartcons.overlay b/boards/arm/waveshare_rp2040/waveshare_rp2040_tiny_uartcons.overlay deleted file mode 100644 index 70cf9a848f..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_tiny_uartcons.overlay +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Waveshare RP2040-Tiny @ UART Concole"; - compatible = "waveshare,rp2040-tiny", "waveshare,rp2040-tiny-uartcons"; - - chosen { - zephyr,console = &uart0; - zephyr,shell-uart = &uart0; - }; -}; diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_tiny_usbcons.conf b/boards/arm/waveshare_rp2040/waveshare_rp2040_tiny_usbcons.conf deleted file mode 100644 index 981793721d..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_tiny_usbcons.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2023 TiaC Systems -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y -CONFIG_USB_CDC_ACM=y - -# Waveshare @ RP2040-Tiny -CONFIG_USB_DEVICE_VID=0x2e8a -CONFIG_USB_DEVICE_PID=0x000a -CONFIG_USB_DEVICE_MANUFACTURER="Waveshare (Raspberry Pi)" -CONFIG_USB_DEVICE_PRODUCT="RP2040-Tiny (CDC ACM)" diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_tiny_usbcons.overlay b/boards/arm/waveshare_rp2040/waveshare_rp2040_tiny_usbcons.overlay deleted file mode 100644 index 667538cab5..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_tiny_usbcons.overlay +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Waveshare RP2040-Tiny @ USB-CDC/ACM Concole"; - compatible = "waveshare,rp2040-tiny", "waveshare,rp2040-tiny-usbcons"; - - chosen { - zephyr,console = &cdc_acm_uart0; - zephyr,shell-uart = &cdc_acm_uart0; - }; -}; - -&zephyr_udc0 { - cdc_acm_uart0: cdc-acm-uart-0 { - compatible = "zephyr,cdc-acm-uart"; - }; -}; diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_tiny_usbcons.yaml b/boards/arm/waveshare_rp2040/waveshare_rp2040_tiny_usbcons.yaml deleted file mode 100644 index f243ee46f7..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_tiny_usbcons.yaml +++ /dev/null @@ -1,27 +0,0 @@ -identifier: waveshare_rp2040_tiny@usbcons -name: Waveshare RP2040-Tiny with USB-CDC/ACM Concole -type: mcu -arch: arm -flash: 4096 -ram: 264 -toolchain: - - zephyr - - gnuarmemb - - xtools -supported: - - rp2040mini_serial - - rp2040mini_spi - - rp2040mini_i2c - - uart - - gpio - - adc - - i2c - - spi - - hwinfo - - watchdog - - pwm - - flash - - dma - - counter - - usb_cdc - - usb_device diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_zero.dts b/boards/arm/waveshare_rp2040/waveshare_rp2040_zero.dts index 4345ef8766..d7fef6713f 100644 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_zero.dts +++ b/boards/arm/waveshare_rp2040/waveshare_rp2040_zero.dts @@ -5,6 +5,16 @@ /dts-v1/; +/ { + model = "Waveshare RP2040-Zero @ UART Concole"; + compatible = "waveshare,rp2040-zero", "waveshare,rp2040-zero-uartcons"; + + chosen { + zephyr,console = &uart0; + zephyr,shell-uart = &uart0; + }; +}; + #include "waveshare_rp2040-mini.dtsi" #include "waveshare_rp2040-2mb.dtsi" diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_zero_uartcons.overlay b/boards/arm/waveshare_rp2040/waveshare_rp2040_zero_uartcons.overlay deleted file mode 100644 index ab56f1d9a4..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_zero_uartcons.overlay +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Waveshare RP2040-Zero @ UART Concole"; - compatible = "waveshare,rp2040-zero", "waveshare,rp2040-zero-uartcons"; - - chosen { - zephyr,console = &uart0; - zephyr,shell-uart = &uart0; - }; -}; diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_zero_usbcons.conf b/boards/arm/waveshare_rp2040/waveshare_rp2040_zero_usbcons.conf deleted file mode 100644 index 139ef061a0..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_zero_usbcons.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2023 TiaC Systems -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y -CONFIG_USB_CDC_ACM=y - -# Waveshare @ RP2040-Zero -CONFIG_USB_DEVICE_VID=0x2e8a -CONFIG_USB_DEVICE_PID=0x000a -CONFIG_USB_DEVICE_MANUFACTURER="Waveshare (Raspberry Pi)" -CONFIG_USB_DEVICE_PRODUCT="RP2040-Zero (CDC ACM)" diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_zero_usbcons.overlay b/boards/arm/waveshare_rp2040/waveshare_rp2040_zero_usbcons.overlay deleted file mode 100644 index 5072808348..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_zero_usbcons.overlay +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2023 TiaC Systems - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - model = "Waveshare RP2040-Zero @ USB-CDC/ACM Concole"; - compatible = "waveshare,rp2040-zero", "waveshare,rp2040-zero-usbcons"; - - chosen { - zephyr,console = &cdc_acm_uart0; - zephyr,shell-uart = &cdc_acm_uart0; - }; -}; - -&zephyr_udc0 { - cdc_acm_uart0: cdc-acm-uart-0 { - compatible = "zephyr,cdc-acm-uart"; - }; -}; diff --git a/boards/arm/waveshare_rp2040/waveshare_rp2040_zero_usbcons.yaml b/boards/arm/waveshare_rp2040/waveshare_rp2040_zero_usbcons.yaml deleted file mode 100644 index c00cbb29b7..0000000000 --- a/boards/arm/waveshare_rp2040/waveshare_rp2040_zero_usbcons.yaml +++ /dev/null @@ -1,27 +0,0 @@ -identifier: waveshare_rp2040_zero@usbcons -name: Waveshare RP2040-Zero with USB-CDC/ACM Concole -type: mcu -arch: arm -flash: 2048 -ram: 264 -toolchain: - - zephyr - - gnuarmemb - - xtools -supported: - - rp2040mini_serial - - rp2040mini_spi - - rp2040mini_i2c - - uart - - gpio - - adc - - i2c - - spi - - hwinfo - - watchdog - - pwm - - flash - - dma - - counter - - usb_cdc - - usb_device From 33d0988d572fd640822ff099b1d91ce43a2e5349 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Wed, 27 Sep 2023 06:54:30 +0200 Subject: [PATCH 16/22] tests: grove: base: remove '@usbcons' board revisions Signed-off-by: Stephan Linz --- tests/shields/grove/dts_bindings/README.rst | 5 ----- tests/shields/grove/dts_bindings/testcase.yaml | 17 ----------------- 2 files changed, 22 deletions(-) diff --git a/tests/shields/grove/dts_bindings/README.rst b/tests/shields/grove/dts_bindings/README.rst index 575956387f..b952718b7d 100644 --- a/tests/shields/grove/dts_bindings/README.rst +++ b/tests/shields/grove/dts_bindings/README.rst @@ -33,7 +33,6 @@ supported by this shield and that will be used for maintenance:: --verbose \ --inline-logs \ --platform arduino_zero \ - --platform arduino_zero@usbcons \ --platform mimxrt1010_evk \ --platform mimxrt1060_evk \ --platform mimxrt1060_evkb \ @@ -43,12 +42,8 @@ supported by this shield and that will be used for maintenance:: --platform nucleo_f767zi \ --platform rpi_pico \ --platform seeed_xiao_samd21 \ - --platform seeed_xiao_samd21@usbcons \ --platform seeeduino_xiao \ --platform seeeduino_lotus \ - --platform seeeduino_lotus@usbcons \ --platform waveshare_rp2040_plus \ - --platform waveshare_rp2040_plus@usbcons \ --platform waveshare_rp2040_plus@16mb \ - --platform waveshare_rp2040_plus@16mb@usbcons \ --testsuite-root bridle/tests/shields/grove/dts_bindings diff --git a/tests/shields/grove/dts_bindings/testcase.yaml b/tests/shields/grove/dts_bindings/testcase.yaml index 2c53ddefe1..3bb6247e27 100644 --- a/tests/shields/grove/dts_bindings/testcase.yaml +++ b/tests/shields/grove/dts_bindings/testcase.yaml @@ -66,7 +66,6 @@ tests: dt_nodelabel_enabled("grove_i2c_header") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1 grove.rpipico.v1: @@ -89,9 +88,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1 grove.base.v2.arduino: # May be skipped if the board has at least one of the Ardunio standard @@ -115,9 +112,7 @@ tests: mimxrt1060_evk mimxrt1060_evkb arduino_zero - arduino_zero@usbcons seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=seeed_grove_base_v2 grove.base.v1.arduino: # May be skipped if the board has at least one of the Ardunio standard @@ -141,9 +136,7 @@ tests: mimxrt1060_evk mimxrt1060_evkb arduino_zero - arduino_zero@usbcons seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=seeed_grove_base_v1 grove.xiao.v1.xiao: # May be skipped if the board has at least one of the XIAO standard @@ -159,7 +152,6 @@ tests: dt_nodelabel_enabled("grove_spi") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1 grove.rpipico.v1.rpipico: @@ -177,9 +169,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1 grove_pwms.base.v2: depends_on: arduino_gpio @@ -194,9 +184,7 @@ tests: mimxrt1060_evk mimxrt1060_evkb arduino_zero - arduino_zero@usbcons seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=seeed_grove_base_v2 grove_pwms.base.v1: depends_on: arduino_gpio @@ -211,16 +199,13 @@ tests: mimxrt1060_evk mimxrt1060_evkb arduino_zero - arduino_zero@usbcons seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=seeed_grove_base_v1 grove_pwms.xiao.v1: filter: dt_nodelabel_enabled("grove_laced_if_v1") and dt_nodelabel_enabled("grove_pwms") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1 grove_pwms.rpipico.v1: @@ -229,7 +214,5 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1 From 8abb06d68e26ce497fd50f0d9cc038bc8f429ac6 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Wed, 27 Sep 2023 06:55:00 +0200 Subject: [PATCH 17/22] tests: grove: btn: remove '@usbcons' board revisions Signed-off-by: Stephan Linz --- .../shields/grove_btn/dts_bindings/README.rst | 5 --- .../grove_btn/dts_bindings/testcase.yaml | 44 ------------------- 2 files changed, 49 deletions(-) diff --git a/tests/shields/grove_btn/dts_bindings/README.rst b/tests/shields/grove_btn/dts_bindings/README.rst index 350cf75279..b4be6b0c6d 100644 --- a/tests/shields/grove_btn/dts_bindings/README.rst +++ b/tests/shields/grove_btn/dts_bindings/README.rst @@ -33,7 +33,6 @@ supported by this shield and that will be used for maintenance:: --verbose \ --inline-logs \ --platform arduino_zero \ - --platform arduino_zero@usbcons \ --platform mimxrt1010_evk \ --platform mimxrt1060_evk \ --platform mimxrt1060_evkb \ @@ -43,12 +42,8 @@ supported by this shield and that will be used for maintenance:: --platform nucleo_f767zi \ --platform rpi_pico \ --platform seeed_xiao_samd21 \ - --platform seeed_xiao_samd21@usbcons \ --platform seeeduino_xiao \ --platform seeeduino_lotus \ - --platform seeeduino_lotus@usbcons \ --platform waveshare_rp2040_plus \ - --platform waveshare_rp2040_plus@usbcons \ --platform waveshare_rp2040_plus@16mb \ - --platform waveshare_rp2040_plus@16mb@usbcons \ --testsuite-root bridle/tests/shields/grove_btn/dts_bindings diff --git a/tests/shields/grove_btn/dts_bindings/testcase.yaml b/tests/shields/grove_btn/dts_bindings/testcase.yaml index 346d593fb4..b3a870088c 100644 --- a/tests/shields/grove_btn/dts_bindings/testcase.yaml +++ b/tests/shields/grove_btn/dts_bindings/testcase.yaml @@ -260,7 +260,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d0", "gpio-keys") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_btn_d0 grove.xiao.v1.grove_btn.gpio.d1: @@ -268,7 +267,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d1", "gpio-keys") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_btn_d1 grove.xiao.v1.grove_btn.gpio.d2: @@ -276,7 +274,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d2", "gpio-keys") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_btn_d2 grove.xiao.v1.grove_btn.gpio.d5: @@ -285,7 +282,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d5", "gpio-keys") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_btn_d5 grove.xiao.v1.grove_btn.gpio.d7: @@ -294,7 +290,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d7", "gpio-keys") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_btn_d7 grove.xiao.v1.grove_btn.gpio.d8: @@ -302,7 +297,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d8", "gpio-keys") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_btn_d8 grove.xiao.v1.grove_btn.gpio.d9: @@ -310,7 +304,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d9", "gpio-keys") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_btn_d9 # @@ -323,9 +316,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_btn_d1 grove.rpipico.v1.grove_btn.gpio.d5: filter: dt_nodelabel_enabled("grove_d5_header") and @@ -335,9 +326,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_btn_d5 grove.rpipico.v1.grove_btn.gpio.d7: filter: dt_nodelabel_enabled("grove_d7_header") and @@ -346,9 +335,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_btn_d7 grove.rpipico.v1.grove_btn.gpio.d9: filter: dt_nodelabel_enabled("grove_d9_header") and @@ -357,9 +344,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_btn_d9 grove.rpipico.v1.grove_btn.gpio.d16: filter: dt_nodelabel_enabled("grove_d16_header") and @@ -367,9 +352,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_btn_d16 grove.rpipico.v1.grove_btn.gpio.d18: filter: dt_nodelabel_enabled("grove_d18_header") and @@ -377,9 +360,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_btn_d18 grove.rpipico.v1.grove_btn.gpio.d20: filter: dt_nodelabel_enabled("grove_d20_header") and @@ -387,9 +368,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_btn_d20 grove.rpipico.v1.grove_btn.gpio.d26: filter: ( dt_nodelabel_enabled("grove_a0_header") or @@ -398,9 +377,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_btn_d26 grove.rpipico.v1.grove_btn.gpio.d27: filter: ( dt_nodelabel_enabled("grove_a1_header") or @@ -409,9 +386,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_btn_d27 grove.rpipico.v1.grove_btn.gpio.d28: filter: ( dt_nodelabel_enabled("grove_a2_header") or @@ -420,9 +395,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_btn_d28 # # Grove Button by simple GPIO on Grove Connectors @@ -478,7 +451,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d9", "gpio-keys") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d9 grove.connectors.grove_btn.gpio.d10: depends_on: grove_gpio @@ -486,7 +458,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d10", "gpio-keys") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d10 grove.connectors.grove_btn.gpio.d11: depends_on: grove_gpio @@ -494,7 +465,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d11", "gpio-keys") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d11 grove.connectors.grove_btn.gpio.d12: depends_on: grove_gpio @@ -502,7 +472,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d12", "gpio-keys") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d12 grove.connectors.grove_btn.gpio.d13: depends_on: grove_gpio @@ -510,7 +479,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d13", "gpio-keys") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d13 grove.connectors.grove_btn.gpio.d14: depends_on: grove_gpio @@ -557,7 +525,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d20", "gpio-keys") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d20 grove.connectors.grove_btn.gpio.d21: depends_on: grove_gpio @@ -565,7 +532,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d21", "gpio-keys") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d21 grove.connectors.grove_btn.gpio.d22: depends_on: grove_gpio @@ -573,7 +539,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d22", "gpio-keys") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d22 grove.connectors.grove_btn.gpio.d23: depends_on: grove_gpio @@ -581,7 +546,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d23", "gpio-keys") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d23 grove.connectors.grove_btn.gpio.d24: depends_on: grove_gpio @@ -589,7 +553,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d24", "gpio-keys") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d24 grove.connectors.grove_btn.gpio.d25: depends_on: grove_gpio @@ -597,7 +560,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d25", "gpio-keys") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d25 grove.connectors.grove_btn.gpio.d26: depends_on: grove_gpio @@ -605,7 +567,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d26", "gpio-keys") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d26 grove.connectors.grove_btn.gpio.d27: depends_on: grove_gpio @@ -613,7 +574,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d27", "gpio-keys") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d27 grove.connectors.grove_btn.gpio.d28: depends_on: grove_gpio @@ -621,7 +581,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d28", "gpio-keys") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d28 grove.connectors.grove_btn.gpio.d29: depends_on: grove_gpio @@ -629,7 +588,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d29", "gpio-keys") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d29 grove.connectors.grove_btn.gpio.d30: depends_on: grove_gpio @@ -637,7 +595,6 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d30", "gpio-keys") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d30 grove.connectors.grove_btn.gpio.d31: depends_on: grove_gpio @@ -645,5 +602,4 @@ tests: dt_label_with_parent_compat_enabled("grove_btn_d31", "gpio-keys") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d31 From a53d19f93d7f1a8a252a04f82e6076e4c70ccc06 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Wed, 27 Sep 2023 06:55:16 +0200 Subject: [PATCH 18/22] tests: grove: led: remove '@usbcons' board revisions Signed-off-by: Stephan Linz --- .../shields/grove_led/dts_bindings/README.rst | 5 - .../grove_led/dts_bindings/testcase.yaml | 121 ------------------ 2 files changed, 126 deletions(-) diff --git a/tests/shields/grove_led/dts_bindings/README.rst b/tests/shields/grove_led/dts_bindings/README.rst index 2afac62a03..33477af28c 100644 --- a/tests/shields/grove_led/dts_bindings/README.rst +++ b/tests/shields/grove_led/dts_bindings/README.rst @@ -33,7 +33,6 @@ supported by this shield and that will be used for maintenance:: --verbose \ --inline-logs \ --platform arduino_zero \ - --platform arduino_zero@usbcons \ --platform mimxrt1010_evk \ --platform mimxrt1060_evk \ --platform mimxrt1060_evkb \ @@ -43,12 +42,8 @@ supported by this shield and that will be used for maintenance:: --platform nucleo_f767zi \ --platform rpi_pico \ --platform seeed_xiao_samd21 \ - --platform seeed_xiao_samd21@usbcons \ --platform seeeduino_xiao \ --platform seeeduino_lotus \ - --platform seeeduino_lotus@usbcons \ --platform waveshare_rp2040_plus \ - --platform waveshare_rp2040_plus@usbcons \ --platform waveshare_rp2040_plus@16mb \ - --platform waveshare_rp2040_plus@16mb@usbcons \ --testsuite-root bridle/tests/shields/grove_led/dts_bindings diff --git a/tests/shields/grove_led/dts_bindings/testcase.yaml b/tests/shields/grove_led/dts_bindings/testcase.yaml index 2aaab773fe..e549c6c331 100644 --- a/tests/shields/grove_led/dts_bindings/testcase.yaml +++ b/tests/shields/grove_led/dts_bindings/testcase.yaml @@ -248,7 +248,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d0", "pwm-leds") platform_allow: arduino_zero - arduino_zero@usbcons extra_args: SHIELD=seeed_grove_base_v2;grove_pwm_led_d0 grove.base.v1.grove_led.pwm.d0: depends_on: arduino_gpio @@ -257,7 +256,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d0", "pwm-leds") platform_allow: arduino_zero - arduino_zero@usbcons extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d0 grove.base.v2.grove_led.pwm.d1: depends_on: arduino_gpio @@ -266,7 +264,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d1", "pwm-leds") platform_allow: arduino_zero - arduino_zero@usbcons extra_args: SHIELD=seeed_grove_base_v2;grove_pwm_led_d1 grove.base.v1.grove_led.pwm.d1: depends_on: arduino_gpio @@ -275,7 +272,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d1", "pwm-leds") platform_allow: arduino_zero - arduino_zero@usbcons extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d1 grove.base.v2.grove_led.pwm.d2: depends_on: arduino_gpio @@ -288,9 +284,7 @@ tests: mimxrt1060_evk mimxrt1060_evkb arduino_zero - arduino_zero@usbcons seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=seeed_grove_base_v2;grove_pwm_led_d2 grove.base.v1.grove_led.pwm.d2: depends_on: arduino_gpio @@ -303,9 +297,7 @@ tests: mimxrt1060_evk mimxrt1060_evkb arduino_zero - arduino_zero@usbcons seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d2 grove.base.v2.grove_led.pwm.d3: depends_on: arduino_gpio @@ -320,9 +312,7 @@ tests: mimxrt1060_evk mimxrt1060_evkb arduino_zero - arduino_zero@usbcons seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=seeed_grove_base_v2;grove_pwm_led_d3 grove.base.v1.grove_led.pwm.d3: depends_on: arduino_gpio @@ -337,9 +327,7 @@ tests: mimxrt1060_evk mimxrt1060_evkb arduino_zero - arduino_zero@usbcons seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d3 grove.base.v2.grove_led.pwm.d4: depends_on: arduino_gpio @@ -351,9 +339,7 @@ tests: mimxrt1060_evk mimxrt1060_evkb arduino_zero - arduino_zero@usbcons seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=seeed_grove_base_v2;grove_pwm_led_d4 grove.base.v1.grove_led.pwm.d4: depends_on: arduino_gpio @@ -365,9 +351,7 @@ tests: mimxrt1060_evk mimxrt1060_evkb arduino_zero - arduino_zero@usbcons seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d4 grove.base.v2.grove_led.pwm.d5: depends_on: arduino_gpio @@ -382,9 +366,7 @@ tests: mimxrt1060_evk mimxrt1060_evkb arduino_zero - arduino_zero@usbcons seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=seeed_grove_base_v2;grove_pwm_led_d5 grove.base.v1.grove_led.pwm.d5: depends_on: arduino_gpio @@ -399,9 +381,7 @@ tests: mimxrt1060_evk mimxrt1060_evkb arduino_zero - arduino_zero@usbcons seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d5 grove.base.v2.grove_led.pwm.d6: depends_on: arduino_gpio @@ -414,9 +394,7 @@ tests: nucleo_f413zh nucleo_f767zi arduino_zero - arduino_zero@usbcons seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=seeed_grove_base_v2;grove_pwm_led_d6 grove.base.v1.grove_led.pwm.d6: depends_on: arduino_gpio @@ -429,9 +407,7 @@ tests: nucleo_f413zh nucleo_f767zi arduino_zero - arduino_zero@usbcons seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d6 grove.base.v2.grove_led.pwm.d7: depends_on: arduino_gpio @@ -442,9 +418,7 @@ tests: nucleo_f303re nucleo_f401re arduino_zero - arduino_zero@usbcons seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=seeed_grove_base_v2;grove_pwm_led_d7 grove.base.v1.grove_led.pwm.d7: depends_on: arduino_gpio @@ -455,9 +429,7 @@ tests: nucleo_f303re nucleo_f401re arduino_zero - arduino_zero@usbcons seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d7 grove.base.v2.grove_led.pwm.d8: depends_on: arduino_gpio @@ -469,7 +441,6 @@ tests: nucleo_f401re mimxrt1010_evk arduino_zero - arduino_zero@usbcons extra_args: SHIELD=seeed_grove_base_v2;grove_pwm_led_d8 grove.base.v1.grove_led.pwm.d8: depends_on: arduino_gpio @@ -481,7 +452,6 @@ tests: nucleo_f401re mimxrt1010_evk arduino_zero - arduino_zero@usbcons extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d8 grove.base.v2.grove_led.pwm.d9: depends_on: arduino_gpio @@ -495,7 +465,6 @@ tests: nucleo_f767zi mimxrt1010_evk arduino_zero - arduino_zero@usbcons extra_args: SHIELD=seeed_grove_base_v2;grove_pwm_led_d9 grove.base.v1.grove_led.pwm.d9: depends_on: arduino_gpio @@ -509,7 +478,6 @@ tests: nucleo_f767zi mimxrt1010_evk arduino_zero - arduino_zero@usbcons extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d9 grove.base.v1.grove_led.pwm.d10: depends_on: arduino_gpio @@ -524,7 +492,6 @@ tests: mimxrt1060_evk mimxrt1060_evkb arduino_zero - arduino_zero@usbcons extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d10 grove.base.v1.grove_led.pwm.d11: depends_on: arduino_gpio @@ -539,7 +506,6 @@ tests: mimxrt1060_evk mimxrt1060_evkb arduino_zero - arduino_zero@usbcons extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d11 grove.base.v1.grove_led.pwm.d12: depends_on: arduino_gpio @@ -553,7 +519,6 @@ tests: mimxrt1060_evk mimxrt1060_evkb arduino_zero - arduino_zero@usbcons extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d12 grove.base.v1.grove_led.pwm.d13: depends_on: arduino_gpio @@ -568,7 +533,6 @@ tests: mimxrt1060_evk mimxrt1060_evkb arduino_zero - arduino_zero@usbcons extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d13 grove.base.v2.grove_led.pwm.d18: depends_on: arduino_gpio @@ -580,7 +544,6 @@ tests: nucleo_f413zh nucleo_f767zi arduino_zero - arduino_zero@usbcons extra_args: SHIELD=seeed_grove_base_v2;grove_pwm_led_d18 grove.base.v1.grove_led.pwm.d18: depends_on: arduino_gpio @@ -593,7 +556,6 @@ tests: nucleo_f413zh nucleo_f767zi arduino_zero - arduino_zero@usbcons extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d18 grove.base.v2.grove_led.pwm.d19: depends_on: arduino_gpio @@ -606,7 +568,6 @@ tests: nucleo_f413zh nucleo_f767zi arduino_zero - arduino_zero@usbcons extra_args: SHIELD=seeed_grove_base_v2;grove_pwm_led_d19 grove.base.v1.grove_led.pwm.d19: depends_on: arduino_gpio @@ -619,7 +580,6 @@ tests: nucleo_f413zh nucleo_f767zi arduino_zero - arduino_zero@usbcons extra_args: SHIELD=seeed_grove_base_v1;grove_pwm_led_d19 # # Grove LED by simple GPIO on Grove Shield for Seeeduino XIAO @@ -629,7 +589,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d0", "gpio-leds") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_led_d0 grove.xiao.v1.grove_led.gpio.d1: @@ -637,7 +596,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d1", "gpio-leds") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_led_d1 grove.xiao.v1.grove_led.gpio.d2: @@ -645,7 +603,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d2", "gpio-leds") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_led_d2 grove.xiao.v1.grove_led.gpio.d5: @@ -654,7 +611,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d5", "gpio-leds") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_led_d5 grove.xiao.v1.grove_led.gpio.d7: @@ -663,7 +619,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d7", "gpio-leds") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_led_d7 grove.xiao.v1.grove_led.gpio.d8: @@ -671,7 +626,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d8", "gpio-leds") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_led_d8 grove.xiao.v1.grove_led.gpio.d9: @@ -679,7 +633,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d9", "gpio-leds") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_led_d9 # @@ -691,7 +644,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d1", "pwm-leds") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_pwm_led_d1 grove.xiao.v1.grove_led.pwm.d2: @@ -700,7 +652,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d2", "pwm-leds") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_pwm_led_d2 grove.xiao.v1.grove_led.pwm.d5: @@ -710,7 +661,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d5", "pwm-leds") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_pwm_led_d5 grove.xiao.v1.grove_led.pwm.d8: @@ -719,7 +669,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d8", "pwm-leds") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_pwm_led_d8 grove.xiao.v1.grove_led.pwm.d9: @@ -728,7 +677,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d9", "pwm-leds") platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_pwm_led_d9 # @@ -741,9 +689,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_led_d1 grove.rpipico.v1.grove_led.gpio.d5: filter: dt_nodelabel_enabled("grove_d5_header") and @@ -753,9 +699,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_led_d5 grove.rpipico.v1.grove_led.gpio.d7: filter: dt_nodelabel_enabled("grove_d7_header") and @@ -764,9 +708,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_led_d7 grove.rpipico.v1.grove_led.gpio.d9: filter: dt_nodelabel_enabled("grove_d9_header") and @@ -775,9 +717,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_led_d9 grove.rpipico.v1.grove_led.gpio.d16: filter: dt_nodelabel_enabled("grove_d16_header") and @@ -785,9 +725,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_led_d16 grove.rpipico.v1.grove_led.gpio.d18: filter: dt_nodelabel_enabled("grove_d18_header") and @@ -795,9 +733,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_led_d18 grove.rpipico.v1.grove_led.gpio.d20: filter: dt_nodelabel_enabled("grove_d20_header") and @@ -805,9 +741,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_led_d20 grove.rpipico.v1.grove_led.gpio.d26: filter: ( dt_nodelabel_enabled("grove_a0_header") or @@ -816,9 +750,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_led_d26 grove.rpipico.v1.grove_led.gpio.d27: filter: ( dt_nodelabel_enabled("grove_a1_header") or @@ -827,9 +759,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_led_d27 grove.rpipico.v1.grove_led.gpio.d28: filter: ( dt_nodelabel_enabled("grove_a2_header") or @@ -838,9 +768,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_led_d28 # # Grove LED by dedicated PWM on Grove Shield for Pi Pico @@ -852,9 +780,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_pwm_led_d16 grove.rpipico.v1.grove_led.pwm.d18: filter: dt_nodelabel_enabled("grove_pwm_d18") and @@ -863,9 +789,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_pwm_led_d18 grove.rpipico.v1.grove_led.pwm.d20: filter: dt_nodelabel_enabled("grove_pwm_d20") and @@ -874,9 +798,7 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_pwm_led_d20 # # Grove LED by simple GPIO on Grove Connectors @@ -932,7 +854,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d9", "gpio-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_led_d9 grove.connectors.grove_led.gpio.d10: depends_on: grove_gpio @@ -940,7 +861,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d10", "gpio-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_led_d10 grove.connectors.grove_led.gpio.d11: depends_on: grove_gpio @@ -948,7 +868,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d11", "gpio-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_led_d11 grove.connectors.grove_led.gpio.d12: depends_on: grove_gpio @@ -956,7 +875,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d12", "gpio-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_led_d12 grove.connectors.grove_led.gpio.d13: depends_on: grove_gpio @@ -964,7 +882,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d13", "gpio-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_led_d13 grove.connectors.grove_led.gpio.d14: depends_on: grove_gpio @@ -1011,7 +928,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d20", "gpio-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_led_d20 grove.connectors.grove_led.gpio.d21: depends_on: grove_gpio @@ -1019,7 +935,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d21", "gpio-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_led_d21 grove.connectors.grove_led.gpio.d22: depends_on: grove_gpio @@ -1027,7 +942,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d22", "gpio-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_led_d22 grove.connectors.grove_led.gpio.d23: depends_on: grove_gpio @@ -1035,7 +949,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d23", "gpio-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_led_d23 grove.connectors.grove_led.gpio.d24: depends_on: grove_gpio @@ -1043,7 +956,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d24", "gpio-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_led_d24 grove.connectors.grove_led.gpio.d25: depends_on: grove_gpio @@ -1051,7 +963,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d25", "gpio-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_led_d25 grove.connectors.grove_led.gpio.d26: depends_on: grove_gpio @@ -1059,7 +970,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d26", "gpio-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_led_d26 grove.connectors.grove_led.gpio.d27: depends_on: grove_gpio @@ -1067,7 +977,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d27", "gpio-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_led_d27 grove.connectors.grove_led.gpio.d28: depends_on: grove_gpio @@ -1075,7 +984,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d28", "gpio-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_led_d28 grove.connectors.grove_led.gpio.d29: depends_on: grove_gpio @@ -1083,7 +991,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d29", "gpio-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_led_d29 grove.connectors.grove_led.gpio.d30: depends_on: grove_gpio @@ -1091,7 +998,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d30", "gpio-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_led_d30 grove.connectors.grove_led.gpio.d31: depends_on: grove_gpio @@ -1099,7 +1005,6 @@ tests: dt_label_with_parent_compat_enabled("grove_led_d31", "gpio-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_led_d31 # # Grove LED by dedicated PWM on Grove Connectors @@ -1110,7 +1015,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d0", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d0 grove.connectors.grove_led.pwm.d1: depends_on: grove_pwm @@ -1118,7 +1022,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d1", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d1 grove.connectors.grove_led.pwm.d2: depends_on: grove_pwm @@ -1156,7 +1059,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d8", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d8 grove.connectors.grove_led.pwm.d9: depends_on: grove_pwm @@ -1164,7 +1066,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d9", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d9 grove.connectors.grove_led.pwm.d10: depends_on: grove_pwm @@ -1172,7 +1073,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d10", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d10 grove.connectors.grove_led.pwm.d11: depends_on: grove_pwm @@ -1180,7 +1080,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d11", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d11 grove.connectors.grove_led.pwm.d12: depends_on: grove_pwm @@ -1188,7 +1087,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d12", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d12 grove.connectors.grove_led.pwm.d13: depends_on: grove_pwm @@ -1196,7 +1094,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d13", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d13 grove.connectors.grove_led.pwm.d14: depends_on: grove_pwm @@ -1205,7 +1102,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d14", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d14 grove.connectors.grove_led.pwm.d15: depends_on: grove_pwm @@ -1214,7 +1110,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d15", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d15 grove.connectors.grove_led.pwm.d16: depends_on: grove_pwm @@ -1223,7 +1118,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d16", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d16 grove.connectors.grove_led.pwm.d17: depends_on: grove_pwm @@ -1232,7 +1126,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d17", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d17 grove.connectors.grove_led.pwm.d18: depends_on: grove_pwm @@ -1242,7 +1135,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d18", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d18 grove.connectors.grove_led.pwm.d19: depends_on: grove_pwm @@ -1252,7 +1144,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d19", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d19 grove.connectors.grove_led.pwm.d20: depends_on: grove_pwm @@ -1261,7 +1152,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d20", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d20 grove.connectors.grove_led.pwm.d21: depends_on: grove_pwm @@ -1269,7 +1159,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d21", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d21 grove.connectors.grove_led.pwm.d22: depends_on: grove_pwm @@ -1277,7 +1166,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d22", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d22 grove.connectors.grove_led.pwm.d23: depends_on: grove_pwm @@ -1285,7 +1173,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d23", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d23 grove.connectors.grove_led.pwm.d24: depends_on: grove_pwm @@ -1293,7 +1180,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d24", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d24 grove.connectors.grove_led.pwm.d25: depends_on: grove_pwm @@ -1301,7 +1187,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d25", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d25 grove.connectors.grove_led.pwm.d26: depends_on: grove_pwm @@ -1309,7 +1194,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d26", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d26 grove.connectors.grove_led.pwm.d27: depends_on: grove_pwm @@ -1317,7 +1201,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d27", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d27 grove.connectors.grove_led.pwm.d28: depends_on: grove_pwm @@ -1325,7 +1208,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d28", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d28 grove.connectors.grove_led.pwm.d29: depends_on: grove_pwm @@ -1333,7 +1215,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d29", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d29 grove.connectors.grove_led.pwm.d30: depends_on: grove_pwm @@ -1341,7 +1222,6 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d30", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d30 grove.connectors.grove_led.pwm.d31: depends_on: grove_pwm @@ -1349,5 +1229,4 @@ tests: dt_label_with_parent_compat_enabled("grove_pwm_led_d31", "pwm-leds") platform_exclude: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_pwm_led_d31 From 1a92bcf744d969ccc09a11df984813e4520e7e65 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Wed, 27 Sep 2023 06:55:42 +0200 Subject: [PATCH 19/22] tests: grove: x_grove_testbed: remove '@usbcons' board revisions Signed-off-by: Stephan Linz --- boards/shields/x_grove_testbed/doc/index.rst | 24 +++++++++---------- .../dts_bindings/testcase.yaml | 5 ---- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/boards/shields/x_grove_testbed/doc/index.rst b/boards/shields/x_grove_testbed/doc/index.rst index 2100620155..0ca3b51150 100644 --- a/boards/shields/x_grove_testbed/doc/index.rst +++ b/boards/shields/x_grove_testbed/doc/index.rst @@ -497,10 +497,10 @@ For example: .. zephyr-app-commands:: :app: zephyr/samples/basic/blinky :build-dir: blinky-arduino_zero-x_grove_testbed - :board: arduino_zero@usbcons + :board: arduino_zero :shield: "seeed_grove_base_v2 grove_btn_d7 grove_led_d6 grove_pwm_led_d6 x_grove_testbed" :goals: build flash - :west-args: -p always + :west-args: -p always -S usb-console :host-os: unix :tool: all @@ -512,10 +512,10 @@ For example: .. zephyr-app-commands:: :app: zephyr/samples/basic/fade_led :build-dir: fade-arduino_zero-x_grove_testbed - :board: arduino_zero@usbcons + :board: arduino_zero :shield: "seeed_grove_base_v2 grove_btn_d7 grove_led_d6 grove_pwm_led_d6 x_grove_testbed" :goals: build flash - :west-args: -p always + :west-args: -p always -S usb-console :host-os: unix :tool: all @@ -527,10 +527,10 @@ For example: .. zephyr-app-commands:: :app: zephyr/samples/basic/button :build-dir: button-arduino_zero-x_grove_testbed - :board: arduino_zero@usbcons + :board: arduino_zero :shield: "seeed_grove_base_v2 grove_btn_d7 grove_led_d6 grove_pwm_led_d6 x_grove_testbed" :goals: build flash - :west-args: -p always + :west-args: -p always -S usb-console :host-os: unix :tool: all @@ -554,10 +554,10 @@ For example: .. zephyr-app-commands:: :app: zephyr/samples/basic/blinky :build-dir: blinky-seeeduino_lotus-x_grove_testbed - :board: seeeduino_lotus@usbcons + :board: seeeduino_lotus :shield: "grove_btn_d7 grove_led_d6 grove_pwm_led_d6 x_grove_testbed" :goals: build flash - :west-args: -p always + :west-args: -p always -S usb-console :host-os: unix :tool: all @@ -569,10 +569,10 @@ For example: .. zephyr-app-commands:: :app: zephyr/samples/basic/fade_led :build-dir: fade-seeeduino_lotus-x_grove_testbed - :board: seeeduino_lotus@usbcons + :board: seeeduino_lotus :shield: "grove_btn_d7 grove_led_d6 grove_pwm_led_d6 x_grove_testbed" :goals: build flash - :west-args: -p always + :west-args: -p always -S usb-console :host-os: unix :tool: all @@ -584,10 +584,10 @@ For example: .. zephyr-app-commands:: :app: zephyr/samples/basic/button :build-dir: button-seeeduino_lotus-x_grove_testbed - :board: seeeduino_lotus@usbcons + :board: seeeduino_lotus :shield: "grove_btn_d7 grove_led_d6 grove_pwm_led_d6 x_grove_testbed" :goals: build flash - :west-args: -p always + :west-args: -p always -S usb-console :host-os: unix :tool: all diff --git a/tests/shields/x_grove_testbed/dts_bindings/testcase.yaml b/tests/shields/x_grove_testbed/dts_bindings/testcase.yaml index 882b71618a..e5eff5397a 100644 --- a/tests/shields/x_grove_testbed/dts_bindings/testcase.yaml +++ b/tests/shields/x_grove_testbed/dts_bindings/testcase.yaml @@ -26,27 +26,22 @@ tests: platform_allow: rpi_pico waveshare_rp2040_plus - waveshare_rp2040_plus@usbcons waveshare_rp2040_plus@16mb - waveshare_rp2040_plus@16mb@usbcons extra_args: SHIELD=seeed_grove_rpipico_v1;grove_btn_d16;grove_led_d18;grove_pwm_led_d18;x_grove_testbed grove.arduino.zero.x_grove_testbed.pwm: platform_allow: arduino_zero - arduino_zero@usbcons extra_args: SHIELD=seeed_grove_base_v2;grove_btn_d7;grove_led_d6;grove_pwm_led_d6;x_grove_testbed grove.seeeduino.xiao.x_grove_testbed.pwm: platform_allow: seeed_xiao_samd21 - seeed_xiao_samd21@usbcons seeeduino_xiao extra_args: SHIELD=seeed_grove_xiao_v1;grove_btn_d0;grove_led_d1;grove_pwm_led_d1;x_grove_testbed grove.seeeduino.lotus.x_grove_testbed.pwm: platform_allow: seeeduino_lotus - seeeduino_lotus@usbcons extra_args: SHIELD=grove_btn_d7;grove_led_d6;grove_pwm_led_d6;x_grove_testbed From a21fbde1eef2484b2d166ca7962702f00719acf5 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Wed, 27 Sep 2023 06:58:27 +0200 Subject: [PATCH 20/22] samples: helloshell: test: remove '@usbcons' board revisions Signed-off-by: Stephan Linz --- samples/helloshell/README.rst | 11 +++++++++++ samples/helloshell/sample.yaml | 12 ------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/samples/helloshell/README.rst b/samples/helloshell/README.rst index 4be256ef93..f3a2554b66 100644 --- a/samples/helloshell/README.rst +++ b/samples/helloshell/README.rst @@ -38,7 +38,18 @@ Requirements * :ref:`zephyr:qemu_xtensa` * :ref:`zephyr:qemu_leon3` * :ref:`zephyr:qemu_nios2` + * :ref:`zephyr:nucleo_f303re_board` (NUCLEO-F303RE) + * :ref:`zephyr:nucleo_f401re_board` (NUCLEO-F401RE) + * :ref:`zephyr:nucleo_f413zh_board` (NUCLEO-F413ZH) * :ref:`zephyr:nucleo_f746zg_board` (NUCLEO-F746ZG) + * :ref:`zephyr:nucleo_f767zi_board` (NUCLEO-F767ZI) + * :ref:`zephyr:mimxrt1010_evk` + * :ref:`zephyr:mimxrt1060_evk` + * :ref:`zephyr:arduino_zero` or Bridle's :ref:`arduino_zero` + * :ref:`seeeduino_lotus` + * :ref:`zephyr:seeeduino_xiao` or Bridle's :ref:`seeed_xiao_samd21` + * :ref:`zephyr:rpi_pico` + * :ref:`waveshare_rp2040` Building and Running ******************** diff --git a/samples/helloshell/sample.yaml b/samples/helloshell/sample.yaml index b4354e67f0..931ba6b003 100644 --- a/samples/helloshell/sample.yaml +++ b/samples/helloshell/sample.yaml @@ -28,7 +28,6 @@ common: - qemu_leon3 - qemu_nios2 - arduino_zero - - arduino_zero@usbcons - mimxrt1010_evk - mimxrt1060_evk - mimxrt1060_evkb @@ -39,26 +38,15 @@ common: - nucleo_f767zi - rpi_pico - seeed_xiao_samd21 - - seeed_xiao_samd21@usbcons - seeeduino_xiao - seeeduino_lotus - - seeeduino_lotus@usbcons - waveshare_rp2040_one - - waveshare_rp2040_one@usbcons - waveshare_rp2040_zero - - waveshare_rp2040_zero@usbcons - waveshare_rp2040_matrix - - waveshare_rp2040_matrix@usbcons - waveshare_rp2040_tiny - - waveshare_rp2040_tiny@usbcons - waveshare_rp2040_eth - - waveshare_rp2040_eth@usbcons - waveshare_rp2040_lcd_0_96 - - waveshare_rp2040_lcd_0_96@usbcons - - waveshare_rp2040_plus@usbcons - - waveshare_rp2040_plus@usbcons - waveshare_rp2040_plus@16mb - - waveshare_rp2040_plus@16mb@usbcons tests: bridle.samples.helloshell.commands: filter: CONFIG_QEMU_TARGET and CONFIG_SERIAL and From 9eaef0763657f064f598f928c8b7fbd85802fcfc Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Wed, 27 Sep 2023 07:01:55 +0200 Subject: [PATCH 21/22] ci: github: qa-shields: remove '@usbcons' board revisions Signed-off-by: Stephan Linz --- .github/workflows/qa-integration.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/qa-integration.yml b/.github/workflows/qa-integration.yml index 1d075c8e72..13589852a7 100644 --- a/.github/workflows/qa-integration.yml +++ b/.github/workflows/qa-integration.yml @@ -110,7 +110,6 @@ jobs: --outdir twister-out --no-clean --inline-logs \ --enable-size-report --platform-reports \ --platform arduino_zero \ - --platform arduino_zero@usbcons \ --platform mimxrt1010_evk \ --platform mimxrt1060_evk \ --platform mimxrt1060_evkb \ @@ -120,14 +119,10 @@ jobs: --platform nucleo_f767zi \ --platform rpi_pico \ --platform seeed_xiao_samd21 \ - --platform seeed_xiao_samd21@usbcons \ --platform seeeduino_xiao \ --platform seeeduino_lotus \ - --platform seeeduino_lotus@usbcons \ --platform waveshare_rp2040_plus \ - --platform waveshare_rp2040_plus@usbcons \ --platform waveshare_rp2040_plus@16mb \ - --platform waveshare_rp2040_plus@16mb@usbcons \ --testsuite-root bridle/tests/shields/grove/dts_bindings \ --testsuite-root bridle/tests/shields/x_grove_testbed/dts_bindings From e62e055a6d19842af2a13da9ff274212aff788ba Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Wed, 27 Sep 2023 07:02:16 +0200 Subject: [PATCH 22/22] release: update draft notes for upcoming 3.5.0 Signed-off-by: Stephan Linz --- doc/bridle/releases/release-notes-3.5.0.rst | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/doc/bridle/releases/release-notes-3.5.0.rst b/doc/bridle/releases/release-notes-3.5.0.rst index 7fc85cf5ac..db94fb0fdd 100644 --- a/doc/bridle/releases/release-notes-3.5.0.rst +++ b/doc/bridle/releases/release-notes-3.5.0.rst @@ -100,6 +100,13 @@ Supported shields * Grove Button Shields * Grove LED Shields +Supported snippets +****************** + +:brd:`NOT YET, tbd.` + +* USB Console Snippet (usb-console) + Change log ********** @@ -135,13 +142,15 @@ Take over the new build principles from Zephyr: * Restruct and refactor the integration test cases for the ``helloshell`` sample. * Rename CAN driver: ``stm32-can`` to ``stm32-bxcan``. +* Convert all specific ``@usbcons`` board revisions to USB Console Snippet. +* Remove all specific ``@uartcons`` board revisions. Documentation ============= -1. Since Zephyr introduce its own ':zephyr:code-sample:' domain directive and - even this domain will not exported to the inventory anymore, all references - to Zephyr samples were converted to direct document references. +1. Since Zephyr introduce its own :rst:`.. zephyr:code-sample::` domain + directive and even this domain will not exported to the inventory anymore, + all references to Zephyr samples were converted to direct document references. 2. Add more colorization formatter for: bold, italic, strikethrough, and underline mixed with basic colors: red, blue, green, yellow, black and white. 3. Add colorization classes for "Hardware Feature Label" (hwftlbl) and special @@ -155,6 +164,7 @@ Issue Related Items These GitHub issues were addressed since project bootstrapping: +* :github:`128` - [FER] Provide USB console by snippets instead of specific board revision * :github:`125` - [BUG] Nightly QA integration test fails (convert to ``stm32-bxcan``) * :github:`122` - [HW] Waveshare RP2040 * :github:`120` - [BUG] Nightly QA integration test fails