Skip to content

Commit

Permalink
Merge #19507
Browse files Browse the repository at this point in the history
19507: cpu/cc26x0_cc13x0: Drop feature cortexm_mpu r=maribu a=maribu

### Contribution description

At least the CC2650 doesn't have an MPU, I assume this is also true for the rest of the family.

The CC2652 does have an MPU according to the datasheet. So I keep the feature there in place.

### Testing procedure

E.g.

```
make BOARD=cc2650-launchpad -C tests/mpu_noexec_ram flash test
```

fails. (Note: A successful test run would also crash but with a mem manage handler rather than a hardfault due to an invalid instruction on the stack being executed.)

It would be nice to also test the same for a `cc2652-launchpad`, for which the MPU should work.

### Issues/PRs references

None

Co-authored-by: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
  • Loading branch information
bors[bot] and maribu committed Apr 26, 2023
2 parents 23f7087 + 5c8e3c7 commit dadfa88
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
2 changes: 0 additions & 2 deletions cpu/cc26x0_cc13x0/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ config CPU_FAM_CC26X0
select CPU_CORE_CORTEX_M3
select CPU_COMMON_CC26XX_CC13XX
select HAS_CPU_CC26X0_CC13X0
select HAS_CORTEXM_MPU

select MODULE_CC26XX_CC13XX if TEST_KCONFIG
select MODULE_CC26X0_DRIVERLIB if TEST_KCONFIG
Expand All @@ -20,7 +19,6 @@ config CPU_FAM_CC13X0
select CPU_CORE_CORTEX_M3
select CPU_COMMON_CC26XX_CC13XX
select HAS_CPU_CC26X0_CC13X0
select HAS_CORTEXM_MPU

select MODULE_CC26XX_CC13XX if TEST_KCONFIG

Expand Down
2 changes: 0 additions & 2 deletions cpu/cc26x0_cc13x0/Makefile.features
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
CPU_CORE = cortex-m3

FEATURES_PROVIDED += cortexm_mpu

-include $(RIOTCPU)/cc26xx_cc13xx/Makefile.features

0 comments on commit dadfa88

Please sign in to comment.