Skip to content

Commit 44f65fb

Browse files
Jamie SmithJojoS62
authored andcommitted
Fix HAL MPU test on Cortex M7 CPUs (#418)
1 parent aaaccba commit 44f65fb

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

connectivity/drivers/emac/TARGET_STM/stm32xx_emac.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#if DEVICE_EMAC
1919

2020
#include <stdlib.h>
21+
#include <algorithm>
2122

2223
#include "cmsis_os.h"
2324

hal/tests/TESTS/mbed_hal/mpu/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ void mpu_fault_test_bss()
134134

135135
void mpu_fault_test_stack()
136136
{
137-
uint16_t stack_function;
137+
volatile uint16_t stack_function;
138138

139139
stack_function = ASM_BX_LR;
140140
clear_caches();
@@ -143,14 +143,14 @@ void mpu_fault_test_stack()
143143

144144
void mpu_fault_test_heap()
145145
{
146-
uint16_t *heap_function = (uint16_t *)malloc(2);
146+
uint16_t volatile *heap_function = (uint16_t *)malloc(2);
147147

148148
TEST_ASSERT_NOT_EQUAL(NULL, heap_function);
149149
*heap_function = ASM_BX_LR;
150150
clear_caches();
151151
mpu_fault_test(heap_function);
152152

153-
free(heap_function);
153+
free(const_cast<uint16_t *>(heap_function));
154154
}
155155

156156
utest::v1::status_t fault_override_setup(const Case *const source, const size_t index_of_case)

0 commit comments

Comments
 (0)