Merge master updates into the UAC1 host branch

Bring the audio work onto the current host core and build files before applying the remaining review fixes.

Signed-off-by: HiFiPHile <[email protected]>

1 files changed, 177 insertions, 60 deletions

diff --git a/test/hil/tinyusb.json b/test/hil/tinyusb.json
index 59ab57a06..6f552f126 100644
--- a/test/hil/tinyusb.json
+++ b/test/hil/tinyusb.json
@@ -1,6 +1,36 @@
 {
     "boards": [
         {
+            "name": "frdm_k64f",
+            "uid": "FFFF1A00FFFFFFFF1031454E0F000280",
+            "tests": {
+                "device": false,
+                "host": true,
+                "dual": false,
+                "dev_attached": [
+                    {
+                        "vid_pid": "1a86_55d4",
+                        "serial": "52D2023934",
+                        "is_cdc": true,
+                        "comment": "CH9102 USB-serial (TX-RX loopback)"
+                    },
+                    {
+                        "vid_pid": "21c4_0cc7",
+                        "serial": "9000588268687E25",
+                        "is_msc": true,
+                        "block_size": 512,
+                        "block_count": 60620800,
+                        "msc_inquiry": "Lexar    USB Flash Drive  PMAP"
+                    }
+                ]
+            },
+            "flasher": {
+                "name": "jlink",
+                "uid": "000621000000",
+                "args": "-device MK64FN1M0xxx12"
+            }
+        },
+        {
             "name": "ek_tm4c123gxl",
             "uid": "010105186C60A110",
             "tests": {
@@ -26,6 +56,7 @@
                     "device/cdc_msc_freertos",
                     "device/hid_composite_freertos",
                     "device/audio_test_freertos",
+                    "device/usbtest",
                     "host/device_info",
                     "host/msc_file_explorer_freertos"
                 ],
@@ -65,6 +96,7 @@
                     "device/cdc_msc_freertos",
                     "device/hid_composite_freertos",
                     "device/audio_test_freertos",
+                    "device/usbtest",
                     "host/device_info",
                     "host/msc_file_explorer_freertos"
                 ],
@@ -115,9 +147,11 @@
                 "dual": false
             },
             "flasher": {
-                "name": "openocd_adi",
+                "name": "openocd",
                 "uid": "E6614C311B597D32",
-                "args": "-f interface/cmsis-dap.cfg -f target/max32665.cfg"
+                "vid_pid": "0x2e8a 0x000c",
+                "args": "-f interface/cmsis-dap.cfg -f target/max32665.cfg",
+                "verify": true
             }
         },
         {
@@ -149,8 +183,8 @@
             }
         },
         {
-            "name": "mimxrt1015_evk",
-            "uid": "DC28F865D2111D228D00B0543A70463C",
+            "name": "lpcxpresso11u37",
+            "uid": "17121919",
             "tests": {
                 "device": true,
                 "host": false,
@@ -158,43 +192,13 @@
             },
             "flasher": {
                 "name": "jlink",
-                "uid": "000726284213",
-                "args": "-device MIMXRT1015DAF5A"
-            }
-        },
-        {
-            "name": "mimxrt1064_evk",
-            "uid": "BAE96FB95AFA6DBB8F00005002001200",
-            "tests": {
-                "device": true,
-                "host": true,
-                "dual": true,
-                "dev_attached": [
-                    {
-                        "vid_pid": "10c4_ea60",
-                        "serial": "0001",
-                        "is_cdc": true,
-                        "comment": "cp2102"
-                    },
-                    {
-                        "vid_pid": "21c4_0cc7",
-                        "serial": "900058874D871F66",
-                        "is_msc": true,
-                        "block_size": 512,
-                        "block_count": 60620800,
-                        "msc_inquiry": "Lexar    USB Flash Drive  PMAP"
-                    }
-                ]
-            },
-            "flasher": {
-                "name": "jlink",
-                "uid": "000725299165",
-                "args": "-device MIMXRT1064xxx6A"
+                "uid": "000724441579",
+                "args": "-device LPC11U37/401"
             }
         },
         {
-            "name": "lpcxpresso11u37",
-            "uid": "17121919",
+            "name": "lpcxpresso55s28",
+            "uid": "2BF1839A7D51F553A15AB03FD08F70AB",
             "tests": {
                 "device": true,
                 "host": false,
@@ -202,8 +206,8 @@
             },
             "flasher": {
                 "name": "jlink",
-                "uid": "000724441579",
-                "args": "-device LPC11U37/401"
+                "uid": "000727031389",
+                "args": "-device LPC55S28"
             }
         },
         {
@@ -251,7 +255,9 @@
             "flasher": {
                 "name": "openocd",
                 "uid": "E6614103E72C1D2F",
-                "args": "-f interface/cmsis-dap.cfg -f target/rp2040.cfg -c \"adapter speed 5000\""
+                "vid_pid": "0x2e8a 0x000c",
+                "args": "-f interface/cmsis-dap.cfg -f target/rp2040.cfg -c \"adapter speed 5000\"",
+                "verify": true
             }
         },
         {
@@ -280,7 +286,9 @@
             "flasher": {
                 "name": "openocd",
                 "uid": "E6633861A3819D38",
-                "args": "-f interface/cmsis-dap.cfg -f target/rp2040.cfg -c \"adapter speed 5000\""
+                "vid_pid": "0x2e8a 0x000c",
+                "args": "-f interface/cmsis-dap.cfg -f target/rp2040.cfg -c \"adapter speed 5000\"",
+                "verify": true
             },
             "comment": "Test native host"
         },
@@ -305,7 +313,9 @@
             "flasher": {
                 "name": "openocd",
                 "uid": "E6633861A3978538",
-                "args": "-f interface/cmsis-dap.cfg -f target/rp2350.cfg -c \"adapter speed 5000\""
+                "vid_pid": "0x2e8a 0x000c",
+                "args": "-f interface/cmsis-dap.cfg -f target/rp2350.cfg -c \"adapter speed 5000\"",
+                "verify": true
             }
         },
         {
@@ -334,7 +344,9 @@
             "flasher": {
                 "name": "openocd",
                 "uid": "E663AC91D3359B38",
-                "args": "-f interface/cmsis-dap.cfg -f target/rp2350.cfg -c \"adapter speed 5000\""
+                "vid_pid": "0x2e8a 0x000c",
+                "args": "-f interface/cmsis-dap.cfg -f target/rp2350.cfg -c \"adapter speed 5000\"",
+                "verify": true
             }
         },
         {
@@ -379,13 +391,14 @@
                 "dual": false,
                 "dev_attached": [
                     {
-                        "vid_pid": "1a86_55d4",
-                        "serial": "52D2003414",
-                        "is_cdc": true
+                        "vid_pid": "10c4_ea60",
+                        "serial": "0001",
+                        "is_cdc": true,
+                        "comment": "cp2102"
                     },
                     {
                         "vid_pid": "21c4_0cc7",
-                        "serial": "90005893730A1A63",
+                        "serial": "900058874D871F66",
                         "is_msc": true,
                         "block_size": 512,
                         "block_count": 60620800,
@@ -413,9 +426,9 @@
                 "dual": false
             },
             "flasher": {
-                "name": "openocd",
+                "name": "stlink",
                 "uid": "004C00343137510F39383538",
-                "args": "-f interface/stlink.cfg -f target/stm32h7x.cfg"
+                "verify": true
             }
         },
         {
@@ -427,9 +440,9 @@
                 "dual": false
             },
             "flasher": {
-                "name": "openocd",
+                "name": "stlink",
                 "uid": "066FFF495087534867063844",
-                "args": "-f interface/stlink.cfg -f target/stm32g0x.cfg"
+                "verify": true
             },
             "comment": "32-bit scheme, 2KB USB SRAM"
         },
@@ -474,9 +487,11 @@
                 "dual": false
             },
             "flasher": {
-                "name": "openocd_wch",
-                "uid": "EBCA8F0670AF",
-                "args": ""
+                "name": "openocd",
+                "uid": "A76D8F062C2A",
+                "vid_pid": "0x1a86 0x8010",
+                "args": "-f target/wch-riscv.cfg",
+                "verify": false
             }
         },
         {
@@ -489,9 +504,32 @@
                 "dual": false
             },
             "flasher": {
-                "name": "openocd_wch",
+                "name": "openocd",
                 "uid": "BC4954081051",
-                "args": ""
+                "vid_pid": "0x1a86 0x8010",
+                "args": "-f target/wch-riscv.cfg",
+                "verify": false
+            }
+        },
+        {
+            "name": "ch32v307v_r1_1v0",
+            "uid": "DE6B3E263B3857CAFFFFFFFF",
+            "toolchain": "riscv-gcc",
+            "variant": [
+                {"name": "ch32v307v_r1_1v0-usbhs", "defines": ["SPEED=high"]},
+                {"name": "ch32v307v_r1_1v0-usbfs", "defines": ["SPEED=full"]}
+            ],
+            "tests": {
+                "device": true,
+                "host": false,
+                "dual": false
+            },
+            "flasher": {
+                "name": "openocd",
+                "uid": "BC5DA47360D0",
+                "vid_pid": "0x1a86 0x8010",
+                "args": "-f target/wch-riscv.cfg",
+                "verify": false
             }
         },
         {
@@ -504,14 +542,76 @@
                 "dual": false
             },
             "flasher": {
-                "name": "openocd_wch",
-                "uid": "7FD88F0604B5",
-                "args": ""
+                "name": "openocd",
+                "uid": "57468F06DC03",
+                "vid_pid": "0x1a86 0x8010",
+                "args": "-f target/wch-riscv.cfg",
+                "verify": false
+            }
+        },
+        {
+            "name": "mimxrt1064_evk",
+            "uid": "BAE96FB95AFA6DBB8F00005002001200",
+            "tests": {
+                "device": true,
+                "host": true,
+                "dual": true,
+                "dev_attached": [
+                    {
+                        "vid_pid": "1a86_55d4",
+                        "serial": "52D2003414",
+                        "is_cdc": true
+                    },
+                    {
+                        "vid_pid": "21c4_0cc7",
+                        "serial": "90005893730A1A63",
+                        "is_msc": true,
+                        "block_size": 512,
+                        "block_count": 60620800,
+                        "msc_inquiry": "Lexar    USB Flash Drive  PMAP"
+                    }
+                ]
+            },
+            "flasher": {
+                "name": "jlink",
+                "uid": "000725299165",
+                "args": "-device MIMXRT1064xxx6A"
+            }
+        },
+        {
+            "name": "nrf54lm20dk",
+            "uid": "899C3DE5B0F4D5CA",
+            "tests": {
+                "device": true,
+                "host": false,
+                "dual": false,
+                "skip": ["device/audio_test_freertos"],
+                "comment": "board new to HIL: audio_test_freertos never reaches dcd_init (FreeRTOS itself runs; cdc_msc_freertos and usbtest pass) - example-level issue on nRF54L, fix separately"
+            },
+            "flasher": {
+                "name": "jlink",
+                "uid": "1051856258",
+                "args": "-device NRF54LM20A_M33"
             }
         }
     ],
     "boards-skip": [
         {
+            "name": "ra8m1_ek",
+            "uid": "797D142D36345030364E1737922E4B4E",
+            "comment": "USBHS bring-up pending (HS chirp completes digitally but terminations never switch; FS-forced build passed usbtest 30/30). Parked until fixed",
+            "tests": {
+                "device": true,
+                "host": false,
+                "dual": false
+            },
+            "flasher": {
+                "name": "jlink",
+                "uid": "001083115236",
+                "args": "-device R7FA8M1AH"
+            }
+        },
+        {
             "name": "stm32f769disco",
             "uid": "21002F000F51363531383437",
             "variant": [
@@ -528,6 +628,23 @@
                 "uid": "000778170924",
                 "args": "-device stm32f769ni"
             }
+        },
+        {
+            "name": "ra6m5_ek",
+            "uid": "8419032D32363657364EF4622D294B4E",
+            "comment": "Unstable in CI: intermittent usbtest failures plus cdc_dual_ports/hid_boot_interface/midi_test/mtp/printer_to_cdc flapping. Parked until diagnosed",
+            "tests": {
+                "device": true,
+                "host": false,
+                "dual": false,
+                "skip": ["device/cdc_msc_throughput", "device/msc_dual_lun"],
+                "comment": "MSC writes wedge the uPD720201 host (URBs queued, zero wire activity, bus-15 ctrl xfers time out until the device's URBs are killed); reproduced identically with master firmware - device side armed+BUF and exonerated. MSC reads and usbtest bulk (15.8 MB/s) are fine"
+            },
+            "flasher": {
+                "name": "jlink",
+                "uid": "000831915224",
+                "args": "-device R7FA6M5BH"
+            }
         }
     ]
 }