Skip to content

Folder re-org to fit new MCU K22F variances #3136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Folder re-org to fit new MCU K22F variances #3136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...TARGET_K22F/TARGET_FRDM/PeripheralNames.h → ...MCU_K22F512/TARGET_FRDM/PeripheralNames.h
View file
Open in desktop
File renamed without changes.
0 .../TARGET_K22F/TARGET_FRDM/PeripheralPins.c → ..._MCU_K22F512/TARGET_FRDM/PeripheralPins.c
View file
Open in desktop
File renamed without changes.
0 ...2_MCUS/TARGET_K22F/TARGET_FRDM/PinNames.h → ...TARGET_MCU_K22F512/TARGET_FRDM/PinNames.h
View file
Open in desktop
File renamed without changes.
0 ...DK2_MCUS/TARGET_K22F/TARGET_FRDM/device.h → ...F/TARGET_MCU_K22F512/TARGET_FRDM/device.h
View file
Open in desktop
File renamed without changes.
0 ...ARGET_K22F/TARGET_FRDM/fsl_clock_config.c → ...CU_K22F512/TARGET_FRDM/fsl_clock_config.c
View file
Open in desktop
File renamed without changes.
0 ...ARGET_K22F/TARGET_FRDM/fsl_clock_config.h → ...CU_K22F512/TARGET_FRDM/fsl_clock_config.h
View file
Open in desktop
File renamed without changes.
0 .../TARGET_K22F/TARGET_FRDM/mbed_overrides.c → ..._MCU_K22F512/TARGET_FRDM/mbed_overrides.c
View file
Open in desktop
File renamed without changes.
0 ...SDK2_MCUS/TARGET_K22F/device/MK22F51212.h → ...2F/TARGET_MCU_K22F512/device/MK22F51212.h
View file
Open in desktop
File renamed without changes.
0 .../TARGET_K22F/device/MK22F51212_features.h → ..._MCU_K22F512/device/MK22F51212_features.h
View file
Open in desktop
File renamed without changes.
0 ...vice/TOOLCHAIN_ARM_STD/MK22FN512xxx12.sct → ...vice/TOOLCHAIN_ARM_STD/MK22FN512xxx12.sct
View file
Open in desktop
File renamed without changes.
0 ...ce/TOOLCHAIN_ARM_STD/startup_MK22F51212.S → ...ce/TOOLCHAIN_ARM_STD/startup_MK22F51212.S
View file
Open in desktop
File renamed without changes.
0 ...GET_K22F/device/TOOLCHAIN_ARM_STD/sys.cpp → ..._K22F512/device/TOOLCHAIN_ARM_STD/sys.cpp
View file
Open in desktop
File renamed without changes.
0 ...evice/TOOLCHAIN_GCC_ARM/MK22FN512xxx12.ld → ...evice/TOOLCHAIN_GCC_ARM/MK22FN512xxx12.ld
View file
Open in desktop
File renamed without changes.
0 ...ce/TOOLCHAIN_GCC_ARM/startup_MK22F51212.S → ...ce/TOOLCHAIN_GCC_ARM/startup_MK22F51212.S
View file
Open in desktop
File renamed without changes.
0 ..._K22F/device/TOOLCHAIN_IAR/MK22F51212.icf → ...2F512/device/TOOLCHAIN_IAR/MK22F51212.icf
View file
Open in desktop
File renamed without changes.
0 ...2F/device/TOOLCHAIN_IAR/startup_MK22F12.S → ...12/device/TOOLCHAIN_IAR/startup_MK22F12.S
View file
Open in desktop
File renamed without changes.
0 ...GET_KSDK2_MCUS/TARGET_K22F/device/cmsis.h → ...CU_K22F/TARGET_MCU_K22F512/device/cmsis.h
View file
Open in desktop
File renamed without changes.
0 ...SDK2_MCUS/TARGET_K22F/device/cmsis_nvic.c → ...2F/TARGET_MCU_K22F512/device/cmsis_nvic.c
View file
Open in desktop
File renamed without changes.
0 ...SDK2_MCUS/TARGET_K22F/device/cmsis_nvic.h → ...2F/TARGET_MCU_K22F512/device/cmsis_nvic.h
View file
Open in desktop
File renamed without changes.
0 ...TARGET_K22F/device/fsl_device_registers.h → ...MCU_K22F512/device/fsl_device_registers.h
View file
Open in desktop
File renamed without changes.
0 ...US/TARGET_K22F/device/system_MK22F51212.c → ...ET_MCU_K22F512/device/system_MK22F51212.c
View file
Open in desktop
File renamed without changes.
0 ...US/TARGET_K22F/device/system_MK22F51212.h → ...ET_MCU_K22F512/device/system_MK22F51212.h
View file
Open in desktop
File renamed without changes.
0 ...SDK2_MCUS/TARGET_K22F/drivers/fsl_adc16.c → ..._MCUS/TARGET_MCU_K22F/drivers/fsl_adc16.c
View file
Open in desktop
File renamed without changes.
0 ...SDK2_MCUS/TARGET_K22F/drivers/fsl_adc16.h → ..._MCUS/TARGET_MCU_K22F/drivers/fsl_adc16.h
View file
Open in desktop
File renamed without changes.
0 ...SDK2_MCUS/TARGET_K22F/drivers/fsl_clock.c → ..._MCUS/TARGET_MCU_K22F/drivers/fsl_clock.c
View file
Open in desktop
File renamed without changes.
0 ...SDK2_MCUS/TARGET_K22F/drivers/fsl_clock.h → ..._MCUS/TARGET_MCU_K22F/drivers/fsl_clock.h
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_cmp.c → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_cmp.c
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_cmp.h → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_cmp.h
View file
Open in desktop
File renamed without changes.
0 ...DK2_MCUS/TARGET_K22F/drivers/fsl_common.c → ...MCUS/TARGET_MCU_K22F/drivers/fsl_common.c
View file
Open in desktop
File renamed without changes.
0 ...DK2_MCUS/TARGET_K22F/drivers/fsl_common.h → ...MCUS/TARGET_MCU_K22F/drivers/fsl_common.h
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_crc.c → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_crc.c
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_crc.h → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_crc.h
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_dac.c → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_dac.c
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_dac.h → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_dac.h
View file
Open in desktop
File renamed without changes.
0 ...DK2_MCUS/TARGET_K22F/drivers/fsl_dmamux.c → ...MCUS/TARGET_MCU_K22F/drivers/fsl_dmamux.c
View file
Open in desktop
File renamed without changes.
0 ...DK2_MCUS/TARGET_K22F/drivers/fsl_dmamux.h → ...MCUS/TARGET_MCU_K22F/drivers/fsl_dmamux.h
View file
Open in desktop
File renamed without changes.
0 ...KSDK2_MCUS/TARGET_K22F/drivers/fsl_dspi.c → ...2_MCUS/TARGET_MCU_K22F/drivers/fsl_dspi.c
View file
Open in desktop
File renamed without changes.
0 ...KSDK2_MCUS/TARGET_K22F/drivers/fsl_dspi.h → ...2_MCUS/TARGET_MCU_K22F/drivers/fsl_dspi.h
View file
Open in desktop
File renamed without changes.
0 ..._MCUS/TARGET_K22F/drivers/fsl_dspi_edma.c → ...S/TARGET_MCU_K22F/drivers/fsl_dspi_edma.c
View file
Open in desktop
File renamed without changes.
0 ..._MCUS/TARGET_K22F/drivers/fsl_dspi_edma.h → ...S/TARGET_MCU_K22F/drivers/fsl_dspi_edma.h
View file
Open in desktop
File renamed without changes.
0 ...KSDK2_MCUS/TARGET_K22F/drivers/fsl_edma.c → ...2_MCUS/TARGET_MCU_K22F/drivers/fsl_edma.c
View file
Open in desktop
File renamed without changes.
0 ...KSDK2_MCUS/TARGET_K22F/drivers/fsl_edma.h → ...2_MCUS/TARGET_MCU_K22F/drivers/fsl_edma.h
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_ewm.c → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_ewm.c
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_ewm.h → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_ewm.h
View file
Open in desktop
File renamed without changes.
0 ...SDK2_MCUS/TARGET_K22F/drivers/fsl_flash.c → ..._MCUS/TARGET_MCU_K22F/drivers/fsl_flash.c
View file
Open in desktop
File renamed without changes.
0 ...SDK2_MCUS/TARGET_K22F/drivers/fsl_flash.h → ..._MCUS/TARGET_MCU_K22F/drivers/fsl_flash.h
View file
Open in desktop
File renamed without changes.
0 ...K2_MCUS/TARGET_K22F/drivers/fsl_flexbus.c → ...CUS/TARGET_MCU_K22F/drivers/fsl_flexbus.c
View file
Open in desktop
File renamed without changes.
0 ...K2_MCUS/TARGET_K22F/drivers/fsl_flexbus.h → ...CUS/TARGET_MCU_K22F/drivers/fsl_flexbus.h
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_ftm.c → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_ftm.c
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_ftm.h → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_ftm.h
View file
Open in desktop
File renamed without changes.
0 ...KSDK2_MCUS/TARGET_K22F/drivers/fsl_gpio.c → ...2_MCUS/TARGET_MCU_K22F/drivers/fsl_gpio.c
View file
Open in desktop
File renamed without changes.
0 ...KSDK2_MCUS/TARGET_K22F/drivers/fsl_gpio.h → ...2_MCUS/TARGET_MCU_K22F/drivers/fsl_gpio.h
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_i2c.c → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_i2c.c
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_i2c.h → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_i2c.h
View file
Open in desktop
File renamed without changes.
0 ...2_MCUS/TARGET_K22F/drivers/fsl_i2c_edma.c → ...US/TARGET_MCU_K22F/drivers/fsl_i2c_edma.c
View file
Open in desktop
File renamed without changes.
0 ...2_MCUS/TARGET_K22F/drivers/fsl_i2c_edma.h → ...US/TARGET_MCU_K22F/drivers/fsl_i2c_edma.h
View file
Open in desktop
File renamed without changes.
0 ...KSDK2_MCUS/TARGET_K22F/drivers/fsl_llwu.c → ...2_MCUS/TARGET_MCU_K22F/drivers/fsl_llwu.c
View file
Open in desktop
File renamed without changes.
0 ...KSDK2_MCUS/TARGET_K22F/drivers/fsl_llwu.h → ...2_MCUS/TARGET_MCU_K22F/drivers/fsl_llwu.h
View file
Open in desktop
File renamed without changes.
0 ...SDK2_MCUS/TARGET_K22F/drivers/fsl_lptmr.c → ..._MCUS/TARGET_MCU_K22F/drivers/fsl_lptmr.c
View file
Open in desktop
File renamed without changes.
0 ...SDK2_MCUS/TARGET_K22F/drivers/fsl_lptmr.h → ..._MCUS/TARGET_MCU_K22F/drivers/fsl_lptmr.h
View file
Open in desktop
File renamed without changes.
0 ...DK2_MCUS/TARGET_K22F/drivers/fsl_lpuart.c → ...MCUS/TARGET_MCU_K22F/drivers/fsl_lpuart.c
View file
Open in desktop
File renamed without changes.
0 ...DK2_MCUS/TARGET_K22F/drivers/fsl_lpuart.h → ...MCUS/TARGET_MCU_K22F/drivers/fsl_lpuart.h
View file
Open in desktop
File renamed without changes.
0 ...CUS/TARGET_K22F/drivers/fsl_lpuart_edma.c → ...TARGET_MCU_K22F/drivers/fsl_lpuart_edma.c
View file
Open in desktop
File renamed without changes.
0 ...CUS/TARGET_K22F/drivers/fsl_lpuart_edma.h → ...TARGET_MCU_K22F/drivers/fsl_lpuart_edma.h
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_pdb.c → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_pdb.c
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_pdb.h → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_pdb.h
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_pit.c → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_pit.c
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_pit.h → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_pit.h
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_pmc.c → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_pmc.c
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_pmc.h → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_pmc.h
View file
Open in desktop
File renamed without changes.
0 ...KSDK2_MCUS/TARGET_K22F/drivers/fsl_port.h → ...2_MCUS/TARGET_MCU_K22F/drivers/fsl_port.h
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_rcm.c → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_rcm.c
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_rcm.h → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_rcm.h
View file
Open in desktop
File renamed without changes.
0 ...KSDK2_MCUS/TARGET_K22F/drivers/fsl_rnga.c → ...2_MCUS/TARGET_MCU_K22F/drivers/fsl_rnga.c
View file
Open in desktop
File renamed without changes.
0 ...KSDK2_MCUS/TARGET_K22F/drivers/fsl_rnga.h → ...2_MCUS/TARGET_MCU_K22F/drivers/fsl_rnga.h
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_rtc.c → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_rtc.c
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_rtc.h → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_rtc.h
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_sai.c → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_sai.c
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_sai.h → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_sai.h
View file
Open in desktop
File renamed without changes.
0 ...2_MCUS/TARGET_K22F/drivers/fsl_sai_edma.c → ...US/TARGET_MCU_K22F/drivers/fsl_sai_edma.c
View file
Open in desktop
File renamed without changes.
0 ...2_MCUS/TARGET_K22F/drivers/fsl_sai_edma.h → ...US/TARGET_MCU_K22F/drivers/fsl_sai_edma.h
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_sim.c → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_sim.c
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_sim.h → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_sim.h
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_smc.c → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_smc.c
View file
Open in desktop
File renamed without changes.
0 ..._KSDK2_MCUS/TARGET_K22F/drivers/fsl_smc.h → ...K2_MCUS/TARGET_MCU_K22F/drivers/fsl_smc.h
View file
Open in desktop
File renamed without changes.
0 ...KSDK2_MCUS/TARGET_K22F/drivers/fsl_uart.c → ...2_MCUS/TARGET_MCU_K22F/drivers/fsl_uart.c
View file
Open in desktop
File renamed without changes.
0 ...KSDK2_MCUS/TARGET_K22F/drivers/fsl_uart.h → ...2_MCUS/TARGET_MCU_K22F/drivers/fsl_uart.h
View file
Open in desktop
File renamed without changes.
0 ..._MCUS/TARGET_K22F/drivers/fsl_uart_edma.c → ...S/TARGET_MCU_K22F/drivers/fsl_uart_edma.c
View file
Open in desktop
File renamed without changes.
0 ..._MCUS/TARGET_K22F/drivers/fsl_uart_edma.h → ...S/TARGET_MCU_K22F/drivers/fsl_uart_edma.h
View file
Open in desktop
File renamed without changes.
0 ...KSDK2_MCUS/TARGET_K22F/drivers/fsl_vref.c → ...2_MCUS/TARGET_MCU_K22F/drivers/fsl_vref.c
View file
Open in desktop
File renamed without changes.
0 ...KSDK2_MCUS/TARGET_K22F/drivers/fsl_vref.h → ...2_MCUS/TARGET_MCU_K22F/drivers/fsl_vref.h
View file
Open in desktop
File renamed without changes.
0 ...KSDK2_MCUS/TARGET_K22F/drivers/fsl_wdog.c → ...2_MCUS/TARGET_MCU_K22F/drivers/fsl_wdog.c
View file
Open in desktop
File renamed without changes.
0 ...KSDK2_MCUS/TARGET_K22F/drivers/fsl_wdog.h → ...2_MCUS/TARGET_MCU_K22F/drivers/fsl_wdog.h
View file
Open in desktop
File renamed without changes.
0 ...US/TARGET_K22F/peripheral_clock_defines.h → ...ARGET_MCU_K22F/peripheral_clock_defines.h
View file
Open in desktop
File renamed without changes.
0 ...ARGET_KSDK2_MCUS/TARGET_K22F/pwmout_api.c → ...T_KSDK2_MCUS/TARGET_MCU_K22F/pwmout_api.c
View file
Open in desktop
File renamed without changes.
0 ...ARGET_KSDK2_MCUS/TARGET_K22F/serial_api.c → ...T_KSDK2_MCUS/TARGET_MCU_K22F/serial_api.c
View file
Open in desktop
File renamed without changes.
0 ...e/TARGET_KSDK2_MCUS/TARGET_K22F/spi_api.c → ...RGET_KSDK2_MCUS/TARGET_MCU_K22F/spi_api.c
View file
Open in desktop
File renamed without changes.
0 ...TARGET_KSDK2_MCUS/TARGET_K22F/us_ticker.c → ...ET_KSDK2_MCUS/TARGET_MCU_K22F/us_ticker.c
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion targets/TARGET_Freescale/mbed_rtx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#define OS_CLOCK 96000000
#endif

#elif defined(TARGET_K22F)
#elif defined(TARGET_MCU_K22F)

#ifndef INITIAL_SP
#define INITIAL_SP (0x20010000UL)
Expand Down
10 changes: 7 additions & 3 deletions targets/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,11 +482,11 @@
"release_versions": ["2"],
"device_name": "MK20DX256xxx7"
},
"K22F": {
"MCU_K22F512": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This target needs to have the public flag set to false

"supported_form_factors": ["ARDUINO"],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd say this belongs in the K22F target definition, since the shared MCU doesn't really have a form factor.

"core": "Cortex-M4F",
"supported_toolchains": ["ARM", "GCC_ARM", "IAR"],
"extra_labels": ["Freescale", "KSDK2_MCUS", "FRDM", "KPSDK_MCUS", "KPSDK_CODE"],
"extra_labels": ["Freescale", "KSDK2_MCUS", "MCU_K22F", "MCU_K22F512", "FRDM", "KPSDK_MCUS", "KPSDK_CODE"],
"is_disk_virtual": true,
"macros": ["CPU_MK22FN512VLH12", "FSL_RTOS_MBED"],
"inherits": ["Target"],
Expand All @@ -495,6 +495,10 @@
"release_versions": ["2", "5"],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we typically only place the release_versions field in the "leaf" target, eg. the target that is the furthest down the inheritance chain. So in this case I would move this to the K22F target definition.

"device_name": "MK22DN512xxx5"
},
"K22F": {
"inherits": ["MCU_K22F512"],
"extra_labels_add": ["FRDM"]
},
"KL27Z": {
"inherits": ["Target"],
"core": "Cortex-M0+",
Expand Down Expand Up @@ -2150,4 +2154,4 @@
"inherits": ["SARA_NBIOT"],
"extra_labels": ["ublox", "HI2110", "SARA_NBIOT"]
}
}
}