Merge remote-tracking branch 'tinyusb/master' into support-nxp-rw612

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

14 files changed, 16 insertions, 5 deletions

diff --git a/examples/build_system/cmake/cpu/rv32imac-ilp32.cmake b/examples/build_system/cmake/cpu/rv32imac-ilp32.cmake
index 584d90519..8c2538cee 100644
--- a/examples/build_system/cmake/cpu/rv32imac-ilp32.cmake
+++ b/examples/build_system/cmake/cpu/rv32imac-ilp32.cmake
@@ -1,13 +1,13 @@
 if (TOOLCHAIN STREQUAL "gcc")
   set(TOOLCHAIN_COMMON_FLAGS
-    -march=rv32imac_zicsr
+    -march=rv32imac_zicsr_zifencei
     -mabi=ilp32
     )
   set(FREERTOS_PORT GCC_RISC_V CACHE INTERNAL "")
 
 elseif (TOOLCHAIN STREQUAL "clang")
   set(TOOLCHAIN_COMMON_FLAGS
-    -march=rv32imac_zicsr
+    -march=rv32imac_zicsr_zifencei
     -mabi=ilp32
     )
   set(FREERTOS_PORT GCC_RISC_V CACHE INTERNAL "")
diff --git a/examples/build_system/make/cpu/rv32imac-ilp32.mk b/examples/build_system/make/cpu/rv32imac-ilp32.mk
index 19c322ebc..a7b2258d7 100644
--- a/examples/build_system/make/cpu/rv32imac-ilp32.mk
+++ b/examples/build_system/make/cpu/rv32imac-ilp32.mk
@@ -1,11 +1,11 @@
 ifeq ($(TOOLCHAIN),gcc)
   CFLAGS += \
-    -march=rv32imac_zicsr \
+    -march=rv32imac_zicsr_zifencei \
     -mabi=ilp32 \
 
 else ifeq ($(TOOLCHAIN),clang)
   CFLAGS += \
-    -march=rv32imac_zicsr \
+    -march=rv32imac_zicsr_zifencei \
     -mabi=ilp32 \
 
 else ifeq ($(TOOLCHAIN),iar)
diff --git a/examples/build_system/make/toolchain/riscv_gcc.mk b/examples/build_system/make/toolchain/riscv_gcc.mk
index 843aff38c..b5de12a83 100644
--- a/examples/build_system/make/toolchain/riscv_gcc.mk
+++ b/examples/build_system/make/toolchain/riscv_gcc.mk
@@ -1,7 +1,7 @@
 # makefile for arm gcc toolchain
 
 # Can be set by family, default to ARM GCC
-CROSS_COMPILE ?= riscv-none-embed-
+CROSS_COMPILE ?= riscv-none-elf-
 
 CC = $(CROSS_COMPILE)gcc
 CXX = $(CROSS_COMPILE)g++
diff --git a/examples/device/audio_4_channel_mic_freertos/skip.txt b/examples/device/audio_4_channel_mic_freertos/skip.txt
index 65925b32c..4c2780096 100644
--- a/examples/device/audio_4_channel_mic_freertos/skip.txt
+++ b/examples/device/audio_4_channel_mic_freertos/skip.txt
@@ -18,3 +18,4 @@ board:lpcxpresso1347
 family:broadcom_32bit
 family:broadcom_64bit
 family:nuc121_125
+family:hpmicro
diff --git a/examples/device/audio_test_freertos/skip.txt b/examples/device/audio_test_freertos/skip.txt
index c9cdacad7..2da7808e7 100644
--- a/examples/device/audio_test_freertos/skip.txt
+++ b/examples/device/audio_test_freertos/skip.txt
@@ -16,3 +16,4 @@ family:broadcom_32bit
 family:broadcom_64bit
 board:stm32l0538disco
 family:nuc121_125
+family:hpmicro
diff --git a/examples/device/cdc_msc_freertos/skip.txt b/examples/device/cdc_msc_freertos/skip.txt
index 69fc883e6..d90741df7 100644
--- a/examples/device/cdc_msc_freertos/skip.txt
+++ b/examples/device/cdc_msc_freertos/skip.txt
@@ -16,3 +16,4 @@ mcu:STM32L0
 family:broadcom_32bit
 family:broadcom_64bit
 family:nuc121_125
+family:hpmicro
diff --git a/examples/device/hid_composite_freertos/skip.txt b/examples/device/hid_composite_freertos/skip.txt
index 650bf355b..01990a5b4 100644
--- a/examples/device/hid_composite_freertos/skip.txt
+++ b/examples/device/hid_composite_freertos/skip.txt
@@ -14,3 +14,4 @@ mcu:VALENTYUSB_EPTRI
 mcu:RAXXX
 family:broadcom_32bit
 family:broadcom_64bit
+family:hpmicro
diff --git a/examples/device/midi_test_freertos/skip.txt b/examples/device/midi_test_freertos/skip.txt
index 650bf355b..01990a5b4 100644
--- a/examples/device/midi_test_freertos/skip.txt
+++ b/examples/device/midi_test_freertos/skip.txt
@@ -14,3 +14,4 @@ mcu:VALENTYUSB_EPTRI
 mcu:RAXXX
 family:broadcom_32bit
 family:broadcom_64bit
+family:hpmicro
diff --git a/examples/host/bare_api/only.txt b/examples/host/bare_api/only.txt
index 919e3d8d3..f07d63f9d 100644
--- a/examples/host/bare_api/only.txt
+++ b/examples/host/bare_api/only.txt
@@ -1,3 +1,4 @@
+family:hpmicro
 family:samd21
 family:samd5x_e5x
 mcu:CH32V20X
diff --git a/examples/host/cdc_msc_hid/only.txt b/examples/host/cdc_msc_hid/only.txt
index 919e3d8d3..f07d63f9d 100644
--- a/examples/host/cdc_msc_hid/only.txt
+++ b/examples/host/cdc_msc_hid/only.txt
@@ -1,3 +1,4 @@
+family:hpmicro
 family:samd21
 family:samd5x_e5x
 mcu:CH32V20X
diff --git a/examples/host/device_info/only.txt b/examples/host/device_info/only.txt
index 99574f7fc..714c1078a 100644
--- a/examples/host/device_info/only.txt
+++ b/examples/host/device_info/only.txt
@@ -1,4 +1,5 @@
 family:espressif
+family:hpmicro
 family:samd21
 family:samd5x_e5x
 mcu:CH32V20X
diff --git a/examples/host/hid_controller/only.txt b/examples/host/hid_controller/only.txt
index 027e17eca..8ec2f5cfe 100644
--- a/examples/host/hid_controller/only.txt
+++ b/examples/host/hid_controller/only.txt
@@ -1,3 +1,4 @@
+family:hpmicro
 family:samd21
 family:samd5x_e5x
 mcu:CH32V20X
diff --git a/examples/host/midi_rx/only.txt b/examples/host/midi_rx/only.txt
index ad419cc7e..9d647a340 100644
--- a/examples/host/midi_rx/only.txt
+++ b/examples/host/midi_rx/only.txt
@@ -1,3 +1,4 @@
+family:hpmicro
 family:samd21
 family:samd5x_e5x
 mcu:CH32V20X
diff --git a/examples/host/msc_file_explorer/only.txt b/examples/host/msc_file_explorer/only.txt
index 919e3d8d3..f07d63f9d 100644
--- a/examples/host/msc_file_explorer/only.txt
+++ b/examples/host/msc_file_explorer/only.txt
@@ -1,3 +1,4 @@
+family:hpmicro
 family:samd21
 family:samd5x_e5x
 mcu:CH32V20X