diff options
| author | Dan Halbert <halbert@halwitz.org> | 2019-09-04 21:56:13 -0400 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2019-09-04 21:56:13 -0400 |
| commit | f3af2a6fb7a9b67dc81ab471f30e212453af4627 (patch) | |
| tree | 7656cc49325cb37f878fcdd77faf142b76b739dd /supervisor/supervisor.mk | |
| parent | 195de97c67c4d1daa6ec8659bbdf30b8e7f4fff6 (diff) | |
| parent | 28e17feb93a097bbbf8fa033be088ba009793280 (diff) | |
Merge remote-tracking branch 'adafruit/master' into choose-usb-devices-xac
Diffstat (limited to 'supervisor/supervisor.mk')
| -rw-r--r-- | supervisor/supervisor.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index e758ea216..ee47be4b0 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -13,7 +13,7 @@ SRC_SUPERVISOR = \ supervisor/shared/translate.c ifndef $(NO_USB) -NO_USB = $(wildcard supervisor/usb.c) + NO_USB = $(wildcard supervisor/usb.c) endif ifneq ($(INTERNAL_FLASH_FILESYSTEM),) @@ -44,7 +44,11 @@ ifdef EXTERNAL_FLASH_DEVICES SRC_SUPERVISOR += supervisor/qspi_flash.c supervisor/shared/external_flash/qspi_flash.c endif else - SRC_SUPERVISOR += supervisor/internal_flash.c + ifeq ($(DISABLE_FILESYSTEM),1) + SRC_SUPERVISOR += supervisor/stub/internal_flash.c + else + SRC_SUPERVISOR += supervisor/internal_flash.c + endif endif ifeq ($(USB),FALSE) @@ -78,6 +82,7 @@ else shared-module/usb_midi/PortIn.c \ shared-module/usb_midi/PortOut.c \ $(BUILD)/autogen_usb_descriptor.c + CFLAGS += -DUSB_AVAILABLE endif |