Skip to content

Revert flash_get_value for M2351 done in PR#8589 #8699

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.

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 2 commits into from
Nov 14, 2018

Conversation

deepikabhavnani
Copy link

Description

flash_get_erase_value is added in hal/TARGET_FLASH_CMSIS_ALGO/flash_common_algo.c
duplicate copy of same function in targets/TARGET_NUVOTON/TARGET_M2351/flash_api.c
resulted in build issues with secure build

See https://github.com/ARMmbed/mbed-os/pull/8589/files#r232354584 for more details.

Pull request type

[X] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

CC @ARMmbed/team-nuvoton

`flash_get_erase_value` is added in hal/TARGET_FLASH_CMSIS_ALGO/flash_common_algo.c
duplicate copy of same function in targets/TARGET_NUVOTON/TARGET_M2351/flash_api.c
resulted in build issues with secure build
@deepikabhavnani deepikabhavnani requested review from a team and davidsaada November 9, 2018 20:21
@davidsaada
Copy link
Contributor

@deepikabhavnani Reason I added it there was the fact that it wouldn't recognize the changes added in hal/TARGET_FLASH_CMSIS_ALGO/flash_common_algo.c. Did you try building the flashiap test (under mbed_drivers)?

@deepikabhavnani
Copy link
Author

@davidsaada - I will try to build the test once, secure side image is in working condition. In #8589 I guess M2351 is the outlier, it uses all the definitions from common layer "hal/TARGET_FLASH_CMSIS_ALGO/flash_common_algo.c". You can see the difference between any other target "flash_api.c" and M2351 - flash_api.c

@deepikabhavnani
Copy link
Author

Added secure side library and CMSE file for the changes in secure side https://github.com/ARMmbed/mbed-os/pull/8589/files#diff-a91b86027e0469c7339b13de32617b03R263

@deepikabhavnani
Copy link
Author

+-------------------------+-------------------+-------------------------------------+--------+--------------------+-------------+
| target                  | platform_name     | test suite                          | result | elapsed_time (sec) | copy_method |
+-------------------------+-------------------+-------------------------------------+--------+--------------------+-------------+
| NUMAKER_PFM_M2351-ARMC6 | NUMAKER_PFM_M2351 | mbed-os-tests-mbed_drivers-flashiap | OK     | 17.5               | default     |
+-------------------------+-------------------+-------------------------------------+--------+--------------------+-------------+
mbedgt: test suite results: 1 OK
mbedgt: test case report:
+-------------------------+-------------------+-------------------------------------+-----------------------------------+--------+--------+--------+--------------------+
| target                  | platform_name     | test suite                          | test case                         | passed | failed | result | elapsed_time (sec) |
+-------------------------+-------------------+-------------------------------------+-----------------------------------+--------+--------+--------+--------------------+
| NUMAKER_PFM_M2351-ARMC6 | NUMAKER_PFM_M2351 | mbed-os-tests-mbed_drivers-flashiap | FlashIAP - init                   | 1      | 0      | OK     | 0.05               |
| NUMAKER_PFM_M2351-ARMC6 | NUMAKER_PFM_M2351 | mbed-os-tests-mbed_drivers-flashiap | FlashIAP - program                | 1      | 0      | OK     | 0.32               |
| NUMAKER_PFM_M2351-ARMC6 | NUMAKER_PFM_M2351 | mbed-os-tests-mbed_drivers-flashiap | FlashIAP - program across sectors | 1      | 0      | OK     | 0.21               |
| NUMAKER_PFM_M2351-ARMC6 | NUMAKER_PFM_M2351 | mbed-os-tests-mbed_drivers-flashiap | FlashIAP - program errors         | 1      | 0      | OK     | 0.05               |
| NUMAKER_PFM_M2351-ARMC6 | NUMAKER_PFM_M2351 | mbed-os-tests-mbed_drivers-flashiap | FlashIAP - timing                 | 1      | 0      | OK     | 1.03               |
+-------------------------+-------------------+-------------------------------------+-----------------------------------+--------+--------+--------+--------------------+
mbedgt: test case results: 5 OK
mbedgt: completed in 23.12 sec

@0xc0170
Copy link
Contributor

0xc0170 commented Nov 13, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Nov 13, 2018

Build : SUCCESS

Build number : 3608
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/8699/

Triggering tests

/morph test
/morph export-build
/morph mbed2-build

@mbed-ci
Copy link

mbed-ci commented Nov 13, 2018

@mbed-ci
Copy link

mbed-ci commented Nov 13, 2018

@cmonr
Copy link
Contributor

cmonr commented Nov 13, 2018

Note: This PR is now a part of a rollup PR (#8733).

In order to expidite remaining CI testing, this PR has been bundled into the above rollup PR.

No further work is needed here, as once that PR is merged, this PR will also be closed and marked as merged.

If any more commits are made in this PR, this PR will remain open and have to go through CI on its own.

@0xc0170 0xc0170 merged commit 4e7cbd4 into ARMmbed:master Nov 14, 2018
@0xc0170 0xc0170 removed the needs: CI label Nov 14, 2018
@cmonr cmonr removed the rollup PR label Nov 14, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants