Skip to content

Conversation

@VeijoPesonen
Copy link
Contributor

@VeijoPesonen VeijoPesonen commented Dec 2, 2019

Description

Summary of change

Fixes NRF52840_DK target configuration and removes redundancies between all MCU_NRF52840_DK based boards.

NRF52840_DK target code fixed, should be 1102

Moved configurations shared by all the boards MCU_NRF52840_DK based boards under MCU_NRF52840_DK.

Documentation


Pull request type

[X] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results

[] No Tests required for this change (E.g docs only update)
[X] Covered by existing mbed-os tests (Greentea or Unittest)
[] Tests / results supplied as part of this PR
mbedgt: test on hardware with target id: 11023602442031204c503243323038313831303597969903
mbedgt: test suite 'tests-network-l3ip' .............................................................. OK in 18.12 sec
	test case: 'L3IP_START' ...................................................................... OK in 0.06 sec
	test case: 'L3IP_STOP' ....................................................................... OK in 0.05 sec
mbedgt: test case summary: 2 passes, 0 failures
mbedgt: all tests finished!
mbedgt: shuffle seed: 0.3332229894
mbedgt: test suite report:
| target              | platform_name | test suite                                                                   | result  | elapsed_time (sec) | copy_method |
|---------------------|---------------|------------------------------------------------------------------------------|---------|--------------------|-------------|
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-device_key-tests-device_key-functionality                           | OK      | 30.79              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-feature_ble-targets-target_cordio-tests-cordio_hci-driver           | OK      | 38.61              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-frameworks-utest-tests-unit_tests-basic_test                        | OK      | 17.83              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-frameworks-utest-tests-unit_tests-basic_test_default                | OK      | 17.85              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-frameworks-utest-tests-unit_tests-case_async_validate               | OK      | 19.82              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-frameworks-utest-tests-unit_tests-case_control_async                | OK      | 25.98              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-frameworks-utest-tests-unit_tests-case_control_repeat               | OK      | 19.98              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-frameworks-utest-tests-unit_tests-case_selection                    | OK      | 17.91              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-frameworks-utest-tests-unit_tests-case_setup_failure                | OK      | 18.45              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-frameworks-utest-tests-unit_tests-case_teardown_failure             | OK      | 18.56              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-frameworks-utest-tests-unit_tests-control_type                      | OK      | 19.11              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-frameworks-utest-tests-unit_tests-minimal_async_scheduler           | OK      | 18.97              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-frameworks-utest-tests-unit_tests-minimal_scheduler                 | OK      | 19.35              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-frameworks-utest-tests-unit_tests-test_assertion_failure_test_setup | OK      | 17.48              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-frameworks-utest-tests-unit_tests-test_setup_case_selection_failure | OK      | 17.64              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-frameworks-utest-tests-unit_tests-test_setup_failure                | OK      | 17.78              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-frameworks-utest-tests-unit_tests-test_skip                         | OK      | 17.85              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-storage-nvstore-tests-nvstore-functionality                         | OK      | 29.36              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-storage-tests-blockdevice-buffered_block_device                     | OK      | 19.66              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-storage-tests-blockdevice-flashsim_block_device                     | OK      | 17.93              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-storage-tests-blockdevice-general_block_device                      | OK      | 47.11              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-storage-tests-blockdevice-heap_block_device                         | OK      | 21.41              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-storage-tests-blockdevice-mbr_block_device                          | OK      | 20.53              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-storage-tests-blockdevice-util_block_device                         | OK      | 20.06              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-storage-tests-kvstore-direct_access_devicekey_test                  | OK      | 26.98              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-storage-tests-kvstore-static_tests                                  | OK      | 42.32              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | features-storage-tests-kvstore-tdbstore_whitebox                             | OK      | 18.44              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-events-queue                                                           | OK      | 27.68              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-events-timing                                                          | OK      | 80.13              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_drivers-c_strings                                                 | OK      | 19.85              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_drivers-crc                                                       | OK      | 19.59              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_drivers-dev_null                                                  | OK      | 19.49              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_drivers-echo                                                      | OK      | 19.58              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_drivers-flashiap                                                  | OK      | 21.1               | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_drivers-generic_tests                                             | OK      | 19.38              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_drivers-lp_ticker                                                 | OK      | 24.17              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_drivers-lp_timeout                                                | OK      | 40.37              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_drivers-lp_timer                                                  | OK      | 23.1               | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_drivers-race_test                                                 | OK      | 19.07              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_drivers-sleep_lock                                                | OK      | 17.86              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_drivers-stl_features                                              | OK      | 19.19              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_drivers-ticker                                                    | OK      | 23.52              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_drivers-timeout                                                   | OK      | 37.55              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_drivers-timer                                                     | OK      | 25.8               | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_drivers-timerevent                                                | OK      | 19.78              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_functional-callback                                               | OK      | 20.2               | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_functional-callback_big                                           | OK      | 20.32              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_functional-callback_small                                         | OK      | 20.04              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_functional-functionpointer                                        | OK      | 17.87              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_hal-critical_section                                              | OK      | 17.77              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_hal-flash                                                         | OK      | 20.25              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_hal-gpio                                                          | OK      | 17.44              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_hal-lp_ticker                                                     | OK      | 18.21              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_hal-minimum_requirements                                          | OK      | 17.71              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_hal-pinmap                                                        | OK      | 19.87              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_hal-qspi                                                          | OK      | 41.08              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_hal-rtc_time                                                      | OK      | 23.34              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_hal-rtc_time_conv                                                 | OK      | 35.61              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_hal-sleep                                                         | OK      | 19.51              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_hal-sleep_manager                                                 | OK      | 22.05              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_hal-sleep_manager_racecondition                                   | OK      | 30.85              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_hal-stack_size_unification                                        | OK      | 17.44              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_hal-ticker                                                        | OK      | 32.02              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_hal-trng                                                          | OK      | 22.16              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_hal-us_ticker                                                     | OK      | 17.44              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_platform-atomic                                                   | OK      | 32.6               | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_platform-circularbuffer                                           | OK      | 24.57              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_platform-crash_reporting                                          | OK      | 30.17              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_platform-critical_section                                         | OK      | 19.74              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_platform-error_handling                                           | OK      | 18.41              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_platform-filehandle                                               | OK      | 22.94              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_platform-minimal-printf                                           | OK      | 25.67              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_platform-sharedptr                                                | OK      | 18.44              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_platform-singletonptr                                             | OK      | 17.75              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_platform-stream                                                   | OK      | 21.81              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_platform-system_reset                                             | OK      | 18.05              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_platform-transaction                                              | OK      | 18.61              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbed_platform-wait_ns                                                  | OK      | 20.13              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-mbed-attributes                                              | OK      | 19.65              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-mbed-call_before_main                                        | OK      | 16.91              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-mbed-cpp                                                     | OK      | 17.86              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-mbed-div                                                     | OK      | 17.87              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-mbed-static_assert                                           | OK      | 17.4               | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-rtos-mbed-condition_variable                                 | OK      | 18.34              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-rtos-mbed-event_flags                                        | OK      | 21.17              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-rtos-mbed-heap_and_stack                                     | OK      | 19.62              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-rtos-mbed-kernel_tick_count                                  | OK      | 20.34              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-rtos-mbed-mail                                               | OK      | 23.27              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-rtos-mbed-malloc                                             | OK      | 41.09              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-rtos-mbed-memorypool                                         | OK      | 26.32              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-rtos-mbed-mutex                                              | OK      | 22.53              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-rtos-mbed-queue                                              | OK      | 21.47              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-rtos-mbed-rtostimer                                          | OK      | 20.1               | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-rtos-mbed-semaphore                                          | OK      | 22.88              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-rtos-mbed-signals                                            | OK      | 24.74              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-rtos-mbed-systimer                                           | OK      | 19.9               | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedmicro-rtos-mbed-threads                                            | OK      | 30.78              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedtls-multi                                                          | OK      | 21.78              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-mbedtls-selftest                                                       | OK      | 26.19              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-network-l3ip                                                           | OK      | 18.12              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-usb_device-basic                                                       | FAIL    | 200.24             | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-usb_device-hid                                                         | ERROR   | 24.39              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-usb_device-msd                                                         | FAIL    | 52.81              | default     |
| NRF52840_DK-GCC_ARM | NRF52840_DK   | tests-usb_device-serial                                                      | TIMEOUT | 69.55              | default     |
mbedgt: test suite results: 2 FAIL / 100 OK / 1 TIMEOUT / 1 ERROR

Reviewers

@0xc0170
@AnttiKauppila
@SeppoTakalo


Release Notes

Summary of changes

Impact of changes

Migration actions required

"device_has_remove": ["ITM"],
"macros_add": [
"CONFIG_GPIO_AS_PINRESET",
"NRF52_ERRATA_20"
Copy link
Contributor

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

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.

"components_remove": ["QSPIF"],
"components_add": ["FLASHIAP"],
"device_has_remove": ["QSPI", "ITM"],
"device_has_add": ["FLASH"],
Copy link
Contributor

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

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",
```

@0xc0170
Copy link
Contributor

0xc0170 commented Dec 2, 2019

CI started

@0xc0170 0xc0170 added the release-version: 6.0.0-alpha-1 First pre-release version of 6.0.0 label Dec 2, 2019
@mbed-ci
Copy link

mbed-ci commented Dec 2, 2019

Test run: SUCCESS

Summary: 11 of 11 test jobs passed
Build number : 1
Build artifacts

@0xc0170 0xc0170 removed the needs: CI label Dec 3, 2019
@0xc0170 0xc0170 merged commit fc488f6 into ARMmbed:master Dec 3, 2019
@VeijoPesonen VeijoPesonen deleted the mcu_nrf52840_fixes branch December 3, 2019 08:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release-version: 6.0.0-alpha-1 First pre-release version of 6.0.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants