summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Ebensberger <philipp.ebensberger@3bricks-software.de>2022-06-23 19:00:54 +0200
committerDamien George <damien@micropython.org>2022-06-24 17:58:27 +1000
commit4ce1adab3153bb0dd5afcd0ddefc219b91d1a13e (patch)
tree1b903aa06481f1044c17080932d98831a08433d4
parent434974ec7707e20faab5ac9752bb70525966ff5c (diff)
mimxrt/boards: Remove conditional assignment of flash type/size.
Removes conditional assignment because respective variables should only be set in board makefile fragments. Hence no conditional assignment needed.
-rw-r--r--ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk4
-rw-r--r--ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk4
-rw-r--r--ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk4
-rw-r--r--ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk4
-rw-r--r--ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk4
-rw-r--r--ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk4
-rw-r--r--ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk4
-rw-r--r--ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk4
-rw-r--r--ports/mimxrt/boards/TEENSY40/mpconfigboard.mk4
-rwxr-xr-xports/mimxrt/boards/TEENSY41/mpconfigboard.mk4
10 files changed, 20 insertions, 20 deletions
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
index af705e0b9..19db53c3f 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1011DAE5A
MICROPY_FLOAT_IMPL = single
MICROPY_PY_MACHINE_SDCARD = 0
-MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
-MICROPY_HW_FLASH_SIZE ?= 0x1000000 # 16MB
+MICROPY_HW_FLASH_TYPE = qspi_nor_flash
+MICROPY_HW_FLASH_SIZE = 0x1000000 # 16MB
JLINK_PATH ?= /media/RT1010-EVK/
JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
index a2661a489..ba7d61f6d 100644
--- a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1015DAF5A
MICROPY_FLOAT_IMPL = single
MICROPY_PY_MACHINE_SDCARD = 0
-MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
-MICROPY_HW_FLASH_SIZE ?= 0x1000000 # 16MB
+MICROPY_HW_FLASH_TYPE = qspi_nor_flash
+MICROPY_HW_FLASH_SIZE = 0x1000000 # 16MB
MICROPY_BOOT_BUFFER_SIZE = (32 * 1024)
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
index 98262e237..e8922e4b7 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1021DAG5A
MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
-MICROPY_HW_FLASH_SIZE ?= 0x800000 # 8MB
+MICROPY_HW_FLASH_TYPE = qspi_nor_flash
+MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB
MICROPY_HW_SDRAM_AVAIL = 1
MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
index 4cdf18b62..008433504 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1052DVL6B
MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_hyper_flash
-MICROPY_HW_FLASH_SIZE ?= 0x4000000 # 64MB
+MICROPY_HW_FLASH_TYPE = qspi_hyper_flash
+MICROPY_HW_FLASH_SIZE = 0x4000000 # 64MB
MICROPY_HW_SDRAM_AVAIL = 1
MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index ecdd7ec0c..96afe276f 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1062DVJ6A
MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
-MICROPY_HW_FLASH_SIZE ?= 0x800000 # 8MB
+MICROPY_HW_FLASH_TYPE = qspi_nor_flash
+MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB
MICROPY_HW_SDRAM_AVAIL = 1
MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
index f524a81e6..ceb1e9796 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1064DVL6A
MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_hyper_flash
-MICROPY_HW_FLASH_SIZE ?= 0x4000000 # 64MB
+MICROPY_HW_FLASH_TYPE = qspi_hyper_flash
+MICROPY_HW_FLASH_SIZE = 0x4000000 # 64MB
MICROPY_HW_SDRAM_AVAIL = 1
MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
index 96aaa5776..135c43257 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1011DAE5A
MICROPY_FLOAT_IMPL = single
MICROPY_PY_MACHINE_SDCARD ?= 0
-MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
-MICROPY_HW_FLASH_SIZE ?= 0x200000 # 2MB
+MICROPY_HW_FLASH_TYPE = qspi_nor_flash
+MICROPY_HW_FLASH_SIZE = 0x200000 # 2MB
MICROPY_HW_FLASH_RESERVED ?= 0x1000 # 4KB
CFLAGS += -DMICROPY_HW_FLASH_DQS=kFlexSPIReadSampleClk_LoopbackInternally
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
index 7a87496b9..2312d1131 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1052DVL6B
MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
-MICROPY_HW_FLASH_SIZE ?= 0x800000 # 8MB
+MICROPY_HW_FLASH_TYPE = qspi_nor_flash
+MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB
MICROPY_HW_SDRAM_AVAIL = 1
MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
index aa903a060..4482c629f 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1062DVJ6A
MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
-MICROPY_HW_FLASH_SIZE ?= 0x200000 # 2MB
+MICROPY_HW_FLASH_TYPE = qspi_nor_flash
+MICROPY_HW_FLASH_SIZE = 0x200000 # 2MB
MICROPY_HW_FLASH_RESERVED ?= 0x1000 # 4KB
deploy: $(BUILD)/firmware.hex
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
index 454967f04..601a2cfe8 100755
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1062DVJ6A
MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
-MICROPY_HW_FLASH_SIZE ?= 0x800000 # 8MB
+MICROPY_HW_FLASH_TYPE = qspi_nor_flash
+MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB
MICROPY_HW_FLASH_RESERVED ?= 0x1000 # 4KB
MICROPY_PY_LWIP = 1