diff options
| author | hathach <[email protected]> | 2025-07-08 10:09:24 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2025-07-08 10:09:24 +0700 |
| commit | a56f55c10bea2ce0d38de6a04edae41e6c814b9f (patch) | |
| tree | e9a1791ce6ba17a2ac9a411f5c897f0911d28ff1 /test | |
| parent | 545690c83435fc9e972a65a4e46539c88f2a2853 (diff) | |
| parent | ea64300a9ad57fbdcafbed189b3d358bf9b6912e (diff) | |
Merge remote-tracking branch 'origin/master' into xfer_isr
# Conflicts:
# examples/device/audio_4_channel_mic_freertos/src/main.c
# examples/device/audio_test_freertos/src/main.c
# src/class/audio/audio_device.c
Diffstat (limited to 'test')
| -rw-r--r-- | test/fuzz/device/net/Makefile | 2 | ||||
| -rw-r--r-- | test/fuzz/make.mk | 6 | ||||
| -rw-r--r-- | test/fuzz/rules.mk | 2 | ||||
| -rw-r--r-- | test/hil/tinyusb.json | 24 |
4 files changed, 13 insertions, 21 deletions
diff --git a/test/fuzz/device/net/Makefile b/test/fuzz/device/net/Makefile index 4e99604ad..2161ad3f1 100644 --- a/test/fuzz/device/net/Makefile +++ b/test/fuzz/device/net/Makefile @@ -1,5 +1,3 @@ -DEPS_SUBMODULES += lib/lwip - include ../../make.mk # suppress warning caused by lwip diff --git a/test/fuzz/make.mk b/test/fuzz/make.mk index b7b6d6a75..e9aa80bf1 100644 --- a/test/fuzz/make.mk +++ b/test/fuzz/make.mk @@ -124,11 +124,5 @@ endif # Log level is mapped to TUSB DEBUG option ifneq ($(LOG),) - CMAKE_DEFSYM += -DLOG=$(LOG) CFLAGS += -DCFG_TUSB_DEBUG=$(LOG) endif - -# Logger: default is uart, can be set to rtt or swo -ifneq ($(LOGGER),) - CMAKE_DEFSYM += -DLOGGER=$(LOGGER) -endif diff --git a/test/fuzz/rules.mk b/test/fuzz/rules.mk index ee91c706d..562969663 100644 --- a/test/fuzz/rules.mk +++ b/test/fuzz/rules.mk @@ -142,7 +142,7 @@ endif # get depenecies .PHONY: get-deps get-deps: - $(PYTHON) $(TOP)/tools/get_deps.py $(DEPS_SUBMODULES) + $(PYTHON) $(TOP)/tools/get_deps.py $(FAMILY) size: $(BUILD)/$(PROJECT) -@echo '' diff --git a/test/hil/tinyusb.json b/test/hil/tinyusb.json index 11b118cea..8a835e4c0 100644 --- a/test/hil/tinyusb.json +++ b/test/hil/tinyusb.json @@ -47,6 +47,18 @@ } }, { + "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": "metro_m4_express", "uid": "9995AD485337433231202020FF100A34", "tests": { @@ -200,18 +212,6 @@ ], "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" : { |