Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit f681138

Browse files
committed
change the cmake rule, make it support RT1062 Series.
1 parent 6f9693f commit f681138

File tree

6 files changed

+30
-24
lines changed

6 files changed

+30
-24
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ mkdir -p examples/Blink
2727
touch examples/Blink/Blink.ino #You can write your own arduino code here
2828
mkdir build && cd build
2929
# Make sure you cross-compile the toolchain with the correct path
30-
cmake .. -DPROJ=Blink -DTOOLCHAIN=/opt/gcc-arm-none-eabi-8.2/bin -DBOARD=arch_mix -DMCU=MIMXRT1052
30+
cmake .. -DPROJ=Blink -DTOOLCHAIN=~/gcc-arm-none-eabi/bin -DBOARD=arch_mix -DCPU=MIMXRT1062DVL6B
3131
```
3232
## Add the imxrt-based board to the platformIO
3333

cores/arduino/USBCDC.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "RingBuffer.h"
3434
#include "fsl_lpuart.h"
3535
#include "board.h"
36-
#include "system_MIMXRT1052.h"
3736
#include "HardwareSerial.h"
3837

3938
class USBCDC : public HardwareSerial

cores/arduino/Uart.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "RingBuffer.h"
3434
#include "fsl_lpuart.h"
3535
#include "board.h"
36-
#include "system_MIMXRT1052.h"
3736
#include "HardwareSerial.h"
3837

3938
class UART : public HardwareSerial

cores/arduino/wiring.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "Arduino.h"
2828
#include "clock_config.h"
2929
#include "board.h"
30-
#include "system_MIMXRT1052.h"
3130
#include "fsl_adc.h"
3231
#include "fsl_xbara.h"
3332
#include "fsl_pwm.h"

sdk.cmake

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
add_lib_files(${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}/drivers/*.c)
1+
IF(${CPU} MATCHES "MIMXRT1052.*")
2+
set(SDK "MIMXRT1052")
3+
ELSEIF(${CPU} MATCHES "MIMXRT1062.*")
4+
MESSAGE(${CPU})
5+
set(SDK "MIMXRT1062")
6+
ELSE()
7+
MESSAGE(FATAL_ERROR "Unsupported CPU!")
8+
ENDIF()
9+
MESSAGE(${SDK})
10+
add_lib_files(${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}/drivers/*.c)
211
set(fsl_bsp_drivers_files ${LIB_FILES})
312
set(LIB_FILES "" CACHE STRING "Lib Files" FORCE)
413

@@ -9,16 +18,16 @@ set(LIB_FILES "" CACHE STRING "Lib Files" FORCE)
918
add_library(fsl_xip_drivers STATIC ${fsl_xip_drivers_files})
1019
target_include_directories(fsl_xip_drivers PUBLIC
1120
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/CMSIS/Include
12-
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}
13-
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}/drivers
21+
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}
22+
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}/drivers
1423
${CMAKE_CURRENT_SOURCE_DIR}/cores/arduino
1524
)
1625

1726

1827
add_lib_files(${CMAKE_CURRENT_SOURCE_DIR}/cores/USB/*.c
1928
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/middleware/usb/*.c
20-
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}/utilities/debug_console/*.c
21-
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}/utilities/str/*.c
29+
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}/utilities/debug_console/*.c
30+
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}/utilities/str/*.c
2231
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/components/serial_manager/serial_manager.c
2332
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/components/serial_manager/serial_port_uart.c
2433
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/components/uart/*.c
@@ -28,31 +37,31 @@ set(LIB_FILES "" CACHE STRING "Lib Files" FORCE)
2837
add_library(fsl_usb_drivers STATIC ${fsl_usb_drivers_files})
2938
target_include_directories(fsl_usb_drivers PUBLIC
3039
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/CMSIS/Include
31-
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}
32-
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}/drivers
40+
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}
41+
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}/drivers
3342
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/middleware/usb/include
3443
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/middleware/usb/osa
3544
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/middleware/usb/device
3645
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/middleware/usb/phy
3746
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/middleware/usb/host
38-
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}/utilities/debug_console
39-
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}/utilities/str
47+
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}/utilities/debug_console
48+
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}/utilities/str
4049
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/components/serial_manager
4150
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/components/uart
4251
${CMAKE_CURRENT_SOURCE_DIR}/cores/arduino/USB
4352
${CMAKE_CURRENT_SOURCE_DIR}/cores/arduino
4453
)
4554

4655
add_library(fsl_bsp STATIC ${fsl_bsp_drivers_files}
47-
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}/system_${MCU}.c
56+
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}/system_${SDK}.c
4857
)
4958
target_include_directories(fsl_bsp PUBLIC
5059
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/CMSIS/Include
51-
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}
52-
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}/drivers
53-
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}/xip
54-
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}/utilities/str
55-
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}/utilities/debug_console
60+
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}
61+
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}/drivers
62+
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}/xip
63+
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}/utilities/str
64+
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}/utilities/debug_console
5665
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/components/uart
5766
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/components/serial_manager
5867
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/components/lists
@@ -68,14 +77,14 @@ add_library(arduinocore STATIC ${arduinocore_files})
6877
target_include_directories(arduinocore PUBLIC
6978
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/CMSIS/Include
7079
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices
71-
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}
72-
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}/drivers
80+
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}
81+
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}/drivers
7382
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/middleware/usb/include
7483
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/middleware/usb/osa
7584
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/middleware/usb/device
7685
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/middleware/usb/phy
7786
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/middleware/usb/host
78-
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${MCU}/utilities/debug_console
87+
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/devices/${SDK}/utilities/debug_console
7988
${CMAKE_CURRENT_SOURCE_DIR}/tools/sdk/components/serial_manager
8089
${CMAKE_CURRENT_SOURCE_DIR}/cores/arduino/USB
8190
${CMAKE_CURRENT_SOURCE_DIR}/cores/arduino

tools/cmake/compile-flags.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ add_compile_flags(LD
22
-DXIP_EXTERNAL_FLASH=1
33
-DXIP_BOOT_HEADER_ENABLE=1
44
-DNDEBUG
5-
-DCPU_MIMXRT1052DVL6B
5+
-DCPU_${CPU}
66
-Os
77
-Wall
88
-fno-common
@@ -39,9 +39,9 @@ add_compile_flags(BOTH
3939
--param max-inline-insns-single=500
4040
-MMD -MP
4141
-DNDEBUG
42+
-DCPU_${CPU}
4243
-DXIP_EXTERNAL_FLASH=1
4344
-DXIP_BOOT_HEADER_ENABLE=1
44-
-DCPU_MIMXRT1052DVL6B
4545
-DUSB_STACK_BM
4646
-DARDUINO_MAIN=1
4747
-mthumb -mapcs -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16

0 commit comments

Comments
 (0)