Check that we can compute the value of USB_DEVICES

ports/atmel-samd/boards/8086_commander/mpconfigboard.mk

@@ -14,6 +14,7 @@ EXTERNAL_FLASH_DEVICES = "W25Q128JV_SQ"
 
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
+CIRCUITPY_USB_MIDI = 0
 
 SUPEROPT_GC = 0
 

ports/atmel-samd/boards/pewpew10/mpconfigboard.mk

@@ -24,3 +24,5 @@ SUPEROPT_GC = 0
 FROZEN_MPY_DIRS += $(TOP)/frozen/pew-pewpew-standalone-10.x
 
 CFLAGS_BOARD = --param max-inline-insns-auto=15
+
+USB_DEVICES="CDC,MSC,HID"

ports/atmel-samd/boards/ugame10/mpconfigboard.mk

@@ -39,3 +39,5 @@ CFLAGS_INLINE_LIMIT = 45
 else
 CFLAGS_INLINE_LIMIT = 70
 endif
+
+USB_DEVICES="CDC,MSC"

ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk

@@ -31,4 +31,5 @@ CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_PS2IO = 0
 CIRCUITPY_USB_HID = 0
+CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_RTC = 0

ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk

@@ -28,3 +28,5 @@ CIRCUITPY_COUNTIO=0
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
+
+USB_DEVICES="CDC,MSC,HID"

ports/cxd56/mpconfigport.mk

@@ -8,15 +8,17 @@ USB_CDC_EP_NUM_DATA_IN = 1
 USB_MSC_EP_NUM_OUT = 5
 USB_MSC_EP_NUM_IN = 4
 
-CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_I2CSLAVE = 0
-CIRCUITPY_ROTARYIO = 0
-CIRCUITPY_TOUCHIO = 0
+CIRCUITPY_AUDIOIO = 0
+CIRCUITPY_COUNTIO = 0
+CIRCUITPY_DISPLAYIO = 0
+CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_GAMEPAD = 0
+CIRCUITPY_I2CSLAVE = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_NVM = 0
-CIRCUITPY_DISPLAYIO = 0
-CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_COUNTIO = 0
+CIRCUITPY_ROTARYIO = 0
+CIRCUITPY_TOUCHIO = 0
+CIRCUITPY_USB_HID = 0
+CIRCUITPY_USB_MIDI = 0
 INTERNAL_LIBM = 1

ports/esp32s2/mpconfigport.mk

@@ -30,8 +30,8 @@ CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
 CIRCUITPY_TOUCHIO = 0
 
-# Enable USB support
+# Enable USB HID support
 CIRCUITPY_USB_HID = 1
-CIRCUITPY_USB_MIDI = 1
+CIRCUITPY_USB_MIDI = 0
 
 CIRCUITPY_MODULE ?= none

ports/mimxrt10xx/mpconfigport.mk

@@ -27,4 +27,5 @@ CIRCUITPY_I2CSLAVE = 0
 CIRCUITPY_NVM = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_COUNTIO = 0
+CIRCUITPY_USB_MIDI = 0
 LONGINT_IMPL = MPZ

ports/stm/boards/stm32f412zg_discovery/mpconfigboard.mk

@@ -17,3 +17,5 @@ MCU_PACKAGE = LQFP144
 
 LD_COMMON = boards/common_default.ld
 LD_FILE = boards/STM32F412_fs.ld
+
+CIRCUITPY_USB_HID = 1

ports/stm/mpconfigport.mk

@@ -1,53 +1,56 @@
-MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
-LONGINT_IMPL = MPZ
-INTERNAL_LIBM = 1
-USB_SERIAL_NUMBER_LENGTH = 24
+MPY_TOOL_LONGINT_IMPL ?= -mlongint-impl=mpz
+LONGINT_IMPL ?= MPZ
+INTERNAL_LIBM ?= 1
+USB_SERIAL_NUMBER_LENGTH ?= 24
 
 ifeq ($(MCU_VARIANT),STM32F405xx)
-	CIRCUITPY_FRAMEBUFFERIO = 1
-	CIRCUITPY_RGBMATRIX = 1
+	CIRCUITPY_FRAMEBUFFERIO ?= 1
+	CIRCUITPY_RGBMATRIX ?= 1
 endif
 
 ifeq ($(MCU_SERIES),F4)
 	# Not yet implemented common-hal modules:
-	CIRCUITPY_AUDIOBUSIO = 0
-	CIRCUITPY_AUDIOIO = 0
-	CIRCUITPY_ROTARYIO = 0
-	CIRCUITPY_COUNTIO = 0
-	CIRCUITPY_RTC = 0
-	CIRCUITPY_FREQUENCYIO = 0
-	CIRCUITPY_I2CSLAVE = 0
-	# Can be overridden on board level
-	ifndef CIRCUITPY_NVM
-		CIRCUITPY_NVM = 0
-	endif
+	CIRCUITPY_AUDIOBUSIO ?= 0
+	CIRCUITPY_AUDIOIO ?= 0
+	CIRCUITPY_COUNTIO ?= 0
+	CIRCUITPY_FREQUENCYIO ?= 0
+	CIRCUITPY_I2CSLAVE ?= 0
+	CIRCUITPY_NVM ?= 0
+	CIRCUITPY_ROTARYIO ?= 0
+	CIRCUITPY_RTC ?= 0
+	CIRCUITPY_USB_MIDI ?= 0
+	CIRCUITPY_USB_HID ?= 0
 endif
 
 ifeq ($(MCU_SERIES),H7)
 	# Not yet implemented common-hal modules:
-	CIRCUITPY_ANALOGIO = 0
-	CIRCUITPY_NEOPIXEL_WRITE = 0
-	CIRCUITPY_PULSEIO = 0
-	CIRCUITPY_NVM = 0
-	CIRCUITPY_AUDIOBUSIO = 0
-	CIRCUITPY_AUDIOIO = 0
-	CIRCUITPY_COUNTIO = 0
-	CIRCUITPY_ROTARYIO = 0
-	CIRCUITPY_RTC = 0
-	CIRCUITPY_FREQUENCYIO = 0
-	CIRCUITPY_I2CSLAVE = 0
+	CIRCUITPY_ANALOGIO ?= 0
+	CIRCUITPY_AUDIOBUSIO ?= 0
+	CIRCUITPY_AUDIOIO ?= 0
+	CIRCUITPY_COUNTIO ?= 0
+	CIRCUITPY_FREQUENCYIO ?= 0
+	CIRCUITPY_I2CSLAVE ?= 0
+	CIRCUITPY_NEOPIXEL_WRITE ?= 0
+	CIRCUITPY_NVM ?= 0
+	CIRCUITPY_PULSEIO ?= 0
+	CIRCUITPY_ROTARYIO ?= 0
+	CIRCUITPY_RTC ?= 0
+	CIRCUITPY_USB_HID ?= 0
+	CIRCUITPY_USB_MIDI ?= 0
 endif
 
 ifeq ($(MCU_SERIES),F7)
 	# Not yet implemented common-hal modules:
-	CIRCUITPY_ANALOGIO = 0
-	CIRCUITPY_NEOPIXEL_WRITE = 0
-	CIRCUITPY_NVM = 0
-	CIRCUITPY_AUDIOBUSIO = 0
-	CIRCUITPY_AUDIOIO = 0
-	CIRCUITPY_ROTARYIO = 0
-	CIRCUITPY_COUNTIO = 0
-	CIRCUITPY_RTC = 0
-	CIRCUITPY_FREQUENCYIO = 0
-	CIRCUITPY_I2CSLAVE = 0
+	CIRCUITPY_ANALOGIO ?= 0
+	CIRCUITPY_AUDIOBUSIO ?= 0
+	CIRCUITPY_AUDIOIO ?= 0
+	CIRCUITPY_COUNTIO ?= 0
+	CIRCUITPY_FREQUENCYIO ?= 0
+	CIRCUITPY_I2CSLAVE ?= 0
+	CIRCUITPY_NEOPIXEL_WRITE ?= 0
+	CIRCUITPY_NVM ?= 0
+	CIRCUITPY_ROTARYIO ?= 0
+	CIRCUITPY_RTC ?= 0
+	CIRCUITPY_USB_HID ?= 0
+	CIRCUITPY_USB_MIDI ?= 0
 endif

supervisor/supervisor.mk

@@ -119,10 +119,25 @@ ifndef USB_DEVICES
 USB_DEVICES = "CDC,MSC,AUDIO,HID"
 endif
 
+USB_DEVICES_COMPUTED := CDC,MSC
+ifeq ($(CIRCUITPY_USB_MIDI),1)
+USB_DEVICES_COMPUTED := $(USB_DEVICES_COMPUTED),AUDIO
+endif
+ifeq ($(CIRCUITPY_USB_HID),1)
+USB_DEVICES_COMPUTED := $(USB_DEVICES_COMPUTED),HID
+endif
+USB_DEVICES_COMPUTED := "$(USB_DEVICES_COMPUTED)"
+
 ifndef USB_HID_DEVICES
 USB_HID_DEVICES = "KEYBOARD,MOUSE,CONSUMER,GAMEPAD"
 endif
 
+# During a transitional period, check that the COMPUTED values match.
+# Once they do all match, we can remove all the hard-coded ones.
+ifneq ($(USB_DEVICES),$(USB_DEVICES_COMPUTED))
+$(error Computed USB devices '$(USB_DEVICES_COMPUTED)' different than hard-coded USB devices '$(USB_DEVICES)')
+endif
+
 ifndef USB_MSC_MAX_PACKET_SIZE
 USB_MSC_MAX_PACKET_SIZE = 64
 endif