Merge branch 'master' into fork/HiFiPhile/rt1170

This commit is contained in:
hathach 2024-12-11 16:20:02 +07:00
commit 91799b0df5
No known key found for this signature in database
GPG Key ID: 26FAB84F615C3C52
2 changed files with 6 additions and 2 deletions

View File

@ -20,7 +20,6 @@ jobs:
BUILDSYSTEM_TOOLCHAIN=( BUILDSYSTEM_TOOLCHAIN=(
"cmake arm-clang" "cmake arm-clang"
"cmake arm-iar"
"make aarch64-gcc" "make aarch64-gcc"
"make arm-gcc" "make arm-gcc"
"make msp430-gcc" "make msp430-gcc"
@ -29,6 +28,11 @@ jobs:
"cmake esp-idf" "cmake esp-idf"
) )
# only build IAR if not forked PR, since IAR token is not shared
if [ -z $CIRCLE_PR_USERNAME ]; then
BUILDSYSTEM_TOOLCHAIN+=("cmake arm-iar")
fi
RESOURCE_LARGE='["nrf", "imxrt", "stm32f4", "stm32h7"]' RESOURCE_LARGE='["nrf", "imxrt", "stm32f4", "stm32h7"]'
gen_build_entry() { gen_build_entry() {

View File

@ -44,7 +44,7 @@
#if TU_CHECK_MCU(OPT_MCU_GD32VF103) #if TU_CHECK_MCU(OPT_MCU_GD32VF103)
#define DWC2_EP_COUNT(_dwc2) DWC2_EP_MAX #define DWC2_EP_COUNT(_dwc2) DWC2_EP_MAX
#else #else
#define DWC2_EP_COUNT(_dwc2) ((_dwc2)->ghwcfg2_bm.num_dev_ep) #define DWC2_EP_COUNT(_dwc2) ((_dwc2)->ghwcfg2_bm.num_dev_ep + 1)
#endif #endif
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+