Merge pull request #4696 from dhalbert/no-pulseio-on-small-boards

Include pulseio only on CIRCUITPY_FULL_BUILD

Author: dhalbert

ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk

@@ -15,6 +15,7 @@ LONGINT_IMPL = NONE
 CIRCUITPY_ANALOGIO = 0
 CIRCUITPY_MATH = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
+CIRCUITPY_PULSEIO = 1
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
 CIRCUITPY_SAMD = 0

ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk

@@ -12,6 +12,7 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
+SUPEROPT_VM = 0
 
 # Make room for frozen libs.
 CIRCUITPY_FREQUENCYIO = 0

ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk

@@ -12,6 +12,7 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
+SUPEROPT_VM = 0
 
 # Make room for frozen libs.
 CIRCUITPY_FREQUENCYIO = 0

ports/litex/mpconfigport.mk

@@ -28,7 +28,9 @@ CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_NVM = 0
+CIRCUITPY_PWMIO = 0
 CIRCUITPY_PULSEIO = 0
+CIRCUITPY_PWMIO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
 CIRCUITPY_SDCARDIO = 0

ports/stm/mpconfigport.mk

@@ -4,66 +4,67 @@ INTERNAL_LIBM ?= 1
 USB_SERIAL_NUMBER_LENGTH ?= 24
 
 ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F405xx STM32F407xx))
-	CIRCUITPY_CANIO = 1
-	CIRCUITPY_FRAMEBUFFERIO ?= 1
-	CIRCUITPY_SDIOIO ?= 1
-	# Number of USB endpoint pairs.
-	USB_NUM_EP = 4
+        CIRCUITPY_CANIO = 1
+        CIRCUITPY_FRAMEBUFFERIO ?= 1
+        CIRCUITPY_SDIOIO ?= 1
+        # Number of USB endpoint pairs.
+        USB_NUM_EP = 4
 endif
 
 ifeq ($(MCU_SERIES),F4)
-	# Audio via PWM
-	CIRCUITPY_AUDIOIO = 0
-	CIRCUITPY_AUDIOCORE ?= 1
-	CIRCUITPY_AUDIOPWMIO ?= 1
+        # Audio via PWM
+        CIRCUITPY_AUDIOIO = 0
+        CIRCUITPY_AUDIOCORE ?= 1
+        CIRCUITPY_AUDIOPWMIO ?= 1
 
-	# Not yet implemented common-hal modules:
-	CIRCUITPY_AUDIOBUSIO ?= 0
-	CIRCUITPY_COUNTIO ?= 0
-	CIRCUITPY_FREQUENCYIO ?= 0
-	CIRCUITPY_I2CPERIPHERAL ?= 0
-	CIRCUITPY_NVM ?= 0
-	CIRCUITPY_ROTARYIO ?= 0
-	CIRCUITPY_RTC ?= 0
-	CIRCUITPY_USB_MIDI ?= 0
-	CIRCUITPY_USB_HID ?= 0
+        # Not yet implemented common-hal modules:
+        CIRCUITPY_AUDIOBUSIO ?= 0
+        CIRCUITPY_COUNTIO ?= 0
+        CIRCUITPY_FREQUENCYIO ?= 0
+        CIRCUITPY_I2CPERIPHERAL ?= 0
+        CIRCUITPY_NVM ?= 0
+        CIRCUITPY_ROTARYIO ?= 0
+        CIRCUITPY_RTC ?= 0
+        CIRCUITPY_USB_MIDI ?= 0
+        CIRCUITPY_USB_HID ?= 0
 
-	USB_NUM_EP = 4
+        USB_NUM_EP = 4
 endif
 
 ifeq ($(MCU_SERIES),H7)
-	# Not yet implemented common-hal modules:
-	CIRCUITPY_ANALOGIO ?= 0
-	CIRCUITPY_AUDIOBUSIO ?= 0
-	CIRCUITPY_AUDIOIO ?= 0
-	CIRCUITPY_COUNTIO ?= 0
-	CIRCUITPY_FREQUENCYIO ?= 0
-	CIRCUITPY_I2CPERIPHERAL ?= 0
-	CIRCUITPY_NEOPIXEL_WRITE ?= 0
-	CIRCUITPY_NVM ?= 0
-	CIRCUITPY_PULSEIO ?= 0
-	CIRCUITPY_ROTARYIO ?= 0
-	CIRCUITPY_RTC ?= 0
-	CIRCUITPY_USB_HID ?= 0
-	CIRCUITPY_USB_MIDI ?= 0
+        # Not yet implemented common-hal modules:
+        CIRCUITPY_ANALOGIO ?= 0
+        CIRCUITPY_AUDIOBUSIO ?= 0
+        CIRCUITPY_AUDIOIO ?= 0
+        CIRCUITPY_COUNTIO ?= 0
+        CIRCUITPY_FREQUENCYIO ?= 0
+        CIRCUITPY_I2CPERIPHERAL ?= 0
+        CIRCUITPY_NEOPIXEL_WRITE ?= 0
+        CIRCUITPY_NVM ?= 0
+        CIRCUITPY_PULSEIO ?= 0
+	CIRCUITPY_PWMIO ?= 0
+        CIRCUITPY_ROTARYIO ?= 0
+        CIRCUITPY_RTC ?= 0
+        CIRCUITPY_USB_HID ?= 0
+        CIRCUITPY_USB_MIDI ?= 0
 
-	USB_NUM_EP = 9
+        USB_NUM_EP = 9
 endif
 
 ifeq ($(MCU_SERIES),F7)
-	# Not yet implemented common-hal modules:
-	CIRCUITPY_ANALOGIO ?= 0
-	CIRCUITPY_AUDIOBUSIO ?= 0
-	CIRCUITPY_AUDIOIO ?= 0
-	CIRCUITPY_COUNTIO ?= 0
-	CIRCUITPY_FREQUENCYIO ?= 0
-	CIRCUITPY_I2CPERIPHERAL ?= 0
-	CIRCUITPY_NEOPIXEL_WRITE ?= 0
-	CIRCUITPY_NVM ?= 0
-	CIRCUITPY_ROTARYIO ?= 0
-	CIRCUITPY_RTC ?= 0
-	CIRCUITPY_USB_HID ?= 0
-	CIRCUITPY_USB_MIDI ?= 0
+        # Not yet implemented common-hal modules:
+        CIRCUITPY_ANALOGIO ?= 0
+        CIRCUITPY_AUDIOBUSIO ?= 0
+        CIRCUITPY_AUDIOIO ?= 0
+        CIRCUITPY_COUNTIO ?= 0
+        CIRCUITPY_FREQUENCYIO ?= 0
+        CIRCUITPY_I2CPERIPHERAL ?= 0
+        CIRCUITPY_NEOPIXEL_WRITE ?= 0
+        CIRCUITPY_NVM ?= 0
+        CIRCUITPY_ROTARYIO ?= 0
+        CIRCUITPY_RTC ?= 0
+        CIRCUITPY_USB_HID ?= 0
+        CIRCUITPY_USB_MIDI ?= 0
 
-	USB_NUM_EP = 6
+        USB_NUM_EP = 6
 endif

py/circuitpy_mpconfig.mk

@@ -231,12 +231,10 @@ CFLAGS += -DCIRCUITPY_PIXELBUF=$(CIRCUITPY_PIXELBUF)
 CIRCUITPY_PS2IO ?= 0
 CFLAGS += -DCIRCUITPY_PS2IO=$(CIRCUITPY_PS2IO)
 
-CIRCUITPY_PULSEIO ?= 1
+CIRCUITPY_PULSEIO ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_PULSEIO=$(CIRCUITPY_PULSEIO)
 
-# For now we tie PWMIO to PULSEIO so they always both exist. In CircuitPython 7
-# we can enable and disable them separately once PWMOut is removed from `pulseio`.
-CIRCUITPY_PWMIO ?= $(CIRCUITPY_PULSEIO)
+CIRCUITPY_PWMIO ?= 1
 CFLAGS += -DCIRCUITPY_PWMIO=$(CIRCUITPY_PWMIO)
 
 CIRCUITPY_RANDOM ?= 1