MPC extended: now both Secure and Privileged attribute can be used to verified memory access.

CMSIS/DoxyGen/Zone/src/GenDataModel.txt

@@ -25,7 +25,7 @@ scalar-types:
 
 \b hash: variable that that stores one or more variables with a unique lookup name
 
-\b sequence: variable that stores subvariables without names but instead are selected via index (myVariable[index])
+\b sequence: variable that stores sub-variables without names but instead are selected via index (myVariable[index])
 
 A variable is accessed using the dollar character followed by a variable or expression in brackets:
 \code
@@ -368,13 +368,23 @@ The \ref fm_mpc_setup contains a sequence of device specific configuration for t
     <td>xs:string</td>
   </tr>
   <tr>
-    <td>.reg_setup[<i>n</i>].blk_cfg</td>
-    <td>The block size information that should be stored in the BLK_CFG register.</td>
+    <td>.reg_setup[<i>n</i>].blk_size</td>
+    <td>The block size information that CMSIS-Zone used for LUT generation.</td>
     <td>NonNegativeInteger</td>
   </tr>
   <tr>
-    <td>.reg_setup[<i>n</i>].blk_lut[<i>m</i>]</td>
-    <td>The values for the BLK_LUT look-up table.</td>
+    <td>.reg_setup[<i>n</i>].S_lut[<i>m</i>]</td>
+    <td>The look-up table (LUT) bit values for Secure attribute.</td>
+    <td>NonNegativeInteger</td>
+  </tr>
+  <tr>
+    <td>.reg_setup[<i>n</i>].P_lut[<i>m</i>]</td>
+    <td>The look-up table (LUT) bit values for Privileged attribute.</td>
+    <td>NonNegativeInteger</td>
+  </tr>
+  <tr>
+    <td>.reg_setup[<i>n</i>].lut[<i>m</i>]</td>
+    <td>The look-up table (LUT) bit values for a combined Secure and Privileged attribute (\ref xml_rmpc - \b format attribute specifies the format of the LUT).</td>
     <td>NonNegativeInteger</td>
   </tr>
   <tr>

CMSIS/DoxyGen/Zone/src/XML_Format.txt

@@ -760,6 +760,23 @@ The \ref xml_rmpc element specifies a Memory Protection Controller (MPC) for the
     <td>NonNegativeInteger</td>
     <td>required</td>
   </tr>
+  <tr>
+    <td>type</td>
+    <td>Specifies the permissions that the MPC verifies for the memory access:\n
+	  - type="s" : (default) only the Secure attribute is verified.
+	  - type="p" : only the Privileged attribute is verified.
+	  - type="sp" : both the Secure are Privileged attribute are verified.
+    <td>MpcTypeEnum</td>
+    <td>optional</td>
+  </tr>
+  <tr>
+    <td>format</td>
+    <td>Generate a combined LUT that contains both Secure and Privileged attribute (default no combined LUT is generated)\n
+	  - format="sp" : odd bits (1, 3, 5, ...) contain Secure attribute; even bits (0, 2, 4, ...) contain Privileged attribute.
+	  - format="ps" : odd bits (1, 3, 5, ...) contain Privileged attribute; even bits (0, 2, 4, ...) contain Secure attribute.
+    <td>MpcFormatEnum</td>
+    <td>optional</td>
+  </tr>
 </table>