From f19da3e183e4a755c66b514cdf8b1eb2804dab17 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Wed, 10 Jun 2020 22:07:11 +0200 Subject: [PATCH] replace file names to use MIMXRT1062 --- demos/MIMXRT1062/RT-TEENSY4_1/Makefile | 8 +++--- demos/MIMXRT1062/RT-TEENSY4_1/mcuconf.h | 2 +- .../compilers/GCC/mk/startup_MIMXRT1062.mk | 6 ++-- .../ARMCMx/devices/MIMXRT1062/cmparams.h | 2 +- os/hal/boards/PJRC_TEENSY_4_1/board.c | 2 +- os/hal/boards/PJRC_TEENSY_4_1/board.h | 10 ++++--- os/hal/boards/PJRC_TEENSY_4_1/board.mk | 4 +-- os/hal/ports/MIMXRT1062/LLD/GPIOv1/driver.mk | 6 ++-- os/hal/ports/MIMXRT1062/LLD/UARTv1/driver.mk | 6 ++-- .../ports/MIMXRT1062/MIMXRT1062/platform.mk | 28 +++++++++---------- 10 files changed, 38 insertions(+), 36 deletions(-) diff --git a/demos/MIMXRT1062/RT-TEENSY4_1/Makefile b/demos/MIMXRT1062/RT-TEENSY4_1/Makefile index 6a2d08d9..fbe64db3 100644 --- a/demos/MIMXRT1062/RT-TEENSY4_1/Makefile +++ b/demos/MIMXRT1062/RT-TEENSY4_1/Makefile @@ -91,11 +91,11 @@ CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib # Licensing files. include $(CHIBIOS)/os/license/license.mk # Startup files. -include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_MK66F18.mk +include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_MIMXRT1062.mk # HAL-OSAL files (optional). include $(CHIBIOS_CONTRIB)/os/hal/hal.mk -include $(CHIBIOS_CONTRIB)/os/hal/ports/KINETIS/MK66F18/platform.mk -include $(CHIBIOS_CONTRIB)/os/hal/boards/PJRC_TEENSY_3_6/board.mk +include $(CHIBIOS_CONTRIB)/os/hal/ports/MIMXRT1062/MIMXRT1062/platform.mk +include $(CHIBIOS_CONTRIB)/os/hal/boards/PJRC_TEENSY_4_1/board.mk include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk @@ -106,7 +106,7 @@ include $(CHIBIOS)/test/rt/rt_test.mk include $(CHIBIOS)/test/oslib/oslib_test.mk # Define linker script file here -LDSCRIPT= $(STARTUPLD_CONTRIB)/MK66FX1M0.ld +LDSCRIPT= $(STARTUPLD_CONTRIB)/MIMXRT1062.ld # C sources that can be compiled in ARM or THUMB mode depending on the global # setting. diff --git a/demos/MIMXRT1062/RT-TEENSY4_1/mcuconf.h b/demos/MIMXRT1062/RT-TEENSY4_1/mcuconf.h index 31995ff1..8712b157 100644 --- a/demos/MIMXRT1062/RT-TEENSY4_1/mcuconf.h +++ b/demos/MIMXRT1062/RT-TEENSY4_1/mcuconf.h @@ -17,7 +17,7 @@ #ifndef _MCUCONF_H_ #define _MCUCONF_H_ -#define MK66FX1M0_MCUCONF +#define MIMXRT1062_MCUCONF /* * HAL driver system settings. diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_MIMXRT1062.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_MIMXRT1062.mk index 5fc58b15..28f2fe10 100644 --- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_MIMXRT1062.mk +++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_MIMXRT1062.mk @@ -1,14 +1,14 @@ -# List of the ChibiOS generic MK66F18 startup and CMSIS files. +# List of the ChibiOS generic MIMXRT1062 startup and CMSIS files. STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S \ $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.S STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld \ - $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/MK66F18 \ + $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/MIMXRT1062 \ $(CHIBIOS)/os/common/ext/CMSIS/include \ $(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include \ - $(CHIBIOS_CONTRIB)/os/common/ext/CMSIS/KINETIS + $(CHIBIOS_CONTRIB)/os/common/ext/CMSIS/MIMXRT1062 STARTUPLD = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld STARTUPLD_CONTRIB = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld diff --git a/os/common/startup/ARMCMx/devices/MIMXRT1062/cmparams.h b/os/common/startup/ARMCMx/devices/MIMXRT1062/cmparams.h index 75cb24a9..c11b017b 100644 --- a/os/common/startup/ARMCMx/devices/MIMXRT1062/cmparams.h +++ b/os/common/startup/ARMCMx/devices/MIMXRT1062/cmparams.h @@ -67,7 +67,7 @@ /* Including the device CMSIS header. Note, we are not using the definitions from this header because we need this file to be usable also from assembler source files. We verify that the info matches instead.*/ -#include "MK66F18.h" +#include "MIMXRT1062.h" #if CORTEX_PRIORITY_BITS != __NVIC_PRIO_BITS #error "CMSIS __NVIC_PRIO_BITS mismatch" diff --git a/os/hal/boards/PJRC_TEENSY_4_1/board.c b/os/hal/boards/PJRC_TEENSY_4_1/board.c index e59f4ae2..a3a31114 100644 --- a/os/hal/boards/PJRC_TEENSY_4_1/board.c +++ b/os/hal/boards/PJRC_TEENSY_4_1/board.c @@ -205,7 +205,7 @@ const PALConfig pal_default_config = */ void __early_init(void) { - MK66F18_clock_init(); + MIMXRT1062_clock_init(); } /** diff --git a/os/hal/boards/PJRC_TEENSY_4_1/board.h b/os/hal/boards/PJRC_TEENSY_4_1/board.h index 0607d56f..9d6049d3 100644 --- a/os/hal/boards/PJRC_TEENSY_4_1/board.h +++ b/os/hal/boards/PJRC_TEENSY_4_1/board.h @@ -24,11 +24,13 @@ /* * Board identifier. */ -#define BOARD_PJRC_TEENSY_3_6 -#define BOARD_NAME "PJRC Teensy 3.6" +#define BOARD_PJRC_TEENSY_4_1 +#define BOARD_NAME "PJRC Teensy 4.1" + +// TODO: correct clock values /* External 16 MHz crystal */ -#define KINETIS_XTAL_FREQUENCY 16000000UL +#define KINETIS_XTAL_FREQUENCY 16000000UL /* Use internal capacitors for the crystal */ #define KINETIS_BOARD_OSCILLATOR_SETTING OSC0_CR_SC8P_SET(1) | OSC0_CR_SC2P_SET(1) | OSC0_CR_ERCLKEN_SET(1) @@ -36,7 +38,7 @@ /* * MCU type */ -#define MK66F18 +#define MIMXRT1062 /* * IO pins assignments. diff --git a/os/hal/boards/PJRC_TEENSY_4_1/board.mk b/os/hal/boards/PJRC_TEENSY_4_1/board.mk index 0424c4d6..6cc3ba8e 100644 --- a/os/hal/boards/PJRC_TEENSY_4_1/board.mk +++ b/os/hal/boards/PJRC_TEENSY_4_1/board.mk @@ -1,8 +1,8 @@ # List of all the board related files. -BOARDSRC = ${CHIBIOS_CONTRIB}/os/hal/boards/PJRC_TEENSY_3_6/board.c +BOARDSRC = ${CHIBIOS_CONTRIB}/os/hal/boards/PJRC_TEENSY_4_1/board.c # Required include directories -BOARDINC = ${CHIBIOS_CONTRIB}/os/hal/boards/PJRC_TEENSY_3_6 +BOARDINC = ${CHIBIOS_CONTRIB}/os/hal/boards/PJRC_TEENSY_4_1 # Shared variables ALLCSRC += $(BOARDSRC) diff --git a/os/hal/ports/MIMXRT1062/LLD/GPIOv1/driver.mk b/os/hal/ports/MIMXRT1062/LLD/GPIOv1/driver.mk index 1e9aca0e..ac0b5f45 100644 --- a/os/hal/ports/MIMXRT1062/LLD/GPIOv1/driver.mk +++ b/os/hal/ports/MIMXRT1062/LLD/GPIOv1/driver.mk @@ -1,9 +1,9 @@ ifeq ($(USE_SMART_BUILD),yes) ifneq ($(findstring HAL_USE_PAL TRUE,$(HALCONF)),) -PLATFORMSRC_CONTRIB += ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/GPIOv1/hal_pal_lld.c +PLATFORMSRC_CONTRIB += ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/GPIOv1/hal_pal_lld.c endif else -PLATFORMSRC_CONTRIB += ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/GPIOv1/hal_pal_lld.c +PLATFORMSRC_CONTRIB += ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/GPIOv1/hal_pal_lld.c endif -PLATFORMINC_CONTRIB += ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/GPIOv1 +PLATFORMINC_CONTRIB += ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/GPIOv1 diff --git a/os/hal/ports/MIMXRT1062/LLD/UARTv1/driver.mk b/os/hal/ports/MIMXRT1062/LLD/UARTv1/driver.mk index e0ba6601..74568762 100644 --- a/os/hal/ports/MIMXRT1062/LLD/UARTv1/driver.mk +++ b/os/hal/ports/MIMXRT1062/LLD/UARTv1/driver.mk @@ -1,9 +1,9 @@ ifeq ($(USE_SMART_BUILD),yes) ifneq ($(findstring HAL_USE_SERIAL TRUE,$(HALCONF)),) -PLATFORMSRC_CONTRIB += ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/UARTv1/hal_serial_lld.c +PLATFORMSRC_CONTRIB += ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/UARTv1/hal_serial_lld.c endif else -PLATFORMSRC_CONTRIB += ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/UARTv1/hal_serial_lld.c +PLATFORMSRC_CONTRIB += ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/UARTv1/hal_serial_lld.c endif -PLATFORMINC_CONTRIB += ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/UARTv1 +PLATFORMINC_CONTRIB += ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/UARTv1 diff --git a/os/hal/ports/MIMXRT1062/MIMXRT1062/platform.mk b/os/hal/ports/MIMXRT1062/MIMXRT1062/platform.mk index ce16bd5e..68bd2214 100644 --- a/os/hal/ports/MIMXRT1062/MIMXRT1062/platform.mk +++ b/os/hal/ports/MIMXRT1062/MIMXRT1062/platform.mk @@ -1,10 +1,10 @@ PLATFORMSRC_CONTRIB := ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \ - ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/MK66F18/hal_lld.c \ - ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/PITv1/hal_st_lld.c + ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/MIMXRT1062/hal_lld.c \ + ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/PITv1/hal_st_lld.c PLATFORMINC_CONTRIB := ${CHIBIOS}/os/hal/ports/common/ARMCMx \ - ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD \ - ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/MK66F18 + ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD \ + ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/MIMXRT1062 ifeq ($(USE_SMART_BUILD),yes) @@ -17,16 +17,16 @@ HALCONF := $(strip $(shell cat $(CONFDIR)/halconf.h $(CONFDIR)/halconf_community endif -include ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/GPIOv1/driver.mk -include ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/UARTv1/driver.mk -include ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/SPIv1/driver.mk -include ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/I2Cv1/driver.mk -include ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/PORTv1/driver.mk -include ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/ADCv1/driver.mk -include ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/PITv1/driver.mk -include ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/SDHCv1/driver.mk -include ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/FTMv1/driver.mk -include ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/USBHSv1/driver.mk +include ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/GPIOv1/driver.mk +include ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/UARTv1/driver.mk +include ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/SPIv1/driver.mk +include ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/I2Cv1/driver.mk +include ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/PORTv1/driver.mk +include ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/ADCv1/driver.mk +include ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/PITv1/driver.mk +include ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/SDHCv1/driver.mk +include ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/FTMv1/driver.mk +include ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/USBHSv1/driver.mk # Shared variables ALLCSRC += $(PLATFORMSRC_CONTRIB)