From 8470f0fdb7ce37bc476b624c4172c9ea46231388 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Sun, 21 Feb 2021 12:37:59 -0500
Subject: [PATCH] SAMD21: one endpoint pair for MSC now instead of two

---
 ports/atmel-samd/mpconfigport.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
index e47acfb3674da..c77bf83f1e551 100644
--- 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