summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/reference/supported.rst2
-rw-r--r--hw/bsp/board_mcu.h14
-rw-r--r--hw/bsp/kinetis_k32/boards/frdm_k32l2a4s/board.h (renamed from hw/bsp/kinetis/boards/frdm_k32l2a4s/board.h)0
-rw-r--r--hw/bsp/kinetis_k32/boards/frdm_k32l2a4s/board.mk (renamed from hw/bsp/kinetis/boards/frdm_k32l2a4s/board.mk)6
-rw-r--r--hw/bsp/kinetis_k32/boards/frdm_k32l2a4s/frdm_k32l2a4s.c (renamed from hw/bsp/kinetis/boards/frdm_k32l2a4s/frdm_k32l2a4s.c)0
-rw-r--r--hw/bsp/kinetis_k32/boards/frdm_k32l2b/board.h (renamed from hw/bsp/kinetis/boards/frdm_k32l2b/board.h)0
-rw-r--r--hw/bsp/kinetis_k32/boards/frdm_k32l2b/board.mk (renamed from hw/bsp/kinetis/boards/frdm_k32l2b/board.mk)6
-rw-r--r--hw/bsp/kinetis_k32/boards/frdm_k32l2b/frdm_k32l2b.c (renamed from hw/bsp/kinetis/boards/frdm_k32l2b/frdm_k32l2b.c)0
-rw-r--r--hw/bsp/kinetis_k32/boards/kuiic/K32L2B31xxxxA_flash.ld (renamed from hw/bsp/kuiic/K32L2B31xxxxA_flash.ld)0
-rw-r--r--hw/bsp/kinetis_k32/boards/kuiic/board.h (renamed from hw/bsp/kuiic/board.h)0
-rw-r--r--hw/bsp/kinetis_k32/boards/kuiic/board.mk26
-rw-r--r--hw/bsp/kinetis_k32/boards/kuiic/kuiic.c (renamed from hw/bsp/kuiic/kuiic.c)2
-rw-r--r--hw/bsp/kinetis_k32/family.mk (renamed from hw/bsp/kinetis/family.mk)28
-rw-r--r--hw/bsp/kinetis_kl/boards/frdm_kl25z/board.mk (renamed from hw/bsp/kinetis/boards/frdm_kl25z/board.mk)11
-rw-r--r--hw/bsp/kinetis_kl/boards/frdm_kl25z/frdm_kl25z.c (renamed from hw/bsp/kinetis/boards/frdm_kl25z/frdm_kl25z.c)0
-rw-r--r--hw/bsp/kinetis_kl/family.mk37
-rw-r--r--hw/bsp/kuiic/board.mk52
-rw-r--r--src/common/tusb_mcu.h2
-rw-r--r--src/portable/nxp/khci/hcd_khci.c15
-rw-r--r--src/tusb_option.h8
20 files changed, 98 insertions, 111 deletions
diff --git a/docs/reference/supported.rst b/docs/reference/supported.rst
index b1e0c0a68..a5d055893 100644
--- a/docs/reference/supported.rst
+++ b/docs/reference/supported.rst
@@ -253,7 +253,7 @@ Kinetis
^^^^^^^
- `Freedom FRDM-KL25Z <https://www.nxp.com/design/development-boards/freedom-development-boards/mcu-boards/freedom-development-platform-for-kinetis-kl14-kl15-kl24-kl25-mcus:FRDM-KL25Z>`__
-- `Freedom FRDM-K32L2A <https://www.nxp.com/design/development-boards/freedom-development-boards/mcu-boards/nxp-freedom-platform-for-k32-l2a-mcus:FRDM-K32L2A4S>`__
+- `Freedom FRDM-K32L2A4S <https://www.nxp.com/design/development-boards/freedom-development-boards/mcu-boards/nxp-freedom-platform-for-k32-l2a-mcus:FRDM-K32L2A4S>`__
- `Freedom FRDM-K32L2B3 <https://www.nxp.com/design/development-boards/freedom-development-boards/mcu-boards/nxp-freedom-development-platform-for-k32-l2b-mcus:FRDM-K32L2B3>`__
- `KUIIC <https://github.com/nxf58843/kuiic>`__
diff --git a/hw/bsp/board_mcu.h b/hw/bsp/board_mcu.h
index 920e7d0d9..cd195a19b 100644
--- a/hw/bsp/board_mcu.h
+++ b/hw/bsp/board_mcu.h
@@ -39,15 +39,15 @@
//--------------------------------------------------------------------+
// Include order follows OPT_MCU_ number
-#if CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_MCU_LPC13XX || \
- CFG_TUSB_MCU == OPT_MCU_LPC15XX || CFG_TUSB_MCU == OPT_MCU_LPC175X_6X || \
- CFG_TUSB_MCU == OPT_MCU_LPC177X_8X || CFG_TUSB_MCU == OPT_MCU_LPC18XX || \
- CFG_TUSB_MCU == OPT_MCU_LPC40XX || CFG_TUSB_MCU == OPT_MCU_LPC43XX
+#if TU_CHECK_MCU(OPT_MCU_LPC11UXX, OPT_MCU_LPC13XX, OPT_MCU_LPC15XX) || \
+ TU_CHECK_MCU(OPT_MCU_LPC175X_6X, OPT_MCU_LPC177X_8X, OPT_MCU_LPC18XX) || \
+ TU_CHECK_MCU(OPT_MCU_LPC40XX, OPT_MCU_LPC43XX)
#include "chip.h"
-#elif CFG_TUSB_MCU == OPT_MCU_LPC51UXX || CFG_TUSB_MCU == OPT_MCU_LPC54XXX || \
- CFG_TUSB_MCU == OPT_MCU_LPC55XX || CFG_TUSB_MCU == OPT_MCU_MKL25ZXX || \
- CFG_TUSB_MCU == OPT_MCU_K32L2AXX || OPT_MCU_K32L2BXX
+#elif TU_CHECK_MCU(OPT_MCU_LPC51UXX, OPT_MCU_LPC54XXX, OPT_MCU_LPC55XX)
+ #include "fsl_device_registers.h"
+
+#elif TU_CHECK_MCU(OPT_MCU_KINETIS_KL, OPT_MCU_KINETIS_K32)
#include "fsl_device_registers.h"
#elif CFG_TUSB_MCU == OPT_MCU_NRF5X
diff --git a/hw/bsp/kinetis/boards/frdm_k32l2a4s/board.h b/hw/bsp/kinetis_k32/boards/frdm_k32l2a4s/board.h
index b1f38c997..b1f38c997 100644
--- a/hw/bsp/kinetis/boards/frdm_k32l2a4s/board.h
+++ b/hw/bsp/kinetis_k32/boards/frdm_k32l2a4s/board.h
diff --git a/hw/bsp/kinetis/boards/frdm_k32l2a4s/board.mk b/hw/bsp/kinetis_k32/boards/frdm_k32l2a4s/board.mk
index 723fb3893..d96ab58b8 100644
--- a/hw/bsp/kinetis/boards/frdm_k32l2a4s/board.mk
+++ b/hw/bsp/kinetis_k32/boards/frdm_k32l2a4s/board.mk
@@ -1,11 +1,8 @@
-SDK_DIR = hw/mcu/nxp/mcux-sdk
MCU = K32L2A41A
-MCU_DIR = $(SDK_DIR)/devices/$(MCU)
CFLAGS += \
-mcpu=cortex-m0plus \
-DCPU_K32L2A41VLH1A \
- -DCFG_TUSB_MCU=OPT_MCU_K32L2AXX
# mcu driver cause following warnings
CFLAGS += -Wno-error=unused-parameter -Wno-error=redundant-decls -Wno-error=cast-qual
@@ -13,6 +10,9 @@ CFLAGS += -Wno-error=unused-parameter -Wno-error=redundant-decls -Wno-error=cast
# All source paths should be relative to the top level.
LD_FILE = $(MCU_DIR)/gcc/K32L2A41xxxxA_flash.ld
+SRC_C += \
+ $(MCU_DIR)/project_template/clock_config.c \
+
# For freeRTOS port source
FREERTOS_PORTABLE_SRC = $(FREERTOS_PORTABLE_PATH)/ARM_CM0
diff --git a/hw/bsp/kinetis/boards/frdm_k32l2a4s/frdm_k32l2a4s.c b/hw/bsp/kinetis_k32/boards/frdm_k32l2a4s/frdm_k32l2a4s.c
index 80830163b..80830163b 100644
--- a/hw/bsp/kinetis/boards/frdm_k32l2a4s/frdm_k32l2a4s.c
+++ b/hw/bsp/kinetis_k32/boards/frdm_k32l2a4s/frdm_k32l2a4s.c
diff --git a/hw/bsp/kinetis/boards/frdm_k32l2b/board.h b/hw/bsp/kinetis_k32/boards/frdm_k32l2b/board.h
index 8d21fdcd4..8d21fdcd4 100644
--- a/hw/bsp/kinetis/boards/frdm_k32l2b/board.h
+++ b/hw/bsp/kinetis_k32/boards/frdm_k32l2b/board.h
diff --git a/hw/bsp/kinetis/boards/frdm_k32l2b/board.mk b/hw/bsp/kinetis_k32/boards/frdm_k32l2b/board.mk
index 66d408c67..5f8ecbfe4 100644
--- a/hw/bsp/kinetis/boards/frdm_k32l2b/board.mk
+++ b/hw/bsp/kinetis_k32/boards/frdm_k32l2b/board.mk
@@ -1,11 +1,8 @@
-SDK_DIR = hw/mcu/nxp/mcux-sdk
MCU = K32L2B31A
-MCU_DIR = $(SDK_DIR)/devices/$(MCU)
CFLAGS += \
-mcpu=cortex-m0plus \
-DCPU_K32L2B31VLH0A \
- -DCFG_TUSB_MCU=OPT_MCU_K32L2BXX
# mcu driver cause following warnings
CFLAGS += -Wno-error=unused-parameter -Wno-error=redundant-decls
@@ -13,6 +10,9 @@ CFLAGS += -Wno-error=unused-parameter -Wno-error=redundant-decls
# All source paths should be relative to the top level.
LD_FILE = $(MCU_DIR)/gcc/K32L2B31xxxxA_flash.ld
+SRC_C += \
+ $(MCU_DIR)/project_template/clock_config.c \
+
# For freeRTOS port source
FREERTOS_PORTABLE_SRC = $(FREERTOS_PORTABLE_PATH)/ARM_CM0
diff --git a/hw/bsp/kinetis/boards/frdm_k32l2b/frdm_k32l2b.c b/hw/bsp/kinetis_k32/boards/frdm_k32l2b/frdm_k32l2b.c
index 1566b4e2e..1566b4e2e 100644
--- a/hw/bsp/kinetis/boards/frdm_k32l2b/frdm_k32l2b.c
+++ b/hw/bsp/kinetis_k32/boards/frdm_k32l2b/frdm_k32l2b.c
diff --git a/hw/bsp/kuiic/K32L2B31xxxxA_flash.ld b/hw/bsp/kinetis_k32/boards/kuiic/K32L2B31xxxxA_flash.ld
index f478a99c7..f478a99c7 100644
--- a/hw/bsp/kuiic/K32L2B31xxxxA_flash.ld
+++ b/hw/bsp/kinetis_k32/boards/kuiic/K32L2B31xxxxA_flash.ld
diff --git a/hw/bsp/kuiic/board.h b/hw/bsp/kinetis_k32/boards/kuiic/board.h
index 1e2d4f18b..1e2d4f18b 100644
--- a/hw/bsp/kuiic/board.h
+++ b/hw/bsp/kinetis_k32/boards/kuiic/board.h
diff --git a/hw/bsp/kinetis_k32/boards/kuiic/board.mk b/hw/bsp/kinetis_k32/boards/kuiic/board.mk
new file mode 100644
index 000000000..29a12e982
--- /dev/null
+++ b/hw/bsp/kinetis_k32/boards/kuiic/board.mk
@@ -0,0 +1,26 @@
+MCU = K32L2B31A
+
+# This board uses TinyUF2 for updates
+UF2_FAMILY_ID = 0x7f83e793
+
+CFLAGS += \
+ -mcpu=cortex-m0plus \
+ -DCPU_K32L2B31VLH0A \
+
+# mcu driver cause following warnings
+CFLAGS += -Wno-error=unused-parameter -Wno-error=redundant-decls
+
+# All source paths should be relative to the top level.
+LD_FILE = $(BOARD_PATH)/K32L2B31xxxxA_flash.ld
+
+# For freeRTOS port source
+FREERTOS_PORTABLE_SRC = $(FREERTOS_PORTABLE_PATH)/ARM_CM0
+
+# For flash-jlink target
+JLINK_DEVICE = K32L2B31xxxxA
+
+# For flash-pyocd target
+PYOCD_TARGET = K32L2B
+
+# flash using pyocd
+flash: flash-pyocd
diff --git a/hw/bsp/kuiic/kuiic.c b/hw/bsp/kinetis_k32/boards/kuiic/kuiic.c
index 97677d47a..f9002a6d3 100644
--- a/hw/bsp/kuiic/kuiic.c
+++ b/hw/bsp/kinetis_k32/boards/kuiic/kuiic.c
@@ -25,7 +25,7 @@
* This file is part of the TinyUSB stack.
*/
-#include "../board.h"
+#include "bsp/board.h"
#include "board.h"
#include "fsl_smc.h"
#include "fsl_gpio.h"
diff --git a/hw/bsp/kinetis/family.mk b/hw/bsp/kinetis_k32/family.mk
index 65767988a..f89138b72 100644
--- a/hw/bsp/kinetis/family.mk
+++ b/hw/bsp/kinetis_k32/family.mk
@@ -1,46 +1,32 @@
-DEPS_SUBMODULES += hw/mcu/nxp/nxp_sdk hw/mcu/nxp/mcux-sdk
+SDK_DIR = hw/mcu/nxp/mcux-sdk
+DEPS_SUBMODULES += $(SDK_DIR)
+MCU_DIR = $(SDK_DIR)/devices/$(MCU)
include $(TOP)/$(BOARD_PATH)/board.mk
CFLAGS += \
-mthumb \
-mabi=aapcs \
+ -DCFG_TUSB_MCU=OPT_MCU_KINETIS_K32
SRC_C += \
src/portable/nxp/khci/dcd_khci.c \
src/portable/nxp/khci/hcd_khci.c \
$(MCU_DIR)/system_$(MCU).c \
- $(MCU_DIR)/project_template/clock_config.c \
$(MCU_DIR)/drivers/fsl_clock.c \
+ $(SDK_DIR)/drivers/gpio/fsl_gpio.c \
+ $(SDK_DIR)/drivers/lpuart/fsl_lpuart.c
INC += \
$(TOP)/$(BOARD_PATH) \
$(TOP)/$(SDK_DIR)/CMSIS/Include \
$(TOP)/$(MCU_DIR) \
$(TOP)/$(MCU_DIR)/project_template \
- $(TOP)/$(MCU_DIR)/drivers
-
-# mcu-sdk has different driver layout than previous old sdk
-ifeq ($(SDK_DIR),hw/mcu/nxp/mcux-sdk)
-
-SRC_C += \
- $(SDK_DIR)/drivers/gpio/fsl_gpio.c \
- $(SDK_DIR)/drivers/lpuart/fsl_lpuart.c
-
-INC += \
+ $(TOP)/$(MCU_DIR)/drivers \
$(TOP)/$(SDK_DIR)/drivers/smc \
$(TOP)/$(SDK_DIR)/drivers/common \
$(TOP)/$(SDK_DIR)/drivers/gpio \
$(TOP)/$(SDK_DIR)/drivers/port \
$(TOP)/$(SDK_DIR)/drivers/lpuart \
-else
-
-SRC_C += \
- $(MCU_DIR)/drivers/fsl_gpio.c \
- $(MCU_DIR)/drivers/fsl_lpsci.c \
- $(MCU_DIR)/drivers/fsl_uart.c
-
-endif
-
SRC_S += $(MCU_DIR)/gcc/startup_$(MCU).S
diff --git a/hw/bsp/kinetis/boards/frdm_kl25z/board.mk b/hw/bsp/kinetis_kl/boards/frdm_kl25z/board.mk
index 5ce6cd51e..affe864fb 100644
--- a/hw/bsp/kinetis/boards/frdm_kl25z/board.mk
+++ b/hw/bsp/kinetis_kl/boards/frdm_kl25z/board.mk
@@ -1,26 +1,15 @@
-SDK_DIR = hw/mcu/nxp/nxp_sdk
MCU = MKL25Z4
-MCU_DIR = $(SDK_DIR)/devices/$(MCU)
CFLAGS += \
- -mcpu=cortex-m0plus \
-DCPU_MKL25Z128VLK4 \
- -DCFG_TUSB_MCU=OPT_MCU_MKL25ZXX \
-DCFG_EXAMPLE_VIDEO_READONLY
-LDFLAGS += \
- -Wl,--defsym,__stack_size__=0x400 \
- -Wl,--defsym,__heap_size__=0
-
# mcu driver cause following warnings
CFLAGS += -Wno-error=unused-parameter -Wno-error=format -Wno-error=redundant-decls
# All source paths should be relative to the top level.
LD_FILE = $(MCU_DIR)/gcc/MKL25Z128xxx4_flash.ld
-# For freeRTOS port source
-FREERTOS_PORTABLE_SRC = $(FREERTOS_PORTABLE_PATH)/ARM_CM0
-
# For flash-jlink target
JLINK_DEVICE = MKL25Z128xxx4
diff --git a/hw/bsp/kinetis/boards/frdm_kl25z/frdm_kl25z.c b/hw/bsp/kinetis_kl/boards/frdm_kl25z/frdm_kl25z.c
index 46f85f6a5..46f85f6a5 100644
--- a/hw/bsp/kinetis/boards/frdm_kl25z/frdm_kl25z.c
+++ b/hw/bsp/kinetis_kl/boards/frdm_kl25z/frdm_kl25z.c
diff --git a/hw/bsp/kinetis_kl/family.mk b/hw/bsp/kinetis_kl/family.mk
new file mode 100644
index 000000000..e805d6dae
--- /dev/null
+++ b/hw/bsp/kinetis_kl/family.mk
@@ -0,0 +1,37 @@
+SDK_DIR = hw/mcu/nxp/nxp_sdk
+DEPS_SUBMODULES += $(SDK_DIR)
+
+MCU_DIR = $(SDK_DIR)/devices/$(MCU)
+include $(TOP)/$(BOARD_PATH)/board.mk
+
+CFLAGS += \
+ -mthumb \
+ -mabi=aapcs \
+ -mcpu=cortex-m0plus \
+ -DCFG_TUSB_MCU=OPT_MCU_KINETIS_KL \
+
+LDFLAGS += \
+ -Wl,--defsym,__stack_size__=0x400 \
+ -Wl,--defsym,__heap_size__=0
+
+SRC_C += \
+ src/portable/nxp/khci/dcd_khci.c \
+ src/portable/nxp/khci/hcd_khci.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_lpsci.c \
+ $(MCU_DIR)/drivers/fsl_uart.c
+
+INC += \
+ $(TOP)/$(BOARD_PATH) \
+ $(TOP)/$(SDK_DIR)/CMSIS/Include \
+ $(TOP)/$(MCU_DIR) \
+ $(TOP)/$(MCU_DIR)/project_template \
+ $(TOP)/$(MCU_DIR)/drivers
+
+SRC_S += $(MCU_DIR)/gcc/startup_$(MCU).S
+
+# For freeRTOS port source
+FREERTOS_PORTABLE_SRC = $(FREERTOS_PORTABLE_PATH)/ARM_CM0
diff --git a/hw/bsp/kuiic/board.mk b/hw/bsp/kuiic/board.mk
deleted file mode 100644
index cb3459586..000000000
--- a/hw/bsp/kuiic/board.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-SDK_DIR = hw/mcu/nxp/mcux-sdk
-DEPS_SUBMODULES += $(SDK_DIR) tools/uf2
-
-# This board uses TinyUF2 for updates
-UF2_FAMILY_ID = 0x7f83e793
-
-CFLAGS += \
- -mthumb \
- -mabi=aapcs \
- -mcpu=cortex-m0plus \
- -DCPU_K32L2B31VLH0A \
- -DCFG_TUSB_MCU=OPT_MCU_K32L2BXX
-
-# mcu driver cause following warnings
-CFLAGS += -Wno-error=unused-parameter
-
-MCU_DIR = $(SDK_DIR)/devices/K32L2B31A
-
-# All source paths should be relative to the top level.
-LD_FILE = /hw/bsp/$(BOARD)/K32L2B31xxxxA_flash.ld
-
-SRC_C += \
- src/portable/nxp/khci/dcd_khci.c \
- $(MCU_DIR)/system_K32L2B31A.c \
- $(MCU_DIR)/drivers/fsl_clock.c \
- $(SDK_DIR)/drivers/gpio/fsl_gpio.c \
- $(SDK_DIR)/drivers/lpuart/fsl_lpuart.c
-
-INC += \
- $(TOP)/hw/bsp/$(BOARD) \
- $(TOP)/$(SDK_DIR)/CMSIS/Include \
- $(TOP)/$(SDK_DIR)/drivers/smc \
- $(TOP)/$(SDK_DIR)/drivers/common \
- $(TOP)/$(SDK_DIR)/drivers/gpio \
- $(TOP)/$(SDK_DIR)/drivers/port \
- $(TOP)/$(SDK_DIR)/drivers/lpuart \
- $(TOP)/$(MCU_DIR) \
- $(TOP)/$(MCU_DIR)/drivers
-
-SRC_S += $(MCU_DIR)/gcc/startup_K32L2B31A.S
-
-# For freeRTOS port source
-FREERTOS_PORTABLE_SRC = $(FREERTOS_PORTABLE_PATH)/ARM_CM0
-
-# For flash-jlink target
-JLINK_DEVICE = MKL25Z128xxx4
-
-# For flash-pyocd target
-PYOCD_TARGET = K32L2B
-
-# flash using pyocd
-flash: flash-pyocd
diff --git a/src/common/tusb_mcu.h b/src/common/tusb_mcu.h
index a94e1877f..b903abeca 100644
--- a/src/common/tusb_mcu.h
+++ b/src/common/tusb_mcu.h
@@ -85,7 +85,7 @@
#define TUP_DCD_ENDPOINT_MAX 8
#define TUP_RHPORT_HIGHSPEED 1 // Port0 HS, Port1 HS
-#elif TU_CHECK_MCU(OPT_MCU_MKL25ZXX, OPT_MCU_K32L2AXX, OPT_MCU_K32L2BXX)
+#elif TU_CHECK_MCU(OPT_MCU_KINETIS_KL, OPT_MCU_KINETIS_K32)
#define TUP_USBIP_CHIPIDEA_FS
#define TUP_USBIP_CHIPIDEA_FS_KINETIS
#define TUP_DCD_ENDPOINT_MAX 16
diff --git a/src/portable/nxp/khci/hcd_khci.c b/src/portable/nxp/khci/hcd_khci.c
index 27073dce7..6d25cd862 100644
--- a/src/portable/nxp/khci/hcd_khci.c
+++ b/src/portable/nxp/khci/hcd_khci.c
@@ -26,15 +26,14 @@
#include "tusb_option.h"
-#if CFG_TUH_ENABLED && \
- ( \
- ( CFG_TUSB_MCU == OPT_MCU_MKL25ZXX ) || \
- ( CFG_TUSB_MCU == OPT_MCU_K32L2AXX ) || \
- ( CFG_TUSB_MCU == OPT_MCU_K32L2BXX ) \
- )
+#if CFG_TUH_ENABLED && defined(TUP_USBIP_CHIPIDEA_FS)
-#include "fsl_device_registers.h"
-#define KHCI USB0
+#ifdef TUP_USBIP_CHIPIDEA_FS_KINETIS
+ #include "fsl_device_registers.h"
+ #define KHCI USB0
+#else
+ #error "MCU is not supported"
+#endif
#include "host/hcd.h"
diff --git a/src/tusb_option.h b/src/tusb_option.h
index 5a234e357..c679f2f12 100644
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -117,9 +117,11 @@
#define OPT_MCU_RP2040 1100 ///< Raspberry Pi RP2040
// NXP Kinetis
-#define OPT_MCU_MKL25ZXX 1200 ///< NXP MKL25Zxx
-#define OPT_MCU_K32L2BXX 1201 ///< NXP K32L2Bxx
-#define OPT_MCU_K32L2AXX 1202 ///< NXP K32L2Axx
+#define OPT_MCU_KINETIS_KL 1200 ///< NXP KL series
+#define OPT_MCU_KINETIS_K32 1201 ///< NXP K32 series
+
+#define OPT_MCU_MKL25ZXX 1200 ///< Alias to KL (obsolete)
+#define OPT_MCU_K32L2BXX 1201 ///< Alias to K32 (obsolete)
// Silabs
#define OPT_MCU_EFM32GG 1300 ///< Silabs EFM32GG