Merge pull request #9128 from orenc17/spm_hal_test_fix

Fix SPM HAL test

Author: 0xc0170

TESTS/mbed_hal/spm/main.cpp

@@ -84,7 +84,7 @@ __attribute__((naked)) void call_mem(uint32_t addr)
     // since exception will be generated for invalid memory access.
     // Other instructions are for calling do_nothing function according to AAPCS.
     __ASM(
-        "LDR     r1, [r0]\n"
+        "LDR     r3, [r0]\n"
         "BX      lr\n"
     );
 }
@@ -138,10 +138,10 @@ utest::v1::status_t fault_override_teardown(const Case *const source, const size
 }
 
 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 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)