8000 mimxrt/boards: Remove conditional assignment of flash type/size. · micropython/micropython@4ce1ada · GitHub
[go: up one dir, main page]

Skip to content

Commit 4ce1ada

Browse files
alphaFreddpgeorge
authored andcommitted
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.
1 parent 434974e commit 4ce1ada

File tree

10 files changed

+20
-20
lines changed

10 files changed

+20
-20
lines changed

ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1011DAE5A
33

44
MICROPY_FLOAT_IMPL = single
55
MICROPY_PY_MACHINE_SDCARD = 0
6-
MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
7-
MICROPY_HW_FLASH_SIZE ?= 0x1000000 # 16MB
6+
MICROPY_HW_FLASH_TYPE = qspi_nor_flash
7+
MICROPY_HW_FLASH_SIZE = 0x1000000 # 16MB
88

99
JLINK_PATH ?= /media/RT1010-EVK/
1010
JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink

ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1015DAF5A
33

44
MICROPY_FLOAT_IMPL = single
55
MICROPY_PY_MACHINE_SDCARD = 0
6-
MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
7-
MICROPY_HW_FLASH_SIZE ?= 0x1000000 # 16MB
6+
MICROPY_HW_FLASH_TYPE = qspi_nor_flash
7+
MICROPY_HW_FLASH_SIZE = 0x1000000 # 16MB
88

99
MICROPY_BOOT_BUFFER_SIZE = (32 * 1024)

ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1021DAG5A
33

44
MICROPY_FLOAT_IMPL = double
55
MICROPY_PY_MACHINE_SDCARD = 1
6-
MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
7-
MICROPY_HW_FLASH_SIZE ?= 0x800000 # 8MB
6+
MICROPY_HW_FLASH_TYPE = qspi_nor_flash
7+
MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB
88

99
MICROPY_HW_SDRAM_AVAIL = 1
1010
MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB

ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1052DVL6B
33

44
MICROPY_FLOAT_IMPL = double
55
MICROPY_PY_MACHINE_SDCARD = 1
6-
MICROPY_HW_FLASH_TYPE ?= qspi_hyper_flash
7-
MICROPY_HW_FLASH_SIZE ?= 0x4000000 # 64MB
6+
MICROPY_HW_FLASH_TYPE = qspi_hyper_flash
7+
MICROPY_HW_FLASH_SIZE = 0x4000000 # 64MB
88

99
MICROPY_HW_SDRAM_AVAIL = 1
1010
MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB

ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1062DVJ6A
33

44
MICROPY_FLOAT_IMPL = double
55
MICROPY_PY_MACHINE_SDCARD = 1
6-
MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
7-
MICROPY_HW_FLASH_SIZE ?= 0x800000 # 8MB
6+
MICROPY_HW_FLASH_TYPE = qspi_nor_flash
7+
MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB
88

99
MICROPY_HW_SDRAM_AVAIL = 1
1010
MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB

ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1064DVL6A
33

44
MICROPY_FLOAT_IMPL = double
55
MICROPY_PY_MACHINE_SDCARD = 1
6-
MICROPY_HW_FLASH_TYPE ?= qspi_hyper_flash
7-
MICROPY_HW_FLASH_SIZE ?= 0x4000000 # 64MB
6+
MICROPY_HW_FLASH_TYPE = qspi_hyper_flash
7+
MICROPY_HW_FLASH_SIZE = 0x4000000 # 64MB
88

99
MICROPY_HW_SDRAM_AVAIL = 1
1010
MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB

ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1011DAE5A
33

44
MICROPY_FLOAT_IMPL = single
55
MICROPY_PY_MACHINE_SDCARD ?= 0
6-
MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
7-
MICROPY_HW_FLASH_SIZE ?= 0x200000 # 2MB
6+
MICROPY_HW_FLASH_TYPE = qspi_nor_flash
7+
MICROPY_HW_FLASH_SIZE = 0x200000 # 2MB
88
MICROPY_HW_FLASH_RESERVED ?= 0x1000 # 4KB
99

1010
CFLAGS += -DMICROPY_HW_FLASH_DQS=kFlexSPIReadSampleClk_LoopbackInternally

ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1052DVL6B
33

44
MICROPY_FLOAT_IMPL = double
55
MICROPY_PY_MACHINE_SDCARD = 1
6-
MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
7-
MICROPY_HW_FLASH_SIZE ?= 0x800000 # 8MB
6+
MICROPY_HW_FLASH_TYPE = qspi_nor_flash
7+
MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB
88

99
MICROPY_HW_SDRAM_AVAIL = 1
1010
MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB

ports/mimxrt/boards/TEENSY40/mpconfigboard.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1062DVJ6A
33

44
MICROPY_FLOAT_IMPL = double
55
MICROPY_PY_MACHINE_SDCARD = 1
6-
MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
7-
MICROPY_HW_FLASH_SIZE ?= 0x200000 # 2MB
6+
MICROPY_HW_FLASH_TYPE = qspi_nor_flash
7+
MICROPY_HW_FLASH_SIZE = 0x200000 # 2MB
88
MICROPY_HW_FLASH_RESERVED ?= 0x1000 # 4KB
99

1010
deploy: $(BUILD)/firmware.hex

ports/mimxrt/boards/TEENSY41/mpconfigboard.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1062DVJ6A
33

44
MICROPY_FLOAT_IMPL = double
55
MICROPY_PY_MACHINE_SDCARD = 1
6-
MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
7-
MICROPY_HW_FLASH_SIZE ?= 0x800000 # 8MB
6+
MICROPY_HW_FLASH_TYPE = qspi_nor_flash
7+
MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB
88
MICROPY_HW_FLASH_RESERVED ?= 0x1000 # 4KB
99

1010
MICROPY_PY_LWIP = 1

0 commit comments

Comments
 (0)
0