From c479dab901610a3a4ffeb84559489ac277868ab4 Mon Sep 17 00:00:00 2001 From: Veijo Pesonen Date: Mon, 2 Dec 2019 12:51:48 +0200 Subject: [PATCH 1/3] MCU_NRF52840: Removes redundant OS version and CMSIS Packs data --- targets/targets.json | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/targets/targets.json b/targets/targets.json index b6303af56f..3fd506c1e7 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -7831,6 +7831,8 @@ "overrides": { "mpu-rom-end": "0x1fffffff" }, + "release_versions": ["5"], + "device_name": "nRF52840_xxAA", "OUTPUT_EXT": "hex", "is_disk_virtual": true, "supported_toolchains": ["GCC_ARM", "ARM", "IAR"], @@ -7842,16 +7844,12 @@ "NRF52840_DK": { "supported_form_factors": ["ARDUINO"], "inherits": ["MCU_NRF52840"], - "release_versions": ["5"], - "device_name": "nRF52840_xxAA", "macros_add": [ "CONFIG_GPIO_AS_PINRESET" ] }, "ARDUINO_NANO33BLE": { "inherits": ["MCU_NRF52840"], - "release_versions": ["5"], - "device_name": "nRF52840_xxAA", "features_add": ["BLE", "STORAGE"], "components_remove": ["QSPIF"], "components_add": ["FLASHIAP"], @@ -7863,8 +7861,6 @@ }, "MTB_LAIRD_BL654": { "inherits": ["MCU_NRF52840"], - "release_versions": ["5"], - "device_name": "nRF52840_xxAA", "detect_code": ["0465"], "features_remove": ["CRYPTOCELL310"], "macros_remove": ["MBEDTLS_CONFIG_HW_SUPPORT"], @@ -7876,8 +7872,6 @@ }, "MAKERDIARY_NRF52840_MDK": { "inherits": ["MCU_NRF52840"], - "release_versions": ["5"], - "device_name": "nRF52840_xxAA", "detect_code": ["1026"], "device_has_remove": ["ITM"], "macros_add": [ @@ -9633,7 +9627,6 @@ }, "EP_AGORA": { "inherits": ["MCU_NRF52840"], - "device_name": "nRF52840_xxAA", "supported_form_factors": [], "config": { "modem_is_on_board": { @@ -9649,7 +9642,6 @@ }, "components_add": ["SPIF"], "components_remove": ["QSPIF"], - "release_versions": ["5"], "macros_add": [ "CONFIG_GPIO_AS_PINRESET" ] From 28a2327f7e27413ae6af213a00436b006594fb4f Mon Sep 17 00:00:00 2001 From: Veijo Pesonen Date: Mon, 2 Dec 2019 12:55:11 +0200 Subject: [PATCH 2/3] MCU_NRF52840: Removes redundant component and errata definitions --- targets/targets.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/targets/targets.json b/targets/targets.json index 3fd506c1e7..15fa2e7b9d 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -7850,11 +7850,9 @@ }, "ARDUINO_NANO33BLE": { "inherits": ["MCU_NRF52840"], - "features_add": ["BLE", "STORAGE"], + "features_add": ["STORAGE"], "components_remove": ["QSPIF"], - "components_add": ["FLASHIAP"], "device_has_remove": ["QSPI", "ITM"], - "device_has_add": ["FLASH"], "macros_add": [ "CONFIG_GPIO_AS_PINRESET" ] @@ -7875,8 +7873,7 @@ "detect_code": ["1026"], "device_has_remove": ["ITM"], "macros_add": [ - "CONFIG_GPIO_AS_PINRESET", - "NRF52_ERRATA_20" + "CONFIG_GPIO_AS_PINRESET" ] }, "BLUEPILL_F103C8": { From 5d3e859d1cb351af65e3f8e6c0194ae1a1fa5a8d Mon Sep 17 00:00:00 2001 From: Veijo Pesonen Date: Mon, 2 Dec 2019 12:56:41 +0200 Subject: [PATCH 3/3] NRF52840_DK: Fixes target id code --- targets/targets.json | 1 + 1 file changed, 1 insertion(+) diff --git a/targets/targets.json b/targets/targets.json index 15fa2e7b9d..3be4adfd04 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -7844,6 +7844,7 @@ "NRF52840_DK": { "supported_form_factors": ["ARDUINO"], "inherits": ["MCU_NRF52840"], + "detect_code": ["1102"], "macros_add": [ "CONFIG_GPIO_AS_PINRESET" ]