Fix PSA-SPM Documentation

Author: Oren Cohen

components/TARGET_PSA/spm/doc/INTRO.md

@@ -2099,6 +2099,8 @@ PREDEFINED             = DOXYGEN_ONLY            \
                          DEVICE_SPISLAVE         \
                          DEVICE_QSPI             \
                          DEVICE_STORAGE          \
+                         COMPONENT_SPE           \
+                         COMPONENT_SPM_MAILBOX   \
                          "MBED_DEPRECATED_SINCE(d, m)=" \
                          "MBED_ENABLE_IF_CALLBACK_COMPATIBLE(F, M)=" \
                          "MBED_DEPRECATED(s)="

components/TARGET_PSA/spm/doc/README.md

@@ -6,7 +6,7 @@
     "SEARCH_INCLUDES": "YES",
     "INCLUDE_PATH": "",
     "INCLUDE_FILE_PATTERNS": "",
-    "PREDEFINED": "DOXYGEN_ONLY DEVICE_ANALOGIN DEVICE_ANALOGOUT DEVICE_CAN DEVICE_CRC DEVICE_ETHERNET DEVICE_EMAC DEVICE_FLASH  DEVICE_I2C DEVICE_I2CSLAVE DEVICE_I2C_ASYNCH DEVICE_INTERRUPTIN DEVICE_ITM DEVICE_LPTICKER DEVICE_MPU DEVICE_PORTIN DEVICE_PORTINOUT DEVICE_PORTOUT DEVICE_PWMOUT DEVICE_RTC DEVICE_TRNG DEVICE_SERIAL DEVICE_SERIAL_ASYNCH DEVICE_SERIAL_FC DEVICE_SLEEP DEVICE_SPI DEVICE_SPI_ASYNCH DEVICE_SPISLAVE DEVICE_QSPI DEVICE_STORAGE \"MBED_DEPRECATED_SINCE(f, g)=\" \"MBED_ENABLE_IF_CALLBACK_COMPATIBLE(F, M)=\" \"MBED_DEPRECATED(s)=\"",
+    "PREDEFINED": "DOXYGEN_ONLY DEVICE_ANALOGIN DEVICE_ANALOGOUT DEVICE_CAN DEVICE_CRC DEVICE_ETHERNET DEVICE_EMAC DEVICE_FLASH  DEVICE_I2C DEVICE_I2CSLAVE DEVICE_I2C_ASYNCH DEVICE_INTERRUPTIN DEVICE_ITM DEVICE_LPTICKER DEVICE_MPU DEVICE_PORTIN DEVICE_PORTINOUT DEVICE_PORTOUT DEVICE_PWMOUT DEVICE_RTC DEVICE_TRNG DEVICE_SERIAL DEVICE_SERIAL_ASYNCH DEVICE_SERIAL_FC DEVICE_SLEEP DEVICE_SPI DEVICE_SPI_ASYNCH DEVICE_SPISLAVE DEVICE_QSPI DEVICE_STORAGE COMPONENT_SPE COMPONENT_SPM_MAILBOX \"MBED_DEPRECATED_SINCE(f, g)=\" \"MBED_ENABLE_IF_CALLBACK_COMPATIBLE(F, M)=\" \"MBED_DEPRECATED(s)=\"",
     "EXPAND_AS_DEFINED": "",
     "SKIP_FUNCTION_MACROS": "NO",
     "STRIP_CODE_COMMENTS": "NO",

components/TARGET_PSA/spm/doc/png/PSA-standardized-Interfaces-diagram.png

@@ -1,3 +1,6 @@
+
+/** \addtogroup hal */
+/** @{*/
 /* Copyright (c) 2017-2018 ARM Limited
  *
  * SPDX-License-Identifier: Apache-2.0
@@ -18,14 +21,6 @@
 #ifndef __SPM_API_H__
 #define __SPM_API_H__
 
-
-/** @addtogroup SPM
- * The Secure Partition Manager (SPM) is responsible for isolating software in
- * partitions, managing the execution of software within partitions and
- * providing IPC between partitions.
- * @{
- */
-
 #include <stdint.h>
 #include <stddef.h>
 
@@ -34,8 +29,7 @@ extern "C" {
 #endif
 
 
-/** @addtogroup HAL-SPE
- *  The HAL functions for SPE.
+/** @defgroup SPM HAL
  * @{
  */
 
@@ -92,12 +86,12 @@ void spm_hal_mailbox_notify(void);
 
 #endif // defined(COMPONENT_SPM_MAILBOX)
 
-/** @}*/ // end of HAL-SPE group
+/** @}*/
 
 #ifdef __cplusplus
 }
 #endif
 
-/** @}*/ // end of SPM group
-
 #endif  // __SPM_API_H__
+
+/** @}*/