Skip to content

Commit

Permalink
[nrf fromlist] arch: arm: core: mpu: allow non-ARM memory attributes
Browse files Browse the repository at this point in the history
Memory region defined in devicetree can have attributes
that are not intended to be parsed by MPU library,
but might be valid for other components.

Upstream PR: zephyrproject-rtos/zephyr#73545

Signed-off-by: Nikodem Kastelik <[email protected]>
(cherry picked from commit b5d3b1f)
  • Loading branch information
nika-nordic authored and anangl committed Jul 1, 2024
1 parent 33da313 commit ffbd907
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions arch/arm/core/mpu/arm_mpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,10 @@ static int mpu_configure_regions_from_dt(uint8_t *reg_index)
break;
#endif
default:
/* Either the specified `ATTR_MPU_*` attribute does not
* exists or the `REGION_*_ATTR` macro is not defined
* for that attribute.
/* Attribute other than ARM-specific is set.
* This region should not be configured in MPU.
*/
LOG_ERR("Invalid attribute for the region\n");
return -EINVAL;
continue;
}
#if defined(CONFIG_ARMV7_R)
region_conf.size = size_to_mpu_rasr_size(region[idx].dt_size);
Expand Down

0 comments on commit ffbd907

Please sign in to comment.