summaryrefslogtreecommitdiff
path: root/supervisor
diff options
context:
space:
mode:
authorJeff Epler <jeff@adafruit.com>2020-06-24 09:44:45 -0500
committerGitHub <noreply@github.com>2020-06-24 09:44:45 -0500
commitbf460ddf25ead020c6aeeb9ac4393ddf17daf7bb (patch)
treeb7a8d45cd655d46990141f4f80d9a5c42e51f8d1 /supervisor
parentf232aef7865c4e094f060f9766418f60fb9f86ea (diff)
supervisor.mk: Conditionally assign USB_DEVICES
This restores the ability to remove CDC and/or MSC, at the price of giving up the new automatic check that USB_DEVICES is correct. Since devices have to have CDC and MSC to be "CircuitPython", this is not a facility that is going to be used by any in-tree drivers.
Diffstat (limited to 'supervisor')
-rw-r--r--supervisor/supervisor.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index 0717785e7..21803ae0a 100644
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -122,7 +122,7 @@ endif
ifeq ($(CIRCUITPY_USB_HID),1)
USB_DEVICES_COMPUTED := $(USB_DEVICES_COMPUTED),HID
endif
-USB_DEVICES := "$(USB_DEVICES_COMPUTED)"
+USB_DEVICES ?= "$(USB_DEVICES_COMPUTED)"
ifndef USB_HID_DEVICES
USB_HID_DEVICES = "KEYBOARD,MOUSE,CONSUMER,GAMEPAD"