Skip to content

Commit 3411e5e

Browse files
authored
Merge pull request #8952 from c1728p9/psoc6_mpu
Turn off MPU for PSOC 6
2 parents c1c94c8 + 0bacb9a commit 3411e5e

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

targets/targets.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7558,6 +7558,7 @@
75587558
},
75597559
"MCU_PSOC6": {
75607560
"inherits": ["Target"],
7561+
"macros": ["MBED_MPU_CUSTOM"],
75617562
"default_toolchain": "GCC_ARM",
75627563
"supported_toolchains": ["GCC_ARM", "IAR", "ARM"],
75637564
"core": "Cortex-M4F",
@@ -7582,25 +7583,21 @@
75827583
"STDIO_MESSAGES",
75837584
"LPTICKER",
75847585
"SLEEP",
7585-
"FLASH",
7586-
"MPU"
7586+
"FLASH"
75877587
],
7588-
"overrides": {
7589-
"mpu-rom-end": "0x1fffffff"
7590-
},
75917588
"release_versions": ["5"],
75927589
"extra_labels": ["Cypress", "PSOC6"],
75937590
"public": false
75947591
},
75957592
"MCU_PSOC6_M0": {
75967593
"inherits": ["MCU_PSOC6"],
75977594
"core": "Cortex-M0+",
7598-
"macros": ["MCU_PSOC6_M0"],
7595+
"macros_add": ["MCU_PSOC6_M0"],
75997596
"public": false
76007597
},
76017598
"MCU_PSOC6_M4": {
76027599
"inherits": ["MCU_PSOC6"],
7603-
"macros": ["MCU_PSOC6_M4"],
7600+
"macros_add": ["MCU_PSOC6_M4"],
76047601
"public": false
76057602
},
76067603
"FUTURE_SEQUANA_M0": {

0 commit comments

Comments
 (0)