Merge pull request #9617 from tannewt/picodvi_on_2350

tannewt · web-flow · commit fe7e8720b622 · 2024-09-12T15:00:58.000-07:00
Refactor RP2350 unique module build settings
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2350/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_feather_rp2350/mpconfigboard.mk
@@ -8,8 +8,3 @@ CHIP_PACKAGE = A
 CHIP_FAMILY = rp2
 
 EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ"
-
-CIRCUITPY_ALARM = 0
-
-CIRCUITPY_FLOPPYIO = 0
-CIRCUITPY_PICODVI = 1
diff --git a/ports/raspberrypi/boards/adafruit_metro_rp2350/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_metro_rp2350/mpconfigboard.mk
@@ -8,5 +8,3 @@ CHIP_PACKAGE = A
 CHIP_FAMILY = rp2
 
 EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"
-
-CIRCUITPY_ALARM = 0
diff --git a/ports/raspberrypi/boards/cytron_iriv_io_controller/mpconfigboard.mk b/ports/raspberrypi/boards/cytron_iriv_io_controller/mpconfigboard.mk
@@ -10,7 +10,6 @@ CHIP_FAMILY = rp2
 EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
 
 CIRCUITPY__EVE = 1
-CIRCUITPY_ALARM = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SimpleIO
diff --git a/ports/raspberrypi/boards/cytron_motion_2350_pro/mpconfigboard.mk b/ports/raspberrypi/boards/cytron_motion_2350_pro/mpconfigboard.mk
@@ -10,7 +10,6 @@ CHIP_FAMILY = rp2
 EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
 
 CIRCUITPY__EVE = 1
-CIRCUITPY_ALARM = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/raspberrypi/boards/pimoroni_pga2350/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_pga2350/mpconfigboard.mk
@@ -10,4 +10,3 @@ CHIP_FAMILY = rp2
 EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"
 
 CIRCUITPY__EVE = 1
-CIRCUITPY_ALARM = 0
diff --git a/ports/raspberrypi/boards/pimoroni_pico_plus2/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_pico_plus2/mpconfigboard.mk
@@ -10,4 +10,3 @@ CHIP_FAMILY = rp2
 EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"
 
 CIRCUITPY__EVE = 1
-CIRCUITPY_ALARM = 0
diff --git a/ports/raspberrypi/boards/pimoroni_plasma2350/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_plasma2350/mpconfigboard.mk
@@ -10,4 +10,3 @@ CHIP_FAMILY = rp2
 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
 
 CIRCUITPY__EVE = 1
-CIRCUITPY_ALARM = 0
diff --git a/ports/raspberrypi/boards/pimoroni_tiny2350/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_tiny2350/mpconfigboard.mk
@@ -10,4 +10,3 @@ CHIP_FAMILY = rp2
 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
 
 CIRCUITPY__EVE = 1
-CIRCUITPY_ALARM = 0
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico2/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico2/mpconfigboard.mk
@@ -10,4 +10,3 @@ CHIP_FAMILY = rp2
 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
 
 CIRCUITPY__EVE = 1
-CIRCUITPY_ALARM = 0
diff --git a/ports/raspberrypi/boards/seeeduino_xiao_rp2350/mpconfigboard.mk b/ports/raspberrypi/boards/seeeduino_xiao_rp2350/mpconfigboard.mk
@@ -8,5 +8,3 @@ CHIP_PACKAGE = A
 CHIP_FAMILY = rp2
 
 EXTERNAL_FLASH_DEVICES = "P25Q16H"
-
-CIRCUITPY_ALARM = 0
diff --git a/ports/raspberrypi/boards/solderparty_rp2350_stamp/mpconfigboard.mk b/ports/raspberrypi/boards/solderparty_rp2350_stamp/mpconfigboard.mk
@@ -10,8 +10,6 @@ CHIP_FAMILY = rp2
 EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"
 
 CIRCUITPY__EVE = 1
-CIRCUITPY_ALARM = 0
-CIRCUITPY_PICODVI = 1
 
 FROZEN_MPY_DIRS += $(TOP)/ports/raspberrypi/boards/solderparty_rp2040_stamp
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
diff --git a/ports/raspberrypi/boards/solderparty_rp2350_stamp_xl/mpconfigboard.mk b/ports/raspberrypi/boards/solderparty_rp2350_stamp_xl/mpconfigboard.mk
@@ -10,8 +10,6 @@ CHIP_FAMILY = rp2
 EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"
 
 CIRCUITPY__EVE = 1
-CIRCUITPY_ALARM = 0
-CIRCUITPY_PICODVI = 1
 
 FROZEN_MPY_DIRS += $(TOP)/ports/raspberrypi/boards/solderparty_rp2040_stamp
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
diff --git a/ports/raspberrypi/boards/sparkfun_pro_micro_rp2350/mpconfigboard.mk b/ports/raspberrypi/boards/sparkfun_pro_micro_rp2350/mpconfigboard.mk
@@ -8,10 +8,3 @@ CHIP_PACKAGE = A
 CHIP_FAMILY = rp2
 
 EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"
-
-CIRCUITPY_ALARM = 0
-CIRCUITPY_RGBMATRIX = 0
-CIRCUITPY_USB_HOST = 0
-
-CIRCUITPY_FLOPPYIO = 0
-CIRCUITPY_PICODVI = 1
diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
@@ -5,7 +5,6 @@ CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1
 # CYW43 support does not provide settable MAC addresses for station or AP.
 CIRCUITPY_WIFI_RADIO_SETTABLE_MAC_ADDRESS = 0
 
-CIRCUITPY_ALARM ?= 1
 CIRCUITPY_RP2PIO ?= 1
 CIRCUITPY_NEOPIXEL_WRITE ?= $(CIRCUITPY_RP2PIO)
 CIRCUITPY_FLOPPYIO ?= 1
@@ -47,6 +46,26 @@ CIRCUITPY_AUDIOPWMIO ?= 1
 
 CIRCUITPY_AUDIOMIXER ?= 1
 
+ifeq ($(CHIP_VARIANT),RP2040)
+CIRCUITPY_ALARM ?= 1
+
+# Default PICODVI off because it uses RAM to store code run on the second CPU for RP2040.
+CIRCUITPY_PICODVI ?= 0
+
+CIRCUITPY_TOUCHIO ?= 1
+endif
+
+ifeq ($(CHIP_VARIANT),RP2350)
+# This needs to be implemented.
+CIRCUITPY_ALARM = 0
+# Default PICODVI on because it doesn't require much code in RAM to talk to HSTX.
+CIRCUITPY_PICODVI ?= 1
+
+# Our generic touchio uses a pull down and RP2350 A2 hardware doesn't work correctly.
+# So, turn touchio off because it doesn't work.
+CIRCUITPY_TOUCHIO = 0
+endif
+
 INTERNAL_LIBM = 1
 
 CIRCUITPY_BUILD_EXTENSIONS ?= uf2

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,3 @@ CHIP_FAMILY = rp2`
`10`	`10`	`EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"`
`11`	`11`
`12`	`12`	`CIRCUITPY__EVE = 1`
`13`		`-CIRCUITPY_ALARM = 0`