jepler/tinyuf2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #115 from adafruit/use-nxp-official-sdk

Browse source 
Use nxp official sdk
This commit is contained in:
Ha Thach 2021-04-30 00:25:10 +07:00 committed by GitHub
commit f50ac35c94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 70 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -7,9 +7,6 @@
[submodule "lib/tinyusb"]
path = lib/tinyusb
url = https://github.com/hathach/tinyusb.git
[submodule "lib/nxp"]
path = lib/nxp
url = https://github.com/hathach/nxp_driver.git
[submodule "lib/esp-idf"]
path = lib/esp-idf
url = https://github.com/espressif/esp-idf.git
@ -25,3 +22,6 @@
[submodule "lib/st/cmsis_device_f3"]
path = lib/st/cmsis_device_f3
url = https://github.com/STMicroelectronics/cmsis_device_f3.git
[submodule "lib/nxp/mcux-sdk"]
path = lib/nxp/mcux-sdk
url = https://github.com/NXPmicro/mcux-sdk.git

1
lib/nxp

@ -1 +0,0 @@
Subproject commit e649af36e724d9a8a6cd35b81a37d434a7b3d378

1
lib/nxp/mcux-sdk Submodule

@ -0,0 +1 @@
Subproject commit cb21c660991c92e90ece99ccb63a4bc611899c3a

29
ports/lpc55/Makefile
View file

@ -2,11 +2,12 @@ UF2_FAMILY_ID = 0x2abc77ec
CROSS_COMPILE = arm-none-eabi-
# List of git submodules that is included as part of the UF2 version
GIT_SUBMODULES = nxp sct_neopixel tinyusb
GIT_SUBMODULES = nxp/mcux-sdk sct_neopixel tinyusb
include ../make.mk
MCU_DIR = lib/nxp/sdk/devices/$(MCU)
SDK_DIR = lib/nxp/mcux-sdk
MCU_DIR = $(SDK_DIR)/devices/$(MCU)
LD_FILES ?= $(MCU_DIR)/gcc/$(MCU_CORE)_flash.ld
# Port Compiler Flags
@ -28,14 +29,13 @@ PORT_SRC_C += \
$(MCU_DIR)/system_$(MCU_CORE).c \
$(MCU_DIR)/project_template/clock_config.c \
$(MCU_DIR)/drivers/fsl_clock.c \
$(MCU_DIR)/drivers/fsl_common.c \
$(MCU_DIR)/drivers/fsl_iap.c \
$(MCU_DIR)/drivers/fsl_rtc.c \
$(MCU_DIR)/drivers/fsl_gpio.c \
$(MCU_DIR)/drivers/fsl_usart.c \
$(MCU_DIR)/drivers/fsl_flexcomm.c \
$(MCU_DIR)/drivers/fsl_power.c \
$(MCU_DIR)/drivers/fsl_reset.c
$(MCU_DIR)/drivers/fsl_reset.c \
$(SDK_DIR)/drivers/flexcomm/fsl_flexcomm.c \
$(SDK_DIR)/drivers/flexcomm/fsl_usart.c \
$(SDK_DIR)/drivers/iap1/fsl_iap.c \
$(SDK_DIR)/drivers/lpc_gpio/fsl_gpio.c \
$(SDK_DIR)/drivers/lpc_rtc/fsl_rtc.c \
SRC_C += \
$(PORT_SRC_C) \
@ -47,10 +47,17 @@ LIBS += $(TOP)/$(MCU_DIR)/gcc/libpower_hardabi.a
# Port include
INC += \
$(TOP)/$(MCU_DIR)/../../CMSIS/Include \
$(TOP)/$(SDK_DIR)/CMSIS/Include \
$(TOP)/$(MCU_DIR) \
$(TOP)/$(MCU_DIR)/project_template \
$(TOP)/$(MCU_DIR)/drivers \
$(TOP)/$(MCU_DIR)/project_template
$(TOP)/$(SDK_DIR)/drivers/common \
$(TOP)/$(SDK_DIR)/drivers/flexcomm \
$(TOP)/$(SDK_DIR)/drivers/iap1 \
$(TOP)/$(SDK_DIR)/drivers/lpc_gpio \
$(TOP)/$(SDK_DIR)/drivers/lpc_iocon \
$(TOP)/$(SDK_DIR)/drivers/lpc_rtc \
$(TOP)/$(SDK_DIR)/drivers/sctimer
include ../rules.mk

40
ports/mimxrt10xx/Makefile
View file

@ -2,7 +2,7 @@ UF2_FAMILY_ID = 0x4fb2d5bd
CROSS_COMPILE = arm-none-eabi-
# List of git submodules that is included as part of the UF2 version
GIT_SUBMODULES = nxp tinyusb
GIT_SUBMODULES = nxp/mcux-sdk tinyusb
# For flash-pyocd-bin target
FLASH_BIN_ADDR = $(UF2_$(MCU)_WRITE_ADDR)
@ -11,8 +11,13 @@ include ../make.mk
# TODO include port.mk
MCU_DIR = lib/nxp/sdk/devices/$(MCU)
LD_FILES ?= $(PORT_DIR)/linker/$(MCU)_ram.ld $(PORT_DIR)/linker/memory.ld $(PORT_DIR)/linker/common.ld
SDK_DIR = lib/nxp/mcux-sdk
MCU_DIR = $(SDK_DIR)/devices/$(MCU)
LD_FILES ?= \
$(PORT_DIR)/linker/$(MCU)_ram.ld \
$(PORT_DIR)/linker/memory.ld \
$(PORT_DIR)/linker/common.ld
# Port Compiler Flags
CFLAGS += \
@ -35,13 +40,13 @@ PORT_SRC_C = \
$(MCU_DIR)/system_$(MCU).c \
$(MCU_DIR)/project_template/clock_config.c \
$(MCU_DIR)/drivers/fsl_clock.c \
$(MCU_DIR)/drivers/fsl_gpio.c \
$(MCU_DIR)/drivers/fsl_common.c \
$(MCU_DIR)/drivers/fsl_ocotp.c \
$(MCU_DIR)/drivers/fsl_cache.c \
$(MCU_DIR)/drivers/fsl_pwm.c \
$(MCU_DIR)/drivers/fsl_xbara.c \
$(MCU_DIR)/drivers/fsl_lpuart.c
$(SDK_DIR)/drivers/cache/armv7-m7/fsl_cache.c \
$(SDK_DIR)/drivers/common/fsl_common.c \
$(SDK_DIR)/drivers/igpio/fsl_gpio.c \
$(SDK_DIR)/drivers/lpuart/fsl_lpuart.c \
$(SDK_DIR)/drivers/ocotp/fsl_ocotp.c \
$(SDK_DIR)/drivers/pwm/fsl_pwm.c \
$(SDK_DIR)/drivers/xbara/fsl_xbara.c \
SRC_C += \
$(PORT_SRC_C) \
@ -51,11 +56,20 @@ SRC_S += $(MCU_DIR)/gcc/startup_$(MCU).S
# Port include
INC += \
$(TOP)/$(MCU_DIR)/../../CMSIS/Include \
$(TOP)/$(SDK_DIR)/CMSIS/Include \
$(TOP)/$(MCU_DIR) \
$(TOP)/$(MCU_DIR)/drivers \
$(TOP)/$(MCU_DIR)/project_template\
$(TOP)/$(MCU_DIR)/xip \
$(TOP)/$(MCU_DIR)/project_template
$(TOP)/$(MCU_DIR)/drivers \
$(TOP)/$(SDK_DIR)/drivers/cache/armv7-m7 \
$(TOP)/$(SDK_DIR)/drivers/common \
$(TOP)/$(SDK_DIR)/drivers/igpio \
$(TOP)/$(SDK_DIR)/drivers/lpuart \
$(TOP)/$(SDK_DIR)/drivers/ocotp \
$(TOP)/$(SDK_DIR)/drivers/pwm \
$(TOP)/$(SDK_DIR)/drivers/rtwdog \
$(TOP)/$(SDK_DIR)/drivers/xbara \
$(TOP)/$(SDK_DIR)/drivers/wdog01 \
include ../rules.mk

32
ports/mimxrt10xx/port.mk
View file

@ -1,6 +1,7 @@
UF2_FAMILY_ID = 0x4fb2d5bd
MCU_DIR = lib/nxp/sdk/devices/$(MCU)
SDK_DIR = lib/nxp/mcux-sdk
MCU_DIR = $(SDK_DIR)/devices/$(MCU)
# Port Compiler Flags
CFLAGS += \
@ -23,13 +24,13 @@ SRC_C += \
$(MCU_DIR)/system_$(MCU).c \
$(MCU_DIR)/project_template/clock_config.c \
$(MCU_DIR)/drivers/fsl_clock.c \
$(MCU_DIR)/drivers/fsl_gpio.c \
$(MCU_DIR)/drivers/fsl_common.c \
$(MCU_DIR)/drivers/fsl_ocotp.c \
$(MCU_DIR)/drivers/fsl_cache.c \
$(MCU_DIR)/drivers/fsl_pwm.c \
$(MCU_DIR)/drivers/fsl_xbara.c \
$(MCU_DIR)/drivers/fsl_lpuart.c
$(SDK_DIR)/drivers/cache/armv7-m7/fsl_cache.c \
$(SDK_DIR)/drivers/common/fsl_common.c \
$(SDK_DIR)/drivers/igpio/fsl_gpio.c \
$(SDK_DIR)/drivers/lpuart/fsl_lpuart.c \
$(SDK_DIR)/drivers/ocotp/fsl_ocotp.c \
$(SDK_DIR)/drivers/pwm/fsl_pwm.c \
$(SDK_DIR)/drivers/xbara/fsl_xbara.c \
ifndef BUILD_NO_TINYUSB
SRC_C += lib/tinyusb/src/portable/nxp/transdimension/dcd_transdimension.c
@ -41,8 +42,17 @@ SRC_S += $(MCU_DIR)/gcc/startup_$(MCU).S
INC += \
$(TOP)/$(PORT_DIR) \
$(TOP)/$(BOARD_DIR) \
$(TOP)/$(MCU_DIR)/../../CMSIS/Include \
$(TOP)/$(SDK_DIR)/CMSIS/Include \
$(TOP)/$(MCU_DIR) \
$(TOP)/$(MCU_DIR)/drivers \
$(TOP)/$(MCU_DIR)/project_template \
$(TOP)/$(MCU_DIR)/xip \
$(TOP)/$(MCU_DIR)/project_template
$(TOP)/$(MCU_DIR)/drivers \
$(TOP)/$(SDK_DIR)/drivers/cache/armv7-m7 \
$(TOP)/$(SDK_DIR)/drivers/common \
$(TOP)/$(SDK_DIR)/drivers/igpio \
$(TOP)/$(SDK_DIR)/drivers/lpuart \
$(TOP)/$(SDK_DIR)/drivers/ocotp \
$(TOP)/$(SDK_DIR)/drivers/pwm \
$(TOP)/$(SDK_DIR)/drivers/rtwdog \
$(TOP)/$(SDK_DIR)/drivers/xbara \
$(TOP)/$(SDK_DIR)/drivers/wdog01 \