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.
micropython · Jun 24, 2022 · 4ce1ada · 4ce1ada
1 parent 434974e
commit 4ce1ada
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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