From 85ae2765c50a55cbeee8efca8f2794ae2d094571 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Wed, 1 Nov 2023 21:25:04 -0400 Subject: [PATCH] ensure FRAMEBUFFERIO for DOTCLOCKFRAMEBUFFER --- ports/espressif/mpconfigport.mk | 1 - py/circuitpy_mpconfig.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk index a9761222a8..9154f7a798 100644 --- a/ports/espressif/mpconfigport.mk +++ b/ports/espressif/mpconfigport.mk @@ -29,7 +29,6 @@ CIRCUITPY_DUALBANK ?= 1 CIRCUITPY_ESPCAMERA ?= $(CIRCUITPY_FULL_BUILD) CIRCUITPY_ESPIDF ?= 1 CIRCUITPY_ESPULP ?= 1 -CIRCUITPY_FRAMEBUFFERIO ?= $(CIRCUITPY_FULL_BUILD) CIRCUITPY_FREQUENCYIO ?= 1 CIRCUITPY_HASHLIB ?= 1 CIRCUITPY_I2CTARGET ?= 1 diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index d8b05423d0..0f38e3af98 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -229,7 +229,7 @@ CFLAGS += -DCIRCUITPY_DOTCLOCKFRAMEBUFFER_USES_SUPERVISOR_ALLOCATION=$(CIRCUITPY # bitmaptools and framebufferio rely on displayio CIRCUITPY_BITMAPTOOLS ?= $(call enable-if-all,$(CIRCUITPY_FULL_BUILD) $(CIRCUITPY_DISPLAYIO)) -CIRCUITPY_FRAMEBUFFERIO ?= $(call enable-if-all,$(CIRCUITPY_FULL_BUILD) $(CIRCUITPY_DISPLAYIO)) +CIRCUITPY_FRAMEBUFFERIO ?= $(call enable-if-any,$(CIRCUITPY_DOTCLOCKFRAMEBUFFER) $(call enable-if-all,$(CIRCUITPY_FULL_BUILD) $(CIRCUITPY_DISPLAYIO))) CIRCUITPY_VECTORIO ?= $(CIRCUITPY_DISPLAYIO) CFLAGS += -DCIRCUITPY_BITMAPTOOLS=$(CIRCUITPY_BITMAPTOOLS) CFLAGS += -DCIRCUITPY_FRAMEBUFFERIO=$(CIRCUITPY_FRAMEBUFFERIO)