djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6492 from EmergReanimator/disabled_fs_support

Browse Source 
Fixed build issue when DISABLE_FILESYSTEM is set.
This commit is contained in:
Scott Shawcroft 2022-06-22 09:50:28 -07:00 committed by GitHub
commit f9bbd0559a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
supervisor/supervisor.mk
View File

@ -18,12 +18,6 @@ SRC_SUPERVISOR = \
supervisor/shared/translate/translate.c \ supervisor/shared/translate/translate.c \
supervisor/shared/workflow.c supervisor/shared/workflow.c
ifeq ($(DISABLE_FILESYSTEM),1)
SRC_SUPERVISOR += supervisor/stub/filesystem.c
else
SRC_SUPERVISOR += supervisor/shared/filesystem.c
endif
NO_USB ?= $(wildcard supervisor/usb.c) NO_USB ?= $(wildcard supervisor/usb.c)
INTERNAL_FLASH_FILESYSTEM ?= 0 INTERNAL_FLASH_FILESYSTEM ?= 0
@ -35,6 +29,15 @@ CFLAGS += -DQSPI_FLASH_FILESYSTEM=$(QSPI_FLASH_FILESYSTEM)
SPI_FLASH_FILESYSTEM ?= 0 SPI_FLASH_FILESYSTEM ?= 0
CFLAGS += -DSPI_FLASH_FILESYSTEM=$(SPI_FLASH_FILESYSTEM) CFLAGS += -DSPI_FLASH_FILESYSTEM=$(SPI_FLASH_FILESYSTEM)
DISABLE_FILESYSTEM ?= 0
CFLAGS += -DDISABLE_FILESYSTEM=$(DISABLE_FILESYSTEM)
ifeq ($(DISABLE_FILESYSTEM),1)
SRC_SUPERVISOR += supervisor/stub/filesystem.c
else
SRC_SUPERVISOR += supervisor/shared/filesystem.c
endif
ifeq ($(CIRCUITPY_BLEIO),1) ifeq ($(CIRCUITPY_BLEIO),1)
SRC_SUPERVISOR += supervisor/shared/bluetooth/bluetooth.c SRC_SUPERVISOR += supervisor/shared/bluetooth/bluetooth.c
CIRCUITPY_CREATOR_ID ?= $(USB_VID) CIRCUITPY_CREATOR_ID ?= $(USB_VID)