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

Assert MPU regions, rather than error 

As we build for a specific CPU, a runtime check for number of MPU
regions in release builds is not worthwhile. Make it an assert only.
Saves a little space in develop images, a lot in release.
pull/9061/head
Kevin Bracey 2018-12-12 10:36:35 +02:00
parent 9e300013e5
commit 171e575b94
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hal/mpu/mbed_mpu_v7m.c
View File

@ -15,7 +15,6 @@
*/ */
#include "hal/mpu_api.h" #include "hal/mpu_api.h"
#include "platform/mbed_assert.h" #include "platform/mbed_assert.h"
#include "platform/mbed_error.h"
#include "cmsis.h" #include "cmsis.h"
#if ((__ARM_ARCH_7M__ == 1U) || (__ARM_ARCH_7EM__ == 1U) || (__ARM_ARCH_6M__ == 1U)) && \ #if ((__ARM_ARCH_7M__ == 1U) || (__ARM_ARCH_7EM__ == 1U) || (__ARM_ARCH_6M__ == 1U)) && \
@ -48,9 +47,10 @@ void mbed_mpu_init()
__DMB(); __DMB();
const uint32_t regions = (MPU->TYPE & MPU_TYPE_DREGION_Msk) >> MPU_TYPE_DREGION_Pos; const uint32_t regions = (MPU->TYPE & MPU_TYPE_DREGION_Msk) >> MPU_TYPE_DREGION_Pos;
if (regions < 4) {
MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_HAL, MBED_ERROR_CODE_EINVAL), "Device is not capable of supporting an MPU - remove DEVICE_MPU for device_has."); // Our MPU setup requires 4 regions - if this assert is hit, remove
} // DEVICE_MPU from device_has
MBED_ASSERT(regions >= 4);
// Disable the MCU // Disable the MCU
MPU->CTRL = 0; MPU->CTRL = 0;

8
hal/mpu/mbed_mpu_v8m.c
View File

@ -15,7 +15,6 @@
*/ */
#include "hal/mpu_api.h" #include "hal/mpu_api.h"
#include "platform/mbed_assert.h" #include "platform/mbed_assert.h"
#include "platform/mbed_error.h"
#include "cmsis.h" #include "cmsis.h"
#if ((__ARM_ARCH_8M_BASE__ == 1U) || (__ARM_ARCH_8M_MAIN__ == 1U)) && \ #if ((__ARM_ARCH_8M_BASE__ == 1U) || (__ARM_ARCH_8M_MAIN__ == 1U)) && \
@ -38,9 +37,10 @@ void mbed_mpu_init()
__DMB(); __DMB();
const uint32_t regions = (MPU->TYPE & MPU_TYPE_DREGION_Msk) >> MPU_TYPE_DREGION_Pos; const uint32_t regions = (MPU->TYPE & MPU_TYPE_DREGION_Msk) >> MPU_TYPE_DREGION_Pos;
if (regions < 4) {
MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_HAL, MBED_ERROR_CODE_EINVAL), "Device is not capable of supporting an MPU - remove DEVICE_MPU for device_has."); // Our MPU setup requires 4 regions - if this assert is hit, remove
} // DEVICE_MPU from device_has
MBED_ASSERT(regions >= 4);
// Disable the MCU // Disable the MCU
MPU->CTRL = 0; MPU->CTRL = 0;