ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9128 from orenc17/spm_hal_test_fix 

Fix SPM HAL test
pull/9225/head
Martin Kojtal 2019-01-02 09:18:02 +00:00 committed by GitHub
parent ad76c94369 b409267883
commit d7497a82dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TESTS/mbed_hal/spm/main.cpp
View File

@ -84,7 +84,7 @@ __attribute__((naked)) void call_mem(uint32_t addr)
// since exception will be generated for invalid memory access. // since exception will be generated for invalid memory access.
// Other instructions are for calling do_nothing function according to AAPCS. // Other instructions are for calling do_nothing function according to AAPCS.
__ASM( __ASM(
"LDR r1, [r0]\n" "LDR r3, [r0]\n"
"BX lr\n" "BX lr\n"
); );
} }
@ -138,10 +138,10 @@ utest::v1::status_t fault_override_teardown(const Case *const source, const size
} }
Case cases[] = { Case cases[] = {
Case("SPM - Access secure RAM", fault_override_setup, secure_ram_fault_test, fault_override_teardown),
Case("SPM - Access secure Flash", fault_override_setup, secure_flash_fault_test, fault_override_teardown),
Case("SPM - Access non-secure RAM", fault_override_setup, non_secure_ram_fault_test, fault_override_teardown), Case("SPM - Access non-secure RAM", fault_override_setup, non_secure_ram_fault_test, fault_override_teardown),
Case("SPM - Access non-secure Flash", fault_override_setup, non_secure_flash_fault_test, fault_override_teardown), Case("SPM - Access non-secure Flash", fault_override_setup, non_secure_flash_fault_test, fault_override_teardown),
Case("SPM - Access secure RAM", fault_override_setup, secure_ram_fault_test, fault_override_teardown),
Case("SPM - Access secure Flash", fault_override_setup, secure_flash_fault_test, fault_override_teardown)
}; };
utest::v1::status_t greentea_test_setup(const size_t number_of_cases) utest::v1::status_t greentea_test_setup(const size_t number_of_cases)