Enable jpegio almost anywhere we can

jepler · jepler · commit 21de0a734922 · 2023-12-08T14:42:24.000-06:00
diff --git a/ports/atmel-samd/boards/aloriumtech_evo_m51/mpconfigboard.mk b/ports/atmel-samd/boards/aloriumtech_evo_m51/mpconfigboard.mk
@@ -14,3 +14,4 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY_PS2IO = 1
 CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_JPEGIO = 0
diff --git a/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk b/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk
@@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
 LONGINT_IMPL = MPZ
+
+CIRCUITPY_JPEGIO = 0
diff --git a/ports/atmel-samd/boards/datalore_ip_m4/mpconfigboard.mk b/ports/atmel-samd/boards/datalore_ip_m4/mpconfigboard.mk
@@ -10,3 +10,4 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ, W25Q16JVxM"
 LONGINT_IMPL = MPZ
 CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_JPEGIO = 0
diff --git a/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk
@@ -14,6 +14,7 @@ CIRCUITPY__EVE = 1
 CIRCUITPY_CANIO = 1
 CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_GIFIO = 0
+CIRCUITPY_JPEGIO = 0
 
 CIRCUITPY_LTO_PARTITION = one
 
diff --git a/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
@@ -13,6 +13,7 @@ LONGINT_IMPL = MPZ
 CIRCUITPY__EVE = 1
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_JPEGIO = 0
 
 # We don't have room for the fonts for terminalio for certain languages,
 # so turn off terminalio, and if it's off and displayio is on,
diff --git a/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk
@@ -12,5 +12,6 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_GIFIO = 0
+CIRCUITPY_JPEGIO = 0
 
 CIRCUITPY_BITBANG_APA102 = 1
diff --git a/ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk
@@ -12,6 +12,7 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY__EVE = 1
 CIRCUITPY_FLOPPYIO = 0
+CIRCUITPY_JPEGIO = 0
 CIRCUITPY_SYNTHIO = 0
 
 # We don't have room for the fonts for terminalio for certain languages,
diff --git a/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
@@ -12,6 +12,7 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY__EVE = 1
 CIRCUITPY_FLOPPYIO = 0
+CIRCUITPY_JPEGIO = 0
 CIRCUITPY_SYNTHIO = 0
 
 # We don't have room for the fonts for terminalio for certain languages,
diff --git a/ports/atmel-samd/boards/openbook_m4/mpconfigboard.mk b/ports/atmel-samd/boards/openbook_m4/mpconfigboard.mk
@@ -12,3 +12,4 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY_KEYPAD = 1
 CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_JPEGIO = 0
diff --git a/ports/atmel-samd/boards/pybadge/mpconfigboard.mk b/ports/atmel-samd/boards/pybadge/mpconfigboard.mk
@@ -14,6 +14,7 @@ CIRCUITPY_AESIO = 0
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_GIFIO = 0
+CIRCUITPY_JPEGIO = 0
 CIRCUITPY_KEYPAD = 1
 CIRCUITPY_STAGE = 1
 
diff --git a/ports/atmel-samd/boards/pygamer/mpconfigboard.mk b/ports/atmel-samd/boards/pygamer/mpconfigboard.mk
@@ -14,6 +14,7 @@ CIRCUITPY_AESIO = 0
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_GIFIO = 0
+CIRCUITPY_JPEGIO = 0
 CIRCUITPY_KEYPAD = 1
 CIRCUITPY_STAGE = 1
 
diff --git a/ports/atmel-samd/boards/silicognition-m4-shim/mpconfigboard.mk b/ports/atmel-samd/boards/silicognition-m4-shim/mpconfigboard.mk
@@ -9,4 +9,6 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ
+
+CIRCUITPY_JPEGIO = 0
 CIRCUITPY_SYNTHIO = 0
diff --git a/ports/atmel-samd/boards/uartlogger2/mpconfigboard.mk b/ports/atmel-samd/boards/uartlogger2/mpconfigboard.mk
@@ -10,3 +10,4 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
 LONGINT_IMPL = MPZ
 CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_JPEGIO = 0
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
@@ -305,7 +305,7 @@ CFLAGS += -DCIRCUITPY_IPADDRESS=$(CIRCUITPY_IPADDRESS)
 CIRCUITPY_IS31FL3741 ?= 0
 CFLAGS += -DCIRCUITPY_IS31FL3741=$(CIRCUITPY_IS31FL3741)
 
-CIRCUITPY_JPEGIO ?= 0
+CIRCUITPY_JPEGIO ?= $(CIRCUITPY_BITMAPTOOLS)
 CFLAGS += -DCIRCUITPY_JPEGIO=$(CIRCUITPY_JPEGIO)
 
 CIRCUITPY_JSON ?= $(CIRCUITPY_FULL_BUILD)

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,4 @@ LONGINT_IMPL = MPZ`
`14`	`14`
`15`	`15`	`CIRCUITPY_PS2IO = 1`
`16`	`16`	`CIRCUITPY_SYNTHIO = 0`
	`17`	`+CIRCUITPY_JPEGIO = 0`
Original file line number	Diff line number	Diff line change
`@@ -12,3 +12,4 @@ LONGINT_IMPL = MPZ`
`12`	`12`
`13`	`13`	`CIRCUITPY_KEYPAD = 1`
`14`	`14`	`CIRCUITPY_SYNTHIO = 0`
	`15`	`+CIRCUITPY_JPEGIO = 0`