summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ports/mimxrt/Makefile66
-rw-r--r--ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk2
-rw-r--r--ports/mimxrt/boards/MIMXRT1011.ld2
-rw-r--r--ports/mimxrt/boards/MIMXRT1015.ld2
-rw-r--r--ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk2
-rw-r--r--ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk2
-rw-r--r--ports/mimxrt/boards/MIMXRT1021.ld2
-rw-r--r--ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk2
-rw-r--r--ports/mimxrt/boards/MIMXRT1052.ld4
-rw-r--r--ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk2
-rw-r--r--ports/mimxrt/boards/MIMXRT1062.ld4
-rw-r--r--ports/mimxrt/boards/MIMXRT1064.ld6
-rw-r--r--ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk2
-rw-r--r--ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk2
-rw-r--r--ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk2
-rw-r--r--ports/mimxrt/boards/TEENSY40/mpconfigboard.mk2
-rwxr-xr-xports/mimxrt/boards/TEENSY41/mpconfigboard.mk2
17 files changed, 46 insertions, 60 deletions
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index ee8281dd6..32861c26a 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -203,28 +203,21 @@ SRC_C += \
tusb_port.c \
$(SRC_TINYUSB_C) \
$(SRC_HAL_IMX_C) \
- $(SRC_ETH_C) \
-
-ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
-SRC_C += hal/flexspi_nor_flash.c
-
-ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
-SRC_C += $(BOARD_DIR)/qspi_nor_flash_config.c
-else
-SRC_C += hal/qspi_nor_flash_config.c
-endif # qspi_nor
-#
-else ifeq ($(MICROPY_HW_FLASH_TYPE), hyperflash)
-SRC_C += hal/flexspi_hyper_flash.c
-
-ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
-SRC_C += $(BOARD_DIR)/qspi_hyper_flash_config.c
-else
-SRC_C += hal/qspi_hyper_flash_config.c
-endif # hyperflash
-#
+ $(SRC_ETH_C)
+
+# Add sources for respective board flash type
+ifeq ($(MICROPY_HW_FLASH_TYPE),$(filter $(MICROPY_HW_FLASH_TYPE),qspi_nor_flash qspi_hyper_flash))
+ # Add hal/flexspi_nor_flash.c or hal/flashspi_hyper_flash.c respectively
+ SRC_C += hal/flexspi_$(subst qspi_,,$(MICROPY_HW_FLASH_TYPE)).c
+ #
+ # Add custom (board specific) or default configuration
+ ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
+ SRC_C += $(BOARD_DIR)/$(MICROPY_HW_FLASH_TYPE)_config.c
+ else
+ SRC_C += hal/$(MICROPY_HW_FLASH_TYPE)_config.c
+ endif
else
-$(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
+ $(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
endif
# Math library source files
@@ -414,26 +407,19 @@ CFLAGS += \
-Wfloat-conversion \
-Wno-error=unused-parameter
-ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
-CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_nor_flash.h\"
-
-ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
-CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"$(BOARD)_flexspi_flash_config.h\"
-else
-CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"hal/flexspi_flash_config.h\"
-endif # qspi_nor
-#
-else ifeq ($(MICROPY_HW_FLASH_TYPE), hyperflash)
-CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_hyper_flash.h\"
-
-ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
-CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"$(BOARD)_flexspi_flash_config.h\"
-else
-CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"hal/flexspi_flash_config.h\"
-endif # hyperflash
-#
+# Configure respective board flash type
+ifeq ($(MICROPY_HW_FLASH_TYPE),$(filter $(MICROPY_HW_FLASH_TYPE),qspi_nor_flash qspi_hyper_flash))
+ # Add hal/flexspi_nor_flash.h or hal/flexspi_hyper_flash.h respectively
+ CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_$(subst qspi_,,$(MICROPY_HW_FLASH_TYPE)).h\"
+ #
+ # Add custom (board specific) or default configuration
+ ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
+ CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"$(BOARD)_flexspi_flash_config.h\"
+ else
+ CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"hal/flexspi_flash_config.h\"
+ endif
else
-$(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
+ $(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
endif
# Configure floating point support
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
index c2a50d722..af705e0b9 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1011DAE5A
MICROPY_FLOAT_IMPL = single
MICROPY_PY_MACHINE_SDCARD = 0
-MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
MICROPY_HW_FLASH_SIZE ?= 0x1000000 # 16MB
JLINK_PATH ?= /media/RT1010-EVK/
diff --git a/ports/mimxrt/boards/MIMXRT1011.ld b/ports/mimxrt/boards/MIMXRT1011.ld
index 19bbc2770..908eefffd 100644
--- a/ports/mimxrt/boards/MIMXRT1011.ld
+++ b/ports/mimxrt/boards/MIMXRT1011.ld
@@ -3,7 +3,7 @@
reserved_size = MICROPY_HW_FLASH_RESERVED;
#endif
-#if MICROPY_HW_FLASH_TYPE==qspi_nor
+#if MICROPY_HW_FLASH_TYPE == qspi_nor_flash
flash_start = 0x60000000;
#else
#error Unknown MICROPY_HW_FLASH_TYPE
diff --git a/ports/mimxrt/boards/MIMXRT1015.ld b/ports/mimxrt/boards/MIMXRT1015.ld
index 6d34200a9..90336a243 100644
--- a/ports/mimxrt/boards/MIMXRT1015.ld
+++ b/ports/mimxrt/boards/MIMXRT1015.ld
@@ -3,7 +3,7 @@
reserved_size = MICROPY_HW_FLASH_RESERVED;
#endif
-#if MICROPY_HW_FLASH_TYPE == qspi_nor
+#if MICROPY_HW_FLASH_TYPE == qspi_nor_flash
flash_start = 0x60000000;
#else
#error Unknown MICROPY_HW_FLASH_TYPE
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
index 5d959b31d..a2661a489 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
+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 c1e1678e5..98262e237 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1021DAG5A
MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
MICROPY_HW_FLASH_SIZE ?= 0x800000 # 8MB
MICROPY_HW_SDRAM_AVAIL = 1
diff --git a/ports/mimxrt/boards/MIMXRT1021.ld b/ports/mimxrt/boards/MIMXRT1021.ld
index 60557f1bb..bef0c13df 100644
--- a/ports/mimxrt/boards/MIMXRT1021.ld
+++ b/ports/mimxrt/boards/MIMXRT1021.ld
@@ -3,7 +3,7 @@
reserved_size = MICROPY_HW_FLASH_RESERVED;
#endif
-#if MICROPY_HW_FLASH_TYPE == qspi_nor
+#if MICROPY_HW_FLASH_TYPE == qspi_nor_flash
flash_start = 0x60000000;
#else
#error Unknown MICROPY_HW_FLASH_TYPE
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
index 65e3d3096..4cdf18b62 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1052DVL6B
MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= hyperflash
+MICROPY_HW_FLASH_TYPE ?= qspi_hyper_flash
MICROPY_HW_FLASH_SIZE ?= 0x4000000 # 64MB
MICROPY_HW_SDRAM_AVAIL = 1
diff --git a/ports/mimxrt/boards/MIMXRT1052.ld b/ports/mimxrt/boards/MIMXRT1052.ld
index 3e5739acf..ca656711a 100644
--- a/ports/mimxrt/boards/MIMXRT1052.ld
+++ b/ports/mimxrt/boards/MIMXRT1052.ld
@@ -3,9 +3,9 @@
reserved_size = MICROPY_HW_FLASH_RESERVED;
#endif
-#if MICROPY_HW_FLASH_TYPE==qspi_nor
+#if MICROPY_HW_FLASH_TYPE == qspi_nor_flash
flash_start = 0x60000000;
-#elif MICROPY_HW_FLASH_TYPE==hyperflash
+#elif MICROPY_HW_FLASH_TYPE == qspi_hyper_flash
flash_start = 0x60000000;
#else
#error Unknown MICROPY_HW_FLASH_TYPE
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index 56ccba6e5..ecdd7ec0c 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1062DVJ6A
MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
MICROPY_HW_FLASH_SIZE ?= 0x800000 # 8MB
MICROPY_HW_SDRAM_AVAIL = 1
diff --git a/ports/mimxrt/boards/MIMXRT1062.ld b/ports/mimxrt/boards/MIMXRT1062.ld
index fc4eb20c0..5b91550d9 100644
--- a/ports/mimxrt/boards/MIMXRT1062.ld
+++ b/ports/mimxrt/boards/MIMXRT1062.ld
@@ -3,9 +3,9 @@
reserved_size = MICROPY_HW_FLASH_RESERVED;
#endif
-#if MICROPY_HW_FLASH_TYPE==qspi_nor
+#if MICROPY_HW_FLASH_TYPE == qspi_nor_flash
flash_start = 0x60000000;
-#elif MICROPY_HW_FLASH_TYPE==hyperflash
+#elif MICROPY_HW_FLASH_TYPE == qspi_hyper_flash
flash_start = 0x60000000;
#else
#error Unknown MICROPY_HW_FLASH_TYPE
diff --git a/ports/mimxrt/boards/MIMXRT1064.ld b/ports/mimxrt/boards/MIMXRT1064.ld
index 148f1f23e..1fbc855fa 100644
--- a/ports/mimxrt/boards/MIMXRT1064.ld
+++ b/ports/mimxrt/boards/MIMXRT1064.ld
@@ -3,11 +3,11 @@
reserved_size = MICROPY_HW_FLASH_RESERVED;
#endif
-#if MICROPY_HW_FLASH_TYPE==qspi_nor
+#if MICROPY_HW_FLASH_TYPE == qspi_nor_flash
flash_start = 0x60000000;
-#elif MICROPY_HW_FLASH_TYPE==hyperflash
+#elif MICROPY_HW_FLASH_TYPE == qspi_hyper_flash
flash_start = 0x60000000;
-#elif MICROPY_HW_FLASH_TYPE==internal
+#elif MICROPY_HW_FLASH_TYPE == internal
flash_start = 0x70000000;
#else
#error Unknown MICROPY_HW_FLASH_TYPE
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
index 5cd7d49ab..f524a81e6 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1064DVL6A
MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= hyperflash
+MICROPY_HW_FLASH_TYPE ?= qspi_hyper_flash
MICROPY_HW_FLASH_SIZE ?= 0x4000000 # 64MB
MICROPY_HW_SDRAM_AVAIL = 1
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
index e4f904903..96aaa5776 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1011DAE5A
MICROPY_FLOAT_IMPL = single
MICROPY_PY_MACHINE_SDCARD ?= 0
-MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
MICROPY_HW_FLASH_SIZE ?= 0x200000 # 2MB
MICROPY_HW_FLASH_RESERVED ?= 0x1000 # 4KB
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
index 90edc5d51..7a87496b9 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1052DVL6B
MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
MICROPY_HW_FLASH_SIZE ?= 0x800000 # 8MB
MICROPY_HW_SDRAM_AVAIL = 1
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
index 94e427cc1..aa903a060 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1062DVJ6A
MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
MICROPY_HW_FLASH_SIZE ?= 0x200000 # 2MB
MICROPY_HW_FLASH_RESERVED ?= 0x1000 # 4KB
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
index a012444ca..454967f04 100755
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1062DVJ6A
MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
MICROPY_HW_FLASH_SIZE ?= 0x800000 # 8MB
MICROPY_HW_FLASH_RESERVED ?= 0x1000 # 4KB
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-10 21:29:59 +0000