Merge branch 'master' into ncm

2021-01-03 15:12:02 -07:00
parent 226efdcec0 e79a7b9152
commit 57058e33fc
102 changed files with 9607 additions and 2900 deletions
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -28,7 +28,7 @@
 #define _TUSB_OPTION_H_

 #define TUSB_VERSION_MAJOR     0
-#define TUSB_VERSION_MINOR     5
+#define TUSB_VERSION_MINOR     7
 #define TUSB_VERSION_REVISION  0
 #define TUSB_VERSION_STRING    TU_STRING(TUSB_VERSION_MAJOR) "." TU_STRING(TUSB_VERSION_MINOR) "." TU_STRING(TUSB_VERSION_REVISION)

@@ -97,6 +97,10 @@
 // Dialog
 #define OPT_MCU_DA1469X          1000 ///< Dialog Semiconductor DA1469x

+// NXP Kinetis
+#define OPT_MCU_MKL25ZXX         1100 ///< NXP MKL25Zxx
+
+
 /** @} */

 /** \defgroup group_supported_os Supported RTOS