Merge branch 'master' into sync/upstream

espressif · Dec 11, 2024 · 83a7145 · 83a7145
2 parents b755233 + 7c7b30f
commit 83a7145
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -20,7 +20,6 @@ jobs:
 
             BUILDSYSTEM_TOOLCHAIN=(
               "cmake arm-clang"
-              "cmake arm-iar"
               "make aarch64-gcc"
               "make arm-gcc"
               "make msp430-gcc"
@@ -29,6 +28,11 @@ jobs:
               "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"]'
 
             gen_build_entry() {

diff --git a/src/portable/synopsys/dwc2/dcd_dwc2.c b/src/portable/synopsys/dwc2/dcd_dwc2.c
@@ -44,7 +44,7 @@
 #if TU_CHECK_MCU(OPT_MCU_GD32VF103)
   #define DWC2_EP_COUNT(_dwc2)   DWC2_EP_MAX
 #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
 
 //--------------------------------------------------------------------+