diff options
| author | Jeff Epler <jepler@unpythonic.net> | 2020-06-15 19:12:04 -0500 |
|---|---|---|
| committer | Jeff Epler <jepler@gmail.com> | 2020-06-23 12:59:01 -0500 |
| commit | f232aef7865c4e094f060f9766418f60fb9f86ea (patch) | |
| tree | a7f561317873ef0b29a07125ca7f797726533465 /supervisor/supervisor.mk | |
| parent | 93d3629da279ae080cdfa616d54451150b373697 (diff) | |
supervisor.mk: Compute USB_DEVICES; remove from boards and ports
Since Actions passed on the previous commit, where this computed value
was checked against the specified value (if any), this is no net change,
except that we no longer need to specify it for particular boards or
ports.
Diffstat (limited to 'supervisor/supervisor.mk')
| -rw-r--r-- | supervisor/supervisor.mk | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index 7eb7e2630..0717785e7 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -115,10 +115,6 @@ ifndef USB_INTERFACE_NAME USB_INTERFACE_NAME = "CircuitPython" endif -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 @@ -126,18 +122,12 @@ endif ifeq ($(CIRCUITPY_USB_HID),1) USB_DEVICES_COMPUTED := $(USB_DEVICES_COMPUTED),HID endif -USB_DEVICES_COMPUTED := "$(USB_DEVICES_COMPUTED)" +USB_DEVICES := "$(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 |