diff --git a/ports/raspberrypi/mpconfigport.mk b/ports/raspberrypi/mpconfigport.mk
index 395948a5147d9..ddbd0ec63b6da 100644
--- a/ports/raspberrypi/mpconfigport.mk
+++ b/ports/raspberrypi/mpconfigport.mk
@@ -17,19 +17,15 @@ endif
 # All raspberrypi ports have longints.
 LONGINT_IMPL = MPZ
 
-ifndef CIRCUITPY_RP2PIO
-CIRCUITPY_RP2PIO = 1
-else
-CIRCUITPY_NEOPIXEL_WRITE = 0
-endif
-
-CIRCUITPY_FRAMEBUFFERIO = 1
-CIRCUITPY_FULL_BUILD = 1
+CIRCUITPY_RP2PIO ?= 1
+CIRCUITPY_NEOPIXEL_WRITE ?= $(CIRCUITPY_RP2PIO)
+CIRCUITPY_FRAMEBUFFERIO ?= 1
+CIRCUITPY_FULL_BUILD ?= 1
 CIRCUITPY_AUDIOMP3 ?= 1
-CIRCUITPY_BITOPS = 1
-CIRCUITPY_PWMIO = 1
-CIRCUITPY_RGBMATRIX = 1
-CIRCUITPY_ROTARYIO = 1
+CIRCUITPY_BITOPS ?= 1
+CIRCUITPY_PWMIO ?= 1
+CIRCUITPY_RGBMATRIX ?= 1
+CIRCUITPY_ROTARYIO ?= 1
 
 # Things that need to be implemented.
 # Use PWM interally
@@ -37,8 +33,8 @@ CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_NVM = 1
 # Use PIO interally
-CIRCUITPY_PULSEIO = 1
-CIRCUITPY_WATCHDOG = 1
+CIRCUITPY_PULSEIO ?= 1
+CIRCUITPY_WATCHDOG ?= 1
 
 # Audio via PWM
 CIRCUITPY_AUDIOIO = 0