From b368c4ac4865d7446aed219f39fa1a96b23c5f59 Mon Sep 17 00:00:00 2001 From: Bogdan Marinescu Date: Wed, 8 Jun 2016 13:00:41 +0300 Subject: [PATCH] Add a K64F target with uVisor enabled Also, remove UVISOR_SUPPORTED from the other targets. --- hal/targets.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hal/targets.json b/hal/targets.json index 26d14a2367..9d5bbe224c 100644 --- a/hal/targets.json +++ b/hal/targets.json @@ -564,7 +564,7 @@ "supported_form_factors": ["ARDUINO"], "core": "Cortex-M4F", "supported_toolchains": ["ARM", "GCC_ARM", "IAR"], - "extra_labels": ["Freescale", "KSDK2_MCUS", "FRDM", "KPSDK_MCUS", "KPSDK_CODE", "MCU_K64F", "UVISOR_SUPPORTED"], + "extra_labels": ["Freescale", "KSDK2_MCUS", "FRDM", "KPSDK_MCUS", "KPSDK_CODE", "MCU_K64F"], "is_disk_virtual": true, "macros": ["CPU_MK64FN1M0VMD12", "FSL_RTOS_MBED"], "inherits": ["Target"], @@ -572,11 +572,15 @@ "detect_code": ["0240"], "features": ["ANALOGIN", "ANALOGOUT", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"] }, + "K64F_UVISOR": { + "inherits": ["K64F"], + "extra_labels_add":["K64F", "UVISOR_SUPPORTED"] + }, "MTS_GAMBIT": { "inherits": ["Target"], "core": "Cortex-M4F", "supported_toolchains": ["ARM", "GCC_ARM"], - "extra_labels": ["Freescale", "KSDK2_MCUS", "K64F", "KPSDK_MCUS", "KPSDK_CODE", "MCU_K64F", "UVISOR_SUPPORTED"], + "extra_labels": ["Freescale", "KSDK2_MCUS", "K64F", "KPSDK_MCUS", "KPSDK_CODE", "MCU_K64F"], "is_disk_virtual": true, "macros": ["CPU_MK64FN1M0VMD12", "FSL_RTOS_MBED", "TARGET_K64F"], "progen": {"target": "mts-gambit"}, @@ -585,7 +589,7 @@ "HEXIWEAR": { "inherits": ["Target"], "core": "Cortex-M4F", - "extra_labels": ["Freescale", "KSDK2_MCUS", "K64F", "UVISOR_SUPPORTED"], + "extra_labels": ["Freescale", "KSDK2_MCUS", "K64F"], "supported_toolchains": ["ARM", "GCC_ARM", "IAR"], "macros": ["CPU_MK64FN1M0VMD12", "FSL_RTOS_MBED", "TARGET_K64F"], "is_disk_virtual": true,