diff --git a/doxygen/src/components_schema.txt b/doxygen/src/components_schema.txt
index df46cbc..713ea70 100644
--- a/doxygen/src/components_schema.txt
+++ b/doxygen/src/components_schema.txt
@@ -211,6 +211,8 @@ or <a href="https://arm-software.github.io/CMSIS_5/develop/Core_A/html/device_h_
 #endif
 \endcode
 
+\note __MPU_PRESENT must not be used for non-Arm MPUs!
+
 Another typical usage of the <b>RTE_Components.h</b> file is in header files to control for example the inclusion of files
 that are related to other components for the same Software Pack.
 
@@ -222,7 +224,6 @@ that are related to other components for the same Software Pack.
 #endif
 \endcode
 
-
 <p>&nbsp;</p>
 <hr>
 
diff --git a/doxygen/src/devices_schema.txt b/doxygen/src/devices_schema.txt
index 50d052f..a8a1ab1 100644
--- a/doxygen/src/devices_schema.txt
+++ b/doxygen/src/devices_schema.txt
@@ -1940,7 +1940,7 @@ the attribute \elem{Pname}. If the information is relevant to all processors, no
   </tr>
   <tr>
     <td>Dmpu</td>
-    <td>Specifies whether a Memory Protection Unit is present in the processor. Use predefined values as listed in the table \ref DmpuEnum "Device MPU".</td>
+    <td>Specifies whether an Arm-based Memory Protection Unit is present in the processor. Do not use this in case of custom MPUs. Use predefined values as listed in the table \ref DmpuEnum "Device MPU".</td>
     <td>\ref DmpuEnum</td>
     <td>required</td>
   </tr>
@@ -2687,7 +2687,7 @@ The tokens can be used in the elements:
 
 \anchor DmpuEnum <b>Table: Device MPU</b>
 
-The table shows predefined values that identify whether a CPU has an Memory Protection Unit (MPU).
+The table shows predefined values that identify whether a CPU has an Arm-based Memory Protection Unit (MPU).
 The values can be used in the elements:
 - \ref element_accept  
 - \ref element_require 
@@ -2709,6 +2709,8 @@ The values can be used in the elements:
   </tr>
 </table>
 
+\note Do not use Dmpu in case of a custom (non-Arm) MPU.
+
 <p>&nbsp;</p>
 
 \anchor DtzEnum <b>Table: Device Trust Zone </b>