Skip to content

Commit 13375d1

Browse files
committed
change mpconfigport.mk files so they can be overriden by mpconfigboard.mk
1 parent e18d3e0 commit 13375d1

File tree

4 files changed

+74
-7
lines changed

4 files changed

+74
-7
lines changed

ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ INTERNAL_FLASH_FILESYSTEM = 1
1212
LONGINT_IMPL = MPZ
1313

1414
# Not needed.
15-
CIRCUITPY_PS2IO = 0
16-
CIRCUITPY_NETWORK = 0
1715
CIRCUITPY_AUDIOBUSIO = 0
1816
CIRCUITPY_DISPLAYIO = 0
1917
CIRCUITPY_NETWORK = 0
18+
CIRCUITPY_PS2IO = 0

ports/atmel-samd/mpconfigport.mk

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,41 @@ endif
1616

1717
# Put samd21-only choices here.
1818
ifeq ($(CHIP_FAMILY),samd21)
19-
# frequencyio not yet verified as working on SAMD21.
19+
# frequencyio not yet verified as working on SAMD21, though make it possible to override.
20+
ifndef CIRCUITPY_AUDIOMIXER
2021
CIRCUITPY_AUDIOMIXER = 0
22+
endif
23+
24+
ifndef CIRCUITPY_FREQUENCYIO
2125
CIRCUITPY_FREQUENCYIO = 0
26+
endif
27+
28+
ifndef CIRCUITPY_TOUCHIO_USE_NATIVE
2229
CIRCUITPY_TOUCHIO_USE_NATIVE = 1
30+
endif
2331

2432
# SAMD21 needs separate endpoint pairs for MSC BULK IN and BULK OUT, otherwise it's erratic.
2533
USB_MSC_EP_NUM_OUT = 1
2634
endif
2735

2836
# Put samd51-only choices here.
2937
ifeq ($(CHIP_FAMILY),samd51)
38+
# No native touchio on SAMD51.
39+
CIRCUITPY_TOUCHIO_USE_NATIVE = 0
40+
41+
ifndef CIRCUITPY_NETWORK
3042
CIRCUITPY_NETWORK = 1
3143
MICROPY_PY_WIZNET5K = 5500
44+
endif
45+
46+
ifndef CIRCUITPY_PS2IO
3247
CIRCUITPY_PS2IO = 1
48+
endif
49+
50+
ifndef CIRCUITPY_SAMD
3351
CIRCUITPY_SAMD = 1
34-
CIRCUITPY_TOUCHIO_USE_NATIVE = 0
52+
endif
53+
3554
endif
3655

3756
INTERNAL_LIBM = 1

ports/nrf/mpconfigport.mk

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,31 @@ USB_SERIAL_NUMBER_LENGTH = 16
1111
LONGINT_IMPL = MPZ
1212

1313
# Audio via PWM
14+
ifndef CIRCUITPY_AUDIOCORE
1415
CIRCUITPY_AUDIOCORE = 1
16+
endif
17+
1518
CIRCUITPY_AUDIOIO = 0
19+
20+
ifndef CIRCUITPY_AUDIOMIXER
1621
CIRCUITPY_AUDIOMIXER = 1
22+
endif
23+
24+
ifndef CIRCUITPY_AUDIOPWMIO
1725
CIRCUITPY_AUDIOPWMIO = 1
26+
endif
27+
28+
ifndef CIRCUITPY_AUDIOBUSIO
1829
CIRCUITPY_AUDIOBUSIO = 1
30+
endif
1931

2032
# No I2CSlave implementation
2133
CIRCUITPY_I2CSLAVE = 0
2234

23-
# enable NVM
24-
CIRCUITPY_NVM = 1
25-
2635
# enable RTC
36+
ifndef CIRCUITPY_RTC
2737
CIRCUITPY_RTC = 1
38+
endif
2839

2940
# frequencyio not yet implemented
3041
CIRCUITPY_FREQUENCYIO = 0

ports/stm32f4/mpconfigport.mk

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,56 @@ LONGINT_IMPL = MPZ
1515
#Reduced feature set for early port
1616
CIRCUITPY_MINIMAL_BUILD = 1
1717

18+
# The ifndef's allow overriding in mpconfigboard.mk.
19+
20+
ifndef CIRCUITPY_BOARD
1821
CIRCUITPY_BOARD = 1
22+
endif
23+
24+
ifndef CIRCUITPY_DIGITALIO
1925
CIRCUITPY_DIGITALIO = 1
26+
endif
27+
28+
ifndef CIRCUITPY_ANALOGIO
2029
CIRCUITPY_ANALOGIO = 1
30+
endif
31+
32+
ifndef CIRCUITPY_MICROCONTROLLER
2133
CIRCUITPY_MICROCONTROLLER = 1
34+
endif
35+
36+
ifndef CIRCUITPY_BUSIO
2237
CIRCUITPY_BUSIO = 1
38+
endif
39+
40+
ifndef CIRCUITPY_PULSEIO
2341
CIRCUITPY_PULSEIO = 1
42+
endif
43+
44+
ifndef CIRCUITPY_OS
2445
CIRCUITPY_OS = 1
46+
endif
47+
48+
ifndef CIRCUITPY_STORAGE
2549
CIRCUITPY_STORAGE = 1
50+
endif
51+
52+
ifndef CIRCUITPY_RANDOM
2653
CIRCUITPY_RANDOM = 1
54+
endif
55+
56+
ifndef CRICUITPY_USB_HID
2757
CIRCUITPY_USB_HID = 1
58+
endif
59+
60+
ifndef CIRCUITPY_USB_MIDI
2861
CIRCUITPY_USB_MIDI = 1
62+
endif
63+
64+
ifndef CIRCUITPY_NEOPIXEL_WRITE
2965
CIRCUITPY_NEOPIXEL_WRITE = 1
66+
endif
67+
3068

3169
#ifeq ($(MCU_SUB_VARIANT), stm32f412zx)
3270
#endif

0 commit comments

Comments
 (0)