Merge pull request #11706 from VeijoPesonen/nrf52840_fix_product_anomaly_macro

MCU_NRF52840: Switches to correct Product Anomaly Notification(PAN) macro
pull/11734/head
Martin Kojtal 2019-10-22 16:28:23 +02:00 committed by GitHub
commit 97ef25f52f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions

View File

@ -7788,7 +7788,8 @@
"MBEDTLS_CONFIG_HW_SUPPORT",
"WSF_MAX_HANDLERS=10",
"MBED_MPU_CUSTOM",
"SWI_DISABLE0"
"SWI_DISABLE0",
"NRF52_PAN_20"
],
"features": ["CRYPTOCELL310", "BLE"],
"device_has": [
@ -7865,8 +7866,7 @@
"release_versions": ["5"],
"device_name": "nRF52840_xxAA",
"macros_add": [
"CONFIG_GPIO_AS_PINRESET",
"NRF52_ERRATA_20"
"CONFIG_GPIO_AS_PINRESET"
]
},
"ARDUINO_NANO33BLE": {
@ -7879,8 +7879,7 @@
"device_has_remove": ["QSPI"],
"device_has_add": ["FLASH"],
"macros_add": [
"CONFIG_GPIO_AS_PINRESET",
"NRF52_ERRATA_20"
"CONFIG_GPIO_AS_PINRESET"
]
},
"MTB_LAIRD_BL654": {
@ -7890,7 +7889,7 @@
"detect_code": ["0465"],
"features_remove": ["CRYPTOCELL310"],
"macros_remove": ["MBEDTLS_CONFIG_HW_SUPPORT"],
"macros_add": ["NRFX_RNG_ENABLED=1", "RNG_ENABLED=1", "NRF_QUEUE_ENABLED=1", "CONFIG_GPIO_AS_PINRESET", "NRF52_ERRATA_20"],
"macros_add": ["NRFX_RNG_ENABLED=1", "RNG_ENABLED=1", "NRF_QUEUE_ENABLED=1", "CONFIG_GPIO_AS_PINRESET"],
"overrides": {
"lf_clock_src": "NRF_LF_SRC_RC",
"console-uart-flow-control": null
@ -9606,8 +9605,7 @@
"components_remove": ["QSPIF"],
"release_versions": ["5"],
"macros_add": [
"CONFIG_GPIO_AS_PINRESET",
"NRF52_ERRATA_20"
"CONFIG_GPIO_AS_PINRESET"
]
},
"IM880B": {