Merge pull request #9003 from juhoeskeli/wise_1570_mpu_enable

Revert "Merge pull request #8922 from juhoeskeli/wise_1570_mpu_disable"
pull/9029/head
Martin Kojtal 2018-12-10 12:21:36 +01:00 committed by GitHub
commit 40e13cf28c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions

View File

@ -3238,8 +3238,7 @@
"macros_add": [ "macros_add": [
"MBEDTLS_CONFIG_HW_SUPPORT", "MBEDTLS_CONFIG_HW_SUPPORT",
"WISE_1570", "WISE_1570",
"TWO_RAM_REGIONS", "TWO_RAM_REGIONS"
"MBED_MPU_CUSTOM"
], ],
"device_has_add": [ "device_has_add": [
"ANALOGOUT", "ANALOGOUT",
@ -3247,7 +3246,8 @@
"SERIAL_ASYNCH", "SERIAL_ASYNCH",
"SERIAL_FC", "SERIAL_FC",
"TRNG", "TRNG",
"FLASH" "FLASH",
"MPU"
], ],
"device_has_remove": ["LPTICKER"], "device_has_remove": ["LPTICKER"],
"release_versions": ["5"], "release_versions": ["5"],