Merge branch 'master' into fork/HiFiPhile/dcd_notif

1 files changed, 54 insertions, 19 deletions

diff --git a/test/hil/tinyusb.json b/test/hil/tinyusb.json
index 7393226eb..11b118cea 100644
--- a/test/hil/tinyusb.json
+++ b/test/hil/tinyusb.json
@@ -21,16 +21,18 @@
             "name": "espressif_s3_devkitm",
             "uid": "84F703C084E4",
             "build" : {
-                "flags_on": ["", "CFG_TUD_DWC2_DMA_ENABLE"]
+                "flags_on": ["", "CFG_TUD_DWC2_DMA_ENABLE CFG_TUH_DWC2_DMA_ENABLE"]
             },
             "tests": {
-                "only": ["device/cdc_msc_freertos", "device/hid_composite_freertos"]
+                "only": ["device/cdc_msc_freertos", "device/hid_composite_freertos", "host/device_info"],
+                "dev_attached": [{"vid_pid": "1a86_55d4", "serial": "52D2005402"}]
             },
             "flasher": {
                 "name": "esptool",
                 "uid": "3ea619acd1cdeb11a0a0b806e93fd3f1",
                 "args": "-b 1500000"
-            }
+            },
+            "comment": "Use TS3USB30 mux to test both device and host"
         },
         {
             "name": "feather_nrf52840_express",
@@ -45,28 +47,29 @@
             }
         },
         {
-            "name": "max32666fthr",
-            "uid": "0C81464124010B20FF0A08CC2C",
+            "name": "metro_m4_express",
+            "uid": "9995AD485337433231202020FF100A34",
             "tests": {
-                "device": true, "host": false, "dual": false
+                "device": true, "host": false, "dual": true,
+                "dev_attached": [{"vid_pid": "1a86_55d4", "serial": "52D2002130"}]
             },
             "flasher": {
-                "name": "openocd_adi",
-                "uid": "E6614C311B597D32",
-                "args": "-f interface/cmsis-dap.cfg -f target/max32665.cfg"
+                "name": "jlink",
+                "uid": "123456",
+                "args": "-device ATSAMD51J19"
             }
         },
         {
-            "name": "metro_m4_express",
-            "uid": "9995AD485337433231202020FF100A34",
+            "name": "mimxrt1064_evk",
+            "uid": "BAE96FB95AFA6DBB8F00005002001200",
             "tests": {
-                "device": true, "host": false, "dual": false,
-                "dev_attached": [{"vid_pid": "1a86_55d4", "serial": "52D2002130"}]
+                "device": true, "host": true, "dual": true,
+                "dev_attached": [{"vid_pid": "1a86_55d4", "serial": "52D2023299"}]
             },
             "flasher": {
                 "name": "jlink",
-                "uid": "123456",
-                "args": "-device ATSAMD51J19"
+                "uid": "000725299165",
+                "args": "-device MIMXRT1064xxx6A"
             }
         },
         {
@@ -98,8 +101,11 @@
         {
             "name": "raspberry_pi_pico",
             "uid": "E6614C311B764A37",
+            "build" : {
+                "flags_on": ["CFG_TUH_RPI_PIO_USB"]
+            },
             "tests": {
-                "device": true, "host": false, "dual": false,
+                "device": true, "host": true, "dual": true,
                 "dev_attached": [{"vid_pid": "1a86_55d4", "serial": "52D2002470"}]
             },
             "flasher": {
@@ -109,10 +115,27 @@
             }
         },
         {
+            "name": "raspberry_pi_pico_w",
+            "uid": "E6614C311B764A37",
+            "tests": {
+                "device": false, "host": true, "dual": false,
+                "dev_attached": [{"vid_pid": "1a86_55d4", "serial": "52D2023934"}]
+            },
+            "flasher": {
+                "name": "openocd",
+                "uid": "E6633861A3819D38",
+                "args": "-f interface/cmsis-dap.cfg -f target/rp2040.cfg -c \"adapter speed 5000\""
+            },
+            "comment": "Test native host"
+        },
+        {
             "name": "raspberry_pi_pico2",
             "uid": "560AE75E1C7152C9",
+            "build" : {
+                "flags_on": ["CFG_TUH_RPI_PIO_USB"]
+            },
             "tests": {
-                "device": true, "host": false, "dual": false,
+                "device": true, "host": true, "dual": true,
                 "dev_attached": [{"vid_pid": "1a86_55d4", "serial": "533D004242"}]
             },
             "flasher": {
@@ -157,9 +180,9 @@
                 "device": true, "host": false, "dual": false
             },
             "flasher": {
-                "name": "stlink",
+                "name": "openocd",
                 "uid": "004C00343137510F39383538",
-                "args": ""
+                "args": "-f interface/stlink.cfg -f target/stm32h7x.cfg"
             }
         },
         {
@@ -177,6 +200,18 @@
     ],
     "boards-skip": [
         {
+            "name": "max32666fthr",
+            "uid": "0C81464124010B20FF0A08CC2C",
+            "tests": {
+                "device": true, "host": false, "dual": false
+            },
+            "flasher": {
+                "name": "openocd_adi",
+                "uid": "E6614C311B597D32",
+                "args": "-f interface/cmsis-dap.cfg -f target/max32665.cfg"
+            }
+        },
+        {
             "name": "stm32f769disco",
             "uid": "21002F000F51363531383437",
             "build" : {