Skip to content

MCU_NRF52840 target configuration fixes #11995

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

Merged
merged 3 commits into from
Dec 3, 2019
Merged

MCU_NRF52840 target configuration fixes #11995

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c479dab
MCU_NRF52840: Removes redundant OS version and CMSIS Packs data
Dec 2, 2019
28a2327
MCU_NRF52840: Removes redundant component and errata definitions
Dec 2, 2019
5d3e859
NRF52840_DK: Fixes target id code
Dec 2, 2019
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
20 changes: 5 additions & 15 deletions targets/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand All @@ -7842,29 +7844,22 @@
"NRF52840_DK": {
"supported_form_factors": ["ARDUINO"],
"inherits": ["MCU_NRF52840"],
"release_versions": ["5"],
"device_name": "nRF52840_xxAA",
"detect_code": ["1102"],
"macros_add": [
"CONFIG_GPIO_AS_PINRESET"
]
},
"ARDUINO_NANO33BLE": {
"inherits": ["MCU_NRF52840"],
"release_versions": ["5"],
"device_name": "nRF52840_xxAA",
"features_add": ["BLE", "STORAGE"],
"features_add": ["STORAGE"],
"components_remove": ["QSPIF"],
"components_add": ["FLASHIAP"],
"device_has_remove": ["QSPI", "ITM"],
"device_has_add": ["FLASH"],
Copy link
Contributor

@0xc0170 0xc0170 Dec 2, 2019

Choose a reason for hiding this comment

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

this one is neither set in the MCU_NRF52840 ?

Copy link
Contributor Author

@VeijoPesonen VeijoPesonen Dec 2, 2019

Choose a reason for hiding this comment

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

All three - BLE, FLASHIAP and FLASH - are already defined under MCU_NRF52840

"MCU_NRF52840": {
        "inherits": ["Target"],
        "components_add": ["QSPIF", "FLASHIAP"],
        "core": "Cortex-M4F",
        "macros": [
            "BOARD_PCA10056",
            "NRF52840_XXAA",
            "TARGET_NRF52840",
            "CMSIS_VECTAB_VIRTUAL",
            "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\"",
            "MBED_TICKLESS",
            "MBEDTLS_CONFIG_HW_SUPPORT",
            "WSF_MAX_HANDLERS=10",
            "MBED_MPU_CUSTOM",
            "SWI_DISABLE0",
            "NRF52_PAN_20"
        ],
        "features": ["CRYPTOCELL310", "BLE"],
        "device_has": [
            "ANALOGIN",
            "FLASH",
```

"macros_add": [
"CONFIG_GPIO_AS_PINRESET"
]
},
"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"],
Expand All @@ -7876,13 +7871,10 @@
},
"MAKERDIARY_NRF52840_MDK": {
"inherits": ["MCU_NRF52840"],
"release_versions": ["5"],
"device_name": "nRF52840_xxAA",
"detect_code": ["1026"],
"device_has_remove": ["ITM"],
"macros_add": [
"CONFIG_GPIO_AS_PINRESET",
"NRF52_ERRATA_20"
Copy link
Contributor

@0xc0170 0xc0170 Dec 2, 2019

Choose a reason for hiding this comment

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

I don't see this set in the parent, why are we removing it ?

Copy link
Contributor Author

@VeijoPesonen VeijoPesonen Dec 2, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

It has been erroneously added here. As PR #11706 tells the define is incorrect and the correct one can be found from under MCU_NRF52840.

"CONFIG_GPIO_AS_PINRESET"
]
},
"BLUEPILL_F103C8": {
Expand Down Expand Up @@ -9633,7 +9625,6 @@
},
"EP_AGORA": {
"inherits": ["MCU_NRF52840"],
"device_name": "nRF52840_xxAA",
"supported_form_factors": [],
"config": {
"modem_is_on_board": {
Expand All @@ -9649,7 +9640,6 @@
},
"components_add": ["SPIF"],
"components_remove": ["QSPIF"],
"release_versions": ["5"],
"macros_add": [
"CONFIG_GPIO_AS_PINRESET"
]
Expand Down