summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2024-08-22 18:51:32 +0700
committerhathach <[email protected]>2024-08-22 18:51:32 +0700
commitccf886ca80ed74d985483fdb90e67703ebeb7dad (patch)
tree9a5b72c803bc3350fac489b84e0e5ad5b445106b
parent0db42aac71a6fb2a821a034ee29d2587638d309a (diff)
add pio-usb host test to hil. fix build as well
-rw-r--r--hw/bsp/rp2040/family.c4
-rw-r--r--test/hil/rpi.json11
2 files changed, 7 insertions, 8 deletions
diff --git a/hw/bsp/rp2040/family.c b/hw/bsp/rp2040/family.c
index 250989ce9..64a3a0af6 100644
--- a/hw/bsp/rp2040/family.c
+++ b/hw/bsp/rp2040/family.c
@@ -42,7 +42,7 @@
static uart_inst_t *uart_inst;
#endif
-#if CFG_TUH_RPI_PIO_USB || CFG_TUD_RPI_PIO_USB
+#if (CFG_TUH_ENABLED && CFG_TUH_RPI_PIO_USB) || (CFG_TUD_ENABLED && CFG_TUD_RPI_PIO_USB)
#include "pio_usb.h"
#endif
@@ -126,7 +126,7 @@ void stdio_rtt_init(void) {
void board_init(void)
{
-#if CFG_TUH_RPI_PIO_USB || CFG_TUD_RPI_PIO_USB
+#if (CFG_TUH_ENABLED && CFG_TUH_RPI_PIO_USB) || (CFG_TUD_ENABLED && CFG_TUD_RPI_PIO_USB)
// Set the system clock to a multiple of 120mhz for bitbanging USB with pico-usb
set_sys_clock_khz(120000, true);
diff --git a/test/hil/rpi.json b/test/hil/rpi.json
index 3f07a8f42..b75c1339b 100644
--- a/test/hil/rpi.json
+++ b/test/hil/rpi.json
@@ -14,11 +14,7 @@
"flasher_sn": "E6633861A3978538",
"flasher_args": "-f interface/cmsis-dap.cfg -f target/atsame5x.cfg",
"tests": {
- "dual_attached": [
- {
- "vid_pid": "1a86_55d4", "serial": "52D2002130"
- }
- ]
+ "dual_attached": [{"vid_pid": "1a86_55d4", "serial": "52D2002130"}]
}
},
{
@@ -51,7 +47,10 @@
"uid": "E6614C311B764A37",
"flasher": "openocd",
"flasher_sn": "E6614103E72C1D2F",
- "flasher_args": "-f interface/cmsis-dap.cfg -f target/rp2040.cfg -c \"adapter speed 5000\""
+ "flasher_args": "-f interface/cmsis-dap.cfg -f target/rp2040.cfg -c \"adapter speed 5000\"",
+ "tests": {
+ "dual_attached": [{"vid_pid": "1a86_55d4", "serial": "52D2002470"}]
+ }
},
{
"name": "stm32f072disco",