djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make longint choice mechanism more readable

Browse Source
This commit is contained in:
Dan Halbert 2018-05-22 08:04:14 -04:00
parent 5680933483
commit 45db48bbaa
22 changed files with 28 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ports/atmel-samd/Makefile
View File

@ -165,16 +165,17 @@ ifndef INTERNAL_LIBM
LIBS += -lm
endif
# Propagate longint choice from .mk to C.
ifdef LONGINT_IMPL_NONE
# Propagate longint choice from .mk to C. There's no easy string comparison
# in cpp coniditionals, so we #define separate names for each.
ifeq ($(LONGINT_IMPL),NONE)
CFLAGS += -DLONGINT_IMPL_NONE
endif
ifdef LONGINT_IMPL_MPZ
ifeq ($(LONGINT_IMPL),MPZ)
CFLAGS += -DLONGINT_IMPL_MPZ
endif
ifdef LONGINT_IMPL_LONGLONG
ifeq ($(LONGINT_IMPL),LONGLONG)
CFLAGS += -DLONGINT_IMPL_LONGLONG
endif

2
ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
View File

@ -5,7 +5,7 @@ USB_PRODUCT = "Arduino Zero"
USB_MANUFACTURER = "Arduino"
INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL_NONE = 1
LONGINT_IMPL = NONE
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21

4
ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
View File

@ -5,13 +5,11 @@ USB_PRODUCT = "CircuitPlayground Express"
USB_MANUFACTURER = "Adafruit Industries LLC"
SPI_FLASH_FILESYSTEM = 1
LONGINT_IMPL_MPZ = 1
LONGINT_IMPL = MPZ
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
# Include these Python libraries in firmware.
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground

4
ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
View File

@ -5,13 +5,11 @@ USB_PRODUCT = "CircuitPlayground Express with Crickit libraries"
USB_MANUFACTURER = "Adafruit Industries LLC"
SPI_FLASH_FILESYSTEM = 1
LONGINT_IMPL_MPZ = 1
LONGINT_IMPL = MPZ
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
# Include these Python libraries in firmware.
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground

2
ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
View File

@ -5,7 +5,7 @@ USB_PRODUCT = "Feather M0 Adalogger"
USB_MANUFACTURER = "Adafruit Industries LLC"
INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL_NONE = 1
LONGINT_IMPL = NONE
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21

2
ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
View File

@ -5,7 +5,7 @@ USB_PRODUCT = "Feather M0"
USB_MANUFACTURER = "Adafruit Industries LLC"
INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL_NONE = 1
LONGINT_IMPL = NONE
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21

4
ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
View File

@ -5,9 +5,7 @@ USB_PRODUCT = "Feather M0 Express"
USB_MANUFACTURER = "Adafruit Industries LLC"
SPI_FLASH_FILESYSTEM = 1
LONGINT_IMPL_MPZ = 1
LONGINT_IMPL = MPZ
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz

2
ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
View File

@ -5,7 +5,7 @@ USB_PRODUCT = "Feather M0 RFM69"
USB_MANUFACTURER = "Adafruit Industries LLC"
INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL_NONE = 1
LONGINT_IMPL = NONE
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21

2
ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
View File

@ -5,7 +5,7 @@ USB_PRODUCT = "Feather M0 RFM9x"
USB_MANUFACTURER = "Adafruit Industries LLC"
INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL_NONE = 1
LONGINT_IMPL = NONE
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21

2
ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk
View File

@ -5,7 +5,7 @@ USB_PRODUCT = "Feather M0 Supersized"
USB_MANUFACTURER = "Dave Astels"
SPI_FLASH_FILESYSTEM = 1
LONGINT_IMPL_MPZ = 1
LONGINT_IMPL = MPZ
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21

2
ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
View File

@ -5,7 +5,7 @@ USB_PRODUCT = "Feather M4 Express"
USB_MANUFACTURER = "Adafruit Industries LLC"
QSPI_FLASH_FILESYSTEM = 1
LONGINT_IMPL_MPZ = 1
LONGINT_IMPL = MPZ
CHIP_VARIANT = SAMD51G19A
CHIP_FAMILY = samd51

2
ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk
View File

@ -5,7 +5,7 @@ USB_PRODUCT = "Gemma M0"
USB_MANUFACTURER = "Adafruit Industries LLC"
INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL_NONE = 1
LONGINT_IMPL = NONE
CHIP_VARIANT = SAMD21E18A
CHIP_FAMILY = samd21

4
ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk
View File

@ -5,9 +5,7 @@ USB_PRODUCT = "Itsy Bitsy M0 Express"
USB_MANUFACTURER = "Adafruit Industries LLC"
SPI_FLASH_FILESYSTEM = 1
LONGINT_IMPL_MPZ = 1
LONGINT_IMPL = MPZ
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz

2
ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk
View File

@ -5,7 +5,7 @@ USB_PRODUCT = "ItsyBitsy M4 Express"
USB_MANUFACTURER = "Adafruit Industries LLC"
QSPI_FLASH_FILESYSTEM = 1
LONGINT_IMPL_MPZ = 1
LONGINT_IMPL = MPZ
CHIP_VARIANT = SAMD51G19A
CHIP_FAMILY = samd51

4
ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
View File

@ -5,9 +5,7 @@ USB_PRODUCT = "Metro M0 Express"
USB_MANUFACTURER = "Adafruit Industries LLC"
SPI_FLASH_FILESYSTEM = 1
LONGINT_IMPL_MPZ = 1
LONGINT_IMPL = MPZ
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz

2
ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
View File

@ -5,7 +5,7 @@ USB_PRODUCT = "Metro M4 Express"
USB_MANUFACTURER = "Adafruit Industries LLC"
QSPI_FLASH_FILESYSTEM = 1
LONGINT_IMPL_MPZ = 1
LONGINT_IMPL = MPZ
CHIP_VARIANT = SAMD51J19A
CHIP_FAMILY = samd51

2
ports/atmel-samd/boards/metro_m4_express_revb/mpconfigboard.mk
View File

@ -5,7 +5,7 @@ USB_PRODUCT = "Metro M4 Express Rev B (Black)"
USB_MANUFACTURER = "Adafruit Industries LLC"
SPI_FLASH_FILESYSTEM = 1
LONGINT_IMPL_MPZ = 1
LONGINT_IMPL = MPZ
CHIP_VARIANT = SAMD51J19A
CHIP_FAMILY = samd51

2
ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
View File

@ -5,7 +5,7 @@ USB_PRODUCT = "pIRKey M0"
USB_MANUFACTURER = "Adafruit Industries LLC"
INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL_NONE = 1
LONGINT_IMPL = NONE
CHIP_VARIANT = SAMD21E18A
CHIP_FAMILY = samd21

2
ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk
View File

@ -5,7 +5,7 @@ USB_PRODUCT = "Trinket M0"
USB_MANUFACTURER = "Adafruit Industries LLC"
INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL_NONE = 1
LONGINT_IMPL = NONE
CHIP_VARIANT = SAMD21E18A
CHIP_FAMILY = samd21

2
ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk
View File

@ -5,7 +5,7 @@ USB_PRODUCT="Trinket M0 Haxpress"
USB_MANUFACTURER="Radomir Dopieralski"
SPI_FLASH_FILESYSTEM = 1
LONGINT_IMPL_MPZ = 1
LONGINT_IMPL = MPZ
CHIP_VARIANT = SAMD21E18A
CHIP_FAMILY = samd21

2
ports/atmel-samd/boards/ugame10/mpconfigboard.mk
View File

@ -6,7 +6,7 @@ USB_PRODUCT = "uGame10"
USB_MANUFACTURER = "Radomir Dopieralski"
SPI_FLASH_FILESYSTEM = 1
LONGINT_IMPL_MPZ = 1
LONGINT_IMPL = MPZ
CHIP_VARIANT = SAMD21E18A
CHIP_FAMILY = samd21

9
ports/atmel-samd/mpconfigport.mk
View File

@ -2,20 +2,17 @@
# $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.
# This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h.
ifdef LONGINT_IMPL_NONE
ifeq ($(LONGINT_IMPL),NONE)
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=none
endif
ifdef LONGINT_IMPL_MPZ
ifeq ($(LONGINT_IMPL),MPZ)
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
endif
ifdef LONGINT_IMPL_LONGLONG
ifeq ($(LONGINT_IMPL),LONGONG)
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=longlong
endif
ifndef MPY_TOOL_LONGINT_IMPL
$(error one of LONGINT_IMPL_NONE, LONGINT_IMPL_MPZ, or LONGINT_IMPL_LONGLONG must be defined)
endif
INTERNAL_LIBM = 1