8000 Merge pull request #1720 from dhalbert/frequencyio-full-builds · flummer/circuitpython@fd134df · GitHub
[go: up one dir, main page]
Skip to content

Commit fd134df

Browse files
tannewttannewt
authored
Merge pull request adafruit#1720 from dhalbert/frequencyio-full-builds
Turn on frequencyio only on CIRCUITPY_FULL_BUILD
2 parents 2cc3159 + f118aef commit fd134df

File tree

21 files changed

+7
-37
lines changed
  • gemma_m0
  • meowmeow
  • metro_m0_express
  • pewpew10
  • pirkey_m0
  • sparkfun_samd21_dev
  • sparkfun_samd21_mini
  • trinket_m0
  • trinket_m0_haxpress
  • uchip
  • mpconfigport.mk
  • py

    • 21 files changed

    +7
    -37
    lines changed

    ‎ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
    1010

    1111
    CHIP_VARIANT = SAMD21G18A
    1212
    CHIP_FAMILY = samd21
    13-
    14-
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
    1010

    1111
    CHIP_VARIANT = SAMD21G18A
    1212
    CHIP_FAMILY = samd21
    13-
    14-
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
    1010

    1111
    CHIP_VARIANT = SAMD21G18A
    1212
    CHIP_FAMILY = samd21
    13-
    14-
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.mk

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
    1010

    1111
    CHIP_VARIANT = SAMD21E18A
    1212
    CHIP_FAMILY = samd21
    13-
    14-
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
    1010

    1111
    CHIP_VARIANT = SAMD21G18A
    1212
    CHIP_FAMILY = samd21
    13-
    14-
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
    1010

    1111
    CHIP_VARIANT = SAMD21G18A
    1212
    CHIP_FAMILY = samd21
    13-
    14-
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -11,5 +11,3 @@ LONGINT_IMPL = MPZ
    1111

    1212
    CHIP_VARIANT = SAMD21G18A
    1313
    CHIP_FAMILY = samd21
    14-
    15-
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
    1010

    1111
    CHIP_VARIANT = SAMD21G18A
    1212
    CHIP_FAMILY = samd21
    13-
    14-
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/boards/feather_m0_rfm9x/ DEC0 mpconfigboard.mk

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
    1010

    1111
    CHIP_VARIANT = SAMD21G18A
    1212
    CHIP_FAMILY = samd21
    13-
    14-
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
    1010

    1111
    CHIP_VARIANT = SAMD21E18A
    1212
    CHIP_FAMILY = samd21
    13-
    14-
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/boards/meowmeow/mpconfigboard.mk

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
    1010

    1111
    CHIP_VARIANT = SAMD21G18A
    1212
    CHIP_FAMILY = samd21
    13-
    14-
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -12,5 +12,3 @@ LONGINT_IMPL = MPZ
    1212

    1313
    CHIP_VARIANT = SAMD21G18A
    1414
    CHIP_FAMILY = samd21
    15-
    16-
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/boards/pewpew10/mpconfigboard.mk

    Lines changed: 0 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -20,4 +20,3 @@ CIRCUITPY_RTC = 0
    2020
    CIRCUITPY_SAMD = 0
    2121
    CIRCUITPY_USB_MIDI = 0
    2222
    CIRCUITPY_SMALL_BUILD = 1
    23-
    CIRCUITPY_FREQUENCYIO = 0

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

    Lines changed: 0 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -17,7 +17,6 @@ CIRCUITPY_RTC = 0
    1717
    CIRCUITPY_SAMD = 0
    1818
    CIRCUITPY_USB_MIDI = 0
    1919
    CIRCUITPY_SMALL_BUILD = 1
    20-
    CIRCUITPY_FREQUENCYIO = 0
    2120

    2221
    CHIP_VARIANT = SAMD21E18A
    2322
    CHIP_FAMILY = samd21

    ‎ports/atmel-samd/boards/sparkfun_samd21_dev/mpconfigboard.mk

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
    1010

    1111
    CHIP_VARIANT = SAMD21G18A
    1212
    CHIP_FAMILY = samd21
    13-
    14-
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/boards/sparkfun_samd21_mini/mpconfigboard.mk

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
    1010

    1111
    CHIP_VARIANT = SAMD21G18A
    1212
    CHIP_FAMILY = samd21
    13-
    14-
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
    1010

    1111
    CHIP_VARIANT = SAMD21E18A
    1212
    CHIP_FAMILY = samd21
    13-
    14-
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -11,5 +11,3 @@ LONGINT_IMPL = MPZ
    1111

    1212
    CHIP_VARIANT = SAMD21E18A
    1313
    CHIP_FAMILY = samd21
    14-
    15-
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/boards/uchip/mpconfigboard.mk

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
    1010

    1111
    CHIP_VARIANT = SAMD21E18A
    1212
    CHIP_FAMILY = samd21
    13-
    14-
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/mpconfigport.mk

    Lines changed: 6 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -14,6 +14,12 @@ ifeq ($(LONGINT_IMPL),LONGLONG)
    1414
    MPY_TOOL_LONGINT_IMPL = -mlongint-impl=longlong
    1515
    endif
    1616

    17+
    # Put samd21-only choices here.
    18+
    ifeq ($(CHIP_FAMILY),samd21)
    19+
    # frequencyio not yet verified as working on SAMD21.
    20+
    CIRCUITPY_FRQUENCYIO = 0
    21+
    endif
    22+
    1723
    # Put samd51-only choices here.
    1824
    ifeq ($(CHIP_FAMILY),samd51)
    1925
    CIRCUITPY_SAMD = 1

    ‎py/circuitpy_mpconfig.mk

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -93,7 +93,7 @@ endif
    9393
    CFLAGS += -DCIRCUITPY_DISPLAYIO=$(CIRCUITPY_DISPLAYIO)
    9494

    9595
    ifndef CIRCUITPY_FREQUENCYIO
    96-
    CIRCUITPY_FREQUENCYIO = 1
    96+
    CIRCUITPY_FREQUENCYIO = $(CIRCUITPY_FULL_BUILD)
    9797
    endif
    9898
    CFLAGS += -DCIRCUITPY_FREQUENCYIO=$(CIRCUITPY_FREQUENCYIO)
    9999

    0 commit comments

    Comments
     (0)
    0