Merge pull request #4239 from dhalbert/samd21-msc-one-endpoint-pair

SAMD21: one endpoint pair for MSC now instead of two
adafruit · Feb 22, 2021 · 2262af0 · 2262af0
2 parents 244b7e2 + 8470f0f
commit 2262af0
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
@@ -48,10 +48,8 @@ CIRCUITPY_SDCARDIO ?= 0
 # Not enough RAM for framebuffers
 CIRCUITPY_FRAMEBUFFERIO ?= 0
 
-# SAMD21 needs separate endpoint pairs for MSC BULK IN and BULK OUT, otherwise it's erratic.
-# Because of that, there aren't enough endpoints for a secondary CDC serial connection.
-USB_MSC_EP_NUM_OUT = 1
-CIRCUITPY_USB_CDC = 0
+# Not enough room in 192kB or 256kB builds for secondary CDC.
+CIRCUITPY_USB_CDC ?= 0
 
 CIRCUITPY_ULAB = 0