Skip to content

Commit 4df2f8d

Browse files
imi415pi-anl
imi415
authored and
pi-anl
committed
ports/mimxrt: Restructure nxp_sdk to match official mcux-sdk.
The official mcux-sdk follows a slightly different structure to the current nxp_sdk submodule, with many drivers moved to a common location. To ease updating the newer versions of the SDK and/or add new families the nxp_sdk submodule has been updated to follow the structure of mcux-sdk, just trimmed down to families used here to considerably reduce the size. Signed-off-by: Andrew Leech <[email protected]>
1 parent 838f212 commit 4df2f8d

File tree

13 files changed

+279
-198
lines changed

13 files changed

+279
-198
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
url = https://github.com/bluekitchen/btstack.git
3636
[submodule "lib/nxp_driver"]
3737
path = lib/nxp_driver
38-
url = https://github.com/hathach/nxp_driver.git
38+
url = https://github.com/andrewleech/nxp_driver.git
3939
[submodule "lib/libhydrogen"]
4040
path = lib/libhydrogen
4141
url = https://github.com/jedisct1/libhydrogen.git

‎lib/nxp_driver‎

Submodule nxp_driver updated 3170 files

‎ports/mimxrt/Makefile‎

Lines changed: 80 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ include $(TOP)/py/py.mk
5151
include $(TOP)/extmod/extmod.mk
5252

5353
# Set SDK directory based on MCU_SERIES
54-
MCU_DIR = lib/nxp_driver/sdk/devices/$(MCU_SERIES)
54+
MCUX_SDK_DIR = lib/nxp_driver/sdk
55+
MCU_DIR = $(MCUX_SDK_DIR)/devices/$(MCU_SERIES)
5556

5657
# Select linker scripts based on MCU_SERIES
5758
LD_FILES = boards/$(MCU_SERIES).ld boards/common.ld
@@ -71,8 +72,6 @@ GEN_PINS_SRC = $(BUILD)/pins_gen.c
7172
INC += -I$(BOARD_DIR)
7273
INC += -I$(BUILD)
7374
INC += -I$(TOP)
74-
INC += -I$(TOP)/$(MCU_DIR)
75-
INC += -I$(TOP)/$(MCU_DIR)/drivers
7675
INC += -I$(TOP)/lib/cmsis/inc
7776
INC += -I$(TOP)/lib/oofatfs
7877
INC += -I$(TOP)/lib/tinyusb/hw
@@ -109,35 +108,38 @@ SRC_TINYUSB_C += \
109108
# All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
110109
ifeq ($(MICROPY_PY_LWIP),1)
111110
SRC_ETH_C += \
112-
$(MCU_DIR)/drivers/fsl_enet.c \
111+
$(MCUX_SDK_DIR)/drivers/enet/fsl_enet.c \
113112
hal/phy/device/phydp83825/fsl_phydp83825.c \
114113
hal/phy/device/phydp83848/fsl_phydp83848.c \
115114
hal/phy/device/phyksz8081/fsl_phyksz8081.c \
116115
hal/phy/device/phylan8720/fsl_phylan8720.c \
117116
hal/phy/device/phyrtl8211f/fsl_phyrtl8211f.c \
118117
hal/phy/mdio/enet/fsl_enet_mdio.c
118+
119+
INC_HAL_IMX += \
120+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/enet
119121
endif
120122

121123
# NXP SDK sources
122124
SRC_HAL_IMX_C += \
123125
$(MCU_DIR)/drivers/fsl_clock.c \
124-
$(MCU_DIR)/drivers/fsl_common.c \
125-
$(MCU_DIR)/drivers/fsl_dmamux.c \
126-
$(MCU_DIR)/drivers/fsl_edma.c \
127-
$(MCU_DIR)/drivers/fsl_flexram.c \
128-
$(MCU_DIR)/drivers/fsl_flexspi.c \
129-
$(MCU_DIR)/drivers/fsl_gpc.c \
130-
$(MCU_DIR)/drivers/fsl_gpio.c \
131-
$(MCU_DIR)/drivers/fsl_gpt.c \
132-
$(MCU_DIR)/drivers/fsl_lpi2c.c \
133-
$(MCU_DIR)/drivers/fsl_lpspi.c \
134-
$(MCU_DIR)/drivers/fsl_lpspi_edma.c \
135-
$(MCU_DIR)/drivers/fsl_pit.c \
136-
$(MCU_DIR)/drivers/fsl_pwm.c \
137-
$(MCU_DIR)/drivers/fsl_sai.c \
138-
$(MCU_DIR)/drivers/fsl_snvs_hp.c \
139-
$(MCU_DIR)/drivers/fsl_snvs_lp.c \
140-
$(MCU_DIR)/drivers/fsl_wdog.c \
126+
$(MCUX_SDK_DIR)/drivers/common/fsl_common.c \
127+
$(MCUX_SDK_DIR)/drivers/common/fsl_common_arm.c \
128+
$(MCUX_SDK_DIR)/drivers/dmamux/fsl_dmamux.c \
129+
$(MCUX_SDK_DIR)/drivers/edma/fsl_edma.c \
130+
$(MCUX_SDK_DIR)/drivers/flexram/fsl_flexram.c \
131+
$(MCUX_SDK_DIR)/drivers/flexspi/fsl_flexspi.c \
132+
$(MCUX_SDK_DIR)/drivers/igpio/fsl_gpio.c \
133+
$(MCUX_SDK_DIR)/drivers/gpt/fsl_gpt.c \
134+
$(MCUX_SDK_DIR)/drivers/lpi2c/fsl_lpi2c.c \
135+
$(MCUX_SDK_DIR)/drivers/lpspi/fsl_lpspi.c \
136+
$(MCUX_SDK_DIR)/drivers/lpspi/fsl_lpspi_edma.c \
137+
$(MCUX_SDK_DIR)/drivers/pit/fsl_pit.c \
138+
$(MCUX_SDK_DIR)/drivers/pwm/fsl_pwm.c \
139+
$(MCUX_SDK_DIR)/drivers/sai/fsl_sai.c \
140+
$(MCUX_SDK_DIR)/drivers/snvs_hp/fsl_snvs_hp.c \
141+
$(MCUX_SDK_DIR)/drivers/snvs_lp/fsl_snvs_lp.c \
142+
$(MCUX_SDK_DIR)/drivers/wdog01/fsl_wdog.c \
141143
$(MCU_DIR)/system_$(MCU_SERIES)$(MCU_CORE).c \
142144

143145
# Use a specific boot header for 1062 so the Teensy loader doesn't erase the filesystem.
@@ -147,39 +149,81 @@ else
147149
SRC_HAL_IMX_C += $(MCU_DIR)/xip/fsl_flexspi_nor_boot.c
148150
endif
149151

152+
INC_HAL_IMX += \
153+
-I$(TOP)/$(MCU_DIR) \
154+
-I$(TOP)/$(MCU_DIR)/drivers \
155+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/common \
156+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/dmamux \
157+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/edma \
158+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/flexram \
159+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/flexspi \
160+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/igpio \
161+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/gpt \
162+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/lpi2c \
163+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/lpspi \
164+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/lpuart \
165+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/pit \
166+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/pwm \
167+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/sai \
168+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/snvs_hp \
169+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/snvs_lp \
170+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/wdog01 \
171+
150172
ifeq ($(MICROPY_HW_SDRAM_AVAIL),1)
151-
SRC_HAL_IMX_C += $(MCU_DIR)/drivers/fsl_semc.c
173+
SRC_HAL_IMX_C += $(MCUX_SDK_DIR)/drivers/semc/fsl_semc.c
174+
INC_HAL_IMX += -I$(TOP)/$(MCUX_SDK_DIR)/drivers/semc
152175
endif
153176

154177
ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES), MIMXRT1021 MIMXRT1052 MIMXRT1062 MIMXRT1064 MIMXRT1176))
155-
SRC_HAL_IMX_C += $(MCU_DIR)/drivers/fsl_usdhc.c
178+
SRC_HAL_IMX_C += $(MCUX_SDK_DIR)/drivers/usdhc/fsl_usdhc.c
179+
INC_HAL_IMX += -I$(TOP)/$(MCUX_SDK_DIR)/drivers/usdhc
156180
endif
157181

158182
ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES), MIMXRT1015 MIMXRT1021 MIMXRT1052 MIMXRT1062 MIMXRT1064 MIMXRT1176))
159183
SRC_HAL_IMX_C += \
160-
$(MCU_DIR)/drivers/fsl_qtmr.c \
184+
$(MCUX_SDK_DIR)/drivers/qtmr_1/fsl_qtmr.c \
161185
$(MCU_DIR)/drivers/fsl_romapi.c
186+
187+
INC_HAL_IMX += -I$(TOP)/$(MCUX_SDK_DIR)/drivers/qtmr_1
162188
endif
163189

164190
ifeq ($(MCU_SERIES), MIMXRT1176)
165-
INC += -I$(TOP)/$(MCU_DIR)/drivers/cm7
166-
167191
SRC_HAL_IMX_C += \
168192
$(MCU_DIR)/drivers/cm7/fsl_cache.c \
169193
$(MCU_DIR)/drivers/fsl_dcdc.c \
170194
$(MCU_DIR)/drivers/fsl_pmu.c \
171-
$(MCU_DIR)/drivers/fsl_common_arm.c \
172195
$(MCU_DIR)/drivers/fsl_anatop_ai.c \
173-
$(MCU_DIR)/drivers/fsl_caam.c \
174-
$(MCU_DIR)/drivers/fsl_lpadc.c \
175-
$(MCU_DIR)/drivers/fsl_mu.c
196+
$(MCU_DIR)/drivers/fsl_soc_src.c \
197+
$(MCU_DIR)/drivers/fsl_gpc.c \
198+
$(MCUX_SDK_DIR)/drivers/caam/fsl_caam.c \
199+
$(MCUX_SDK_DIR)/drivers/lpadc/fsl_lpadc.c \
200+
$(MCUX_SDK_DIR)/drivers/mu/fsl_mu.c
201+
202+
INC_HAL_IMX += \
203+
-I$(TOP)/$(MCU_DIR)/drivers/cm7 \
204+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/caam \
205+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/lpadc \
206+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/mu
207+
208+
CFLAGS += -DCACHE_MODE_WRITE_THROUGH=1
176209
else
177210
SRC_HAL_IMX_C += \
178-
$(MCU_DIR)/drivers/fsl_adc.c \
179-
$(MCU_DIR)/drivers/fsl_cache.c \
180-
$(MCU_DIR)/drivers/fsl_trng.c
211+
$(MCUX_SDK_DIR)/drivers/adc_12b1msps_sar/fsl_adc.c \
212+
$(MCUX_SDK_DIR)/drivers/cache/armv7-m7/fsl_cache.c \
213+
$(MCUX_SDK_DIR)/drivers/gpc_1/fsl_gpc.c \
214+
$(MCUX_SDK_DIR)/drivers/src/fsl_src.c \
215+
$(MCUX_SDK_DIR)/drivers/trng/fsl_trng.c
216+
217+
INC_HAL_IMX += \
218+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/adc_12b1msps_sar \
219+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/cache/armv7-m7 \
220+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/gpc_1 \
221+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/src \
222+
-I$(TOP)/$(MCUX_SDK_DIR)/drivers/trng
181223
endif
182224

225+
INC += $(INC_HAL_IMX)
226+
183227
# C source files
184228
SRC_C += \
185229
board_init.c \
@@ -352,8 +396,6 @@ CFLAGS += \
352396
-DMICROPY_HW_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
353397
-DMICROPY_HW_SDRAM_AVAIL=$(MICROPY_HW_SDRAM_AVAIL) \
354398
-DMICROPY_HW_SDRAM_SIZE=$(MICROPY_HW_SDRAM_SIZE) \
355-
-DSPI_RETRY_TIMES=1000000 \
356-
-DUART_RETRY_TIMES=1000000 \
357399
-DXIP_BOOT_HEADER_ENABLE=1 \
358400
-DXIP_EXTERNAL_FLASH=1 \
359401
-fdata-sections \
@@ -497,15 +539,15 @@ $(HEADER_BUILD)/qstrdefs.generated.h: $(BOARD_DIR)/mpconfigboard.h
497539

498540
$(GEN_FLEXRAM_CONFIG_SRC):
499541
$(ECHO) "Create $@"
500-
$(Q)$(PYTHON) $(MAKE_FLEXRAM_LD) -d $(TOP)/$(MCU_DIR)/$(MCU_SERIES)$(MCU_CORE).h \
501-
-f $(TOP)/$(MCU_DIR)/$(MCU_SERIES)$(MCU_CORE)_features.h -l boards/$(MCU_SERIES).ld -c $(MCU_SERIES) > $(GEN_FLEXRAM_CONFIG_SRC)
542+
$(Q)$(PYTHON) $(MAKE_FLEXRAM_LD) -d $(MCU_DIR)/$(MCU_SERIES)$(MCU_CORE).h \
543+
-f $(MCU_DIR)/$(MCU_SERIES)$(MCU_CORE)_features.h -l boards/$(MCU_SERIES).ld -c $(MCU_SERIES) > $(GEN_FLEXRAM_CONFIG_SRC)
502544

503545
# Use a pattern rule here so that make will only call make-pins.py once to make
504546
# both pins_gen.c and pins.h
505547
$(BUILD)/%_gen.c $(HEADER_BUILD)/%.h: $(BOARD_PINS) $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
506548
$(ECHO) "Create $@"
507549
$(Q)$(PYTHON) $(MAKE_PINS) --board-csv $(BOARD_PINS) --af-csv $(AF_FILE) \
508-
--prefix $(PREFIX_FILE) --iomux "$(abspath $(TOP)/$(MCU_DIR)/drivers/fsl_iomuxc.h)" \
550+
--prefix $(PREFIX_FILE) --iomux "$(abspath $(MCU_DIR)/drivers/fsl_iomuxc.h)" \
509551
--output-source $(GEN_PINS_SRC) --output-header $(GEN_PINS_HDR)
510552

511553
include $(TOP)/py/mkrules.mk

‎ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
#define MICROPY_HW_UART_INDEX { 1, 3, 2, 6, 8 }
2222

2323
#define IOMUX_TABLE_UART \
24-
{ IOMUXC_GPIO_AD_B0_12_LPUART1_TX }, { IOMUXC_GPIO_AD_B0_13_LPUART1_RX }, \
25-
{ IOMUXC_GPIO_AD_B1_02_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RX }, \
26-
{ IOMUXC_GPIO_AD_B1_06_LPUART3_TX }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RX }, \
24+
{ IOMUXC_GPIO_AD_B0_12_LPUART1_TXD }, { IOMUXC_GPIO_AD_B0_13_LPUART1_RXD }, \
25+
{ IOMUXC_GPIO_AD_B1_02_LPUART2_TXD }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RXD }, \
26+
{ IOMUXC_GPIO_AD_B1_06_LPUART3_TXD }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RXD }, \
2727
{ 0 }, { 0 }, \
2828
{ 0 }, { 0 }, \
29-
{ IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
29+
{ IOMUXC_GPIO_AD_B0_02_LPUART6_TXD }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RXD }, \
3030
{ 0 }, { 0 }, \
31-
{ IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
31+
{ IOMUXC_GPIO_AD_B1_10_LPUART8_TXD }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RXD },
3232

3333
#define IOMUX_TABLE_UART_CTS_RTS \
3434
{ IOMUXC_GPIO_AD_B0_14_LPUART1_CTS_B }, { IOMUXC_GPIO_AD_B0_15_LPUART1_RTS_B }, \
@@ -111,22 +111,22 @@
111111
}
112112

113113
// --- SEMC --- //
114-
#define MIMXRT_IOMUXC_SEMC_DATA00 IOMUXC_GPIO_EMC_00_SEMC_DATA00
115-
#define MIMXRT_IOMUXC_SEMC_DATA01 IOMUXC_GPIO_EMC_01_SEMC_DATA01
116-
#define MIMXRT_IOMUXC_SEMC_DATA02 IOMUXC_GPIO_EMC_02_SEMC_DATA02
117-
#define MIMXRT_IOMUXC_SEMC_DATA03 IOMUXC_GPIO_EMC_03_SEMC_DATA03
118-
#define MIMXRT_IOMUXC_SEMC_DATA04 IOMUXC_GPIO_EMC_04_SEMC_DATA04
119-
#define MIMXRT_IOMUXC_SEMC_DATA05 IOMUXC_GPIO_EMC_05_SEMC_DATA05
120-
#define MIMXRT_IOMUXC_SEMC_DATA06 IOMUXC_GPIO_EMC_06_SEMC_DATA06
121-
#define MIMXRT_IOMUXC_SEMC_DATA07 IOMUXC_GPIO_EMC_07_SEMC_DATA07
122-
#define MIMXRT_IOMUXC_SEMC_DATA08 IOMUXC_GPIO_EMC_30_SEMC_DATA08
123-
#define MIMXRT_IOMUXC_SEMC_DATA09 IOMUXC_GPIO_EMC_31_SEMC_DATA09
124-
#define MIMXRT_IOMUXC_SEMC_DATA10 IOMUXC_GPIO_EMC_32_SEMC_DATA10
125-
#define MIMXRT_IOMUXC_SEMC_DATA11 IOMUXC_GPIO_EMC_33_SEMC_DATA11
126-
#define MIMXRT_IOMUXC_SEMC_DATA12 IOMUXC_GPIO_EMC_34_SEMC_DATA12
127-
#define MIMXRT_IOMUXC_SEMC_DATA13 IOMUXC_GPIO_EMC_35_SEMC_DATA13
128-
#define MIMXRT_IOMUXC_SEMC_DATA14 IOMUXC_GPIO_EMC_36_SEMC_DATA14
129-
#define MIMXRT_IOMUXC_SEMC_DATA15 IOMUXC_GPIO_EMC_37_SEMC_DATA15
114+
#define MIMXRT_IOMUXC_SEMC_DATA00 IOMUXC_GPIO_EMC_00_SEMC_DA00
115+
#define MIMXRT_IOMUXC_SEMC_DATA01 IOMUXC_GPIO_EMC_01_SEMC_DA01
116+
#define MIMXRT_IOMUXC_SEMC_DATA02 IOMUXC_GPIO_EMC_02_SEMC_DA02
117+
#define MIMXRT_IOMUXC_SEMC_DATA03 IOMUXC_GPIO_EMC_03_SEMC_DA03
118+
#define MIMXRT_IOMUXC_SEMC_DATA04 IOMUXC_GPIO_EMC_04_SEMC_DA04
119+
#define MIMXRT_IOMUXC_SEMC_DATA05 IOMUXC_GPIO_EMC_05_SEMC_DA05
120+
#define MIMXRT_IOMUXC_SEMC_DATA06 IOMUXC_GPIO_EMC_06_SEMC_DA06
121+
#define MIMXRT_IOMUXC_SEMC_DATA07 IOMUXC_GPIO_EMC_07_SEMC_DA07
122+
#define MIMXRT_IOMUXC_SEMC_DATA08 IOMUXC_GPIO_EMC_30_SEMC_DA08
123+
#define MIMXRT_IOMUXC_SEMC_DATA09 IOMUXC_GPIO_EMC_31_SEMC_DA09
124+
#define MIMXRT_IOMUXC_SEMC_DATA10 IOMUXC_GPIO_EMC_32_SEMC_DA10
125+
#define MIMXRT_IOMUXC_SEMC_DATA11 IOMUXC_GPIO_EMC_33_SEMC_DA11
126+
#define MIMXRT_IOMUXC_SEMC_DATA12 IOMUXC_GPIO_EMC_34_SEMC_DA12
127+
#define MIMXRT_IOMUXC_SEMC_DATA13 IOMUXC_GPIO_EMC_35_SEMC_DA13
128+
#define MIMXRT_IOMUXC_SEMC_DATA14 IOMUXC_GPIO_EMC_36_SEMC_DA14
129+
#define MIMXRT_IOMUXC_SEMC_DATA15 IOMUXC_GPIO_EMC_37_SEMC_DA15
130130

131131
#define MIMXRT_IOMUXC_SEMC_ADDR00 IOMUXC_GPIO_EMC_09_SEMC_ADDR00
132132
#define MIMXRT_IOMUXC_SEMC_ADDR01 IOMUXC_GPIO_EMC_10_SEMC_ADDR01

0 commit comments

Comments
 (0)