Jacob Alexander
9 years ago
3 changed files with 11 additions and 8 deletions
+ 3
- 0
Lib/CMake/arm.cmake
View File
| @@ -89,18 +89,21 @@ message( "${COMPILER_SRCS}" ) | |||
| #| USB Defines, this is how the loader programs detect which type of chip base is used | |||
| message( STATUS "Bootloader Type:" ) | |||
| if ( "${CHIP}" MATCHES "mk20dx128vlf5" ) | |||
| set( VENDOR_ID "0x1C11" ) | |||
| set( PRODUCT_ID "0xB04D" ) | |||
| set( BOOT_VENDOR_ID "0x1C11" ) | |||
| set( BOOT_PRODUCT_ID "0xB007" ) | |||
| set( DFU 1 ) | |||
| message( "dfu" ) | |||
| elseif ( "${CHIP}" MATCHES "mk20dx128" OR "${CHIP}" MATCHES "mk20dx256" ) | |||
| set( VENDOR_ID "0x1C11" ) | |||
| set( PRODUCT_ID "0xB04D" ) | |||
| set( BOOT_VENDOR_ID "0x16c0" ) # TODO Double check, this is likely incorrect | |||
| set( BOOT_PRODUCT_ID "0x0487" ) | |||
| set( TEENSY 1 ) | |||
| message( "Teensy" ) | |||
| endif () | |||
+ 6
- 8
Lib/CMake/avr.cmake
View File
| @@ -36,10 +36,6 @@ message( STATUS "MCU Selected:" ) | |||
| message( "${MCU}" ) | |||
| #| Indicate to later build step that this is a Teensy | |||
| set( Teensy ) | |||
| #| Chip Size Database | |||
| #| Teensy 1.0 | |||
| if ( "${CHIP}" MATCHES "at90usb162" ) | |||
| @@ -67,10 +63,6 @@ else () | |||
| endif () | |||
| #| Only Teensy based AVRs supported | |||
| set ( TEENSY 1 ) | |||
| #| Extra Compiler Sources | |||
| #| Mostly for convenience functions like interrupt handlers | |||
| set( COMPILER_SRCS | |||
| @@ -94,6 +86,12 @@ set( BOOT_VENDOR_ID "0x16C0" ) # TODO Double check, this is likely incorrect | |||
| set( BOOT_PRODUCT_ID "0x047D" ) | |||
| #| Only Teensy based AVRs supported | |||
| set ( TEENSY 1 ) | |||
| message( STATUS "Bootloader Type:" ) | |||
| message( "Teensy" ) | |||
| #| Compiler flag to set the C Standard level. | |||
| #| c89 = "ANSI" C | |||
| #| gnu89 = c89 plus GCC extensions | |||
+ 2
- 0
Lib/CMake/kll.cmake
View File
| @@ -19,6 +19,8 @@ if ( "${MacroModule}" STREQUAL "PartialMap" ) | |||
| # KLL Installation (Make sure repo has been cloned) | |||
| # | |||
| message ( STATUS "Checking for latest kll version:" ) | |||
| if ( NOT EXISTS "${PROJECT_SOURCE_DIR}/kll/kll.py" ) | |||
| # Make sure git is available | |||
| find_package ( Git REQUIRED ) | |||