From 53f4eeaf8b2a99da2562faa9828f3e80c4871800 Mon Sep 17 00:00:00 2001 From: EmergReanimator Date: Thu, 16 Jun 2022 19:27:08 +0200 Subject: [PATCH 1/2] Fixed build issue when DISABLE_FILESYSTEM is set. --- supervisor/supervisor.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index 2fa9ff1f0e..7fa1061bc5 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -35,6 +35,9 @@ CFLAGS += -DQSPI_FLASH_FILESYSTEM=$(QSPI_FLASH_FILESYSTEM) SPI_FLASH_FILESYSTEM ?= 0 CFLAGS += -DSPI_FLASH_FILESYSTEM=$(SPI_FLASH_FILESYSTEM) +DISABLE_FILESYSTEM ?= 0 +CFLAGS += -DDISABLE_FILESYSTEM=$(DISABLE_FILESYSTEM) + ifeq ($(CIRCUITPY_BLEIO),1) SRC_SUPERVISOR += supervisor/shared/bluetooth/bluetooth.c CIRCUITPY_CREATOR_ID ?= $(USB_VID) From 3c588708166a218116620b77349c2af5a4b04913 Mon Sep 17 00:00:00 2001 From: EmergReanimator Date: Thu, 16 Jun 2022 21:43:07 +0200 Subject: [PATCH 2/2] Fixes from PR feedback: Test DISABLE_FILESYSTEM after it set. https://github.com/adafruit/circuitpython/pull/6492/files/53f4eeaf8b2a99da2562faa9828f3e80c4871800#r899419987 --- supervisor/supervisor.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk index 7fa1061bc5..fb946f468c 100644 --- a/supervisor/supervisor.mk +++ b/supervisor/supervisor.mk @@ -18,12 +18,6 @@ SRC_SUPERVISOR = \ supervisor/shared/translate/translate.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) INTERNAL_FLASH_FILESYSTEM ?= 0 @@ -38,6 +32,12 @@ 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) SRC_SUPERVISOR += supervisor/shared/bluetooth/bluetooth.c CIRCUITPY_CREATOR_ID ?= $(USB_VID)