[MP1] Update OpenAMP to v1.0.3

https://github.com/STMicroelectronics/STM32CubeMP1/releases/tag/1.1.1

Signed-off-by: Frederic Pillon <[email protected]>

Author: fpistm

system/Middlewares/OpenAMP/libmetal/lib/include/metal/system/generic/condition.h

@@ -19,7 +19,6 @@
 #if defined (__CC_ARM)
 #include <stdio.h>
 #endif
-#include <unistd.h>
 #include <metal/atomic.h>
 #include <stdint.h>
 #include <limits.h>

system/Middlewares/OpenAMP/libmetal/lib/include/metal/system/generic/sys.h

@@ -17,8 +17,6 @@
 #define __METAL_GENERIC_SYS__H__
 
 #include <metal/errno.h>
-#include <fcntl.h>
-#include <libgen.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>

system/Middlewares/OpenAMP/libmetal/st_readme.txt

@@ -18,6 +18,14 @@
   ******************************************************************************
   @endverbatim
 
+### V1.0.1/11-October-2019 ###
+===============================
+
+   + Remove include files not used to fix compilation on IAR and KEIL
+     - lib/include/metal/system/generic/condition.h
+     - lib/include/metal/system/generic/sys.h
+
+
 ### V1.0.0/29-March-2019 ###
 ===============================
    + Integrate official release v2018.10

system/Middlewares/OpenAMP/mw_if/app_if/openamp_conf_template.h

@@ -74,6 +74,13 @@
 #endif /* VIRTUAL_I2C_MODULE_ENABLED */
 
 
+ /* ########################## Linux Master Selection ############################## */
+ /**
+  * @brief Due to Linux compatibility, it's important to distinguish if the MASTER is Linux or not.
+  *        In that case, the LINUX_RPROC_MASTER define is required
+  */
+//#define LINUX_RPROC_MASTER
+
 
 /* USER CODE BEGIN INCLUDE */
 
@@ -154,7 +161,7 @@ extern int __OPENAMP_region_end__[];    /* defined by linker script */
 
 #endif
 
-#if defined STM32MP157Cxx
+#if defined LINUX_RPROC_MASTER
 #define VRING_RX_ADDRESS        -1        /* allocated by Master processor: CA7 */
 #define VRING_TX_ADDRESS        -1        /* allocated by Master processor: CA7 */
 #define VRING_BUFF_ADDRESS      -1        /* allocated by Master processor: CA7 */

system/Middlewares/OpenAMP/mw_if/platform_if/rsc_table_template.c

@@ -61,7 +61,7 @@
 #define __resource              __section_t(.resource_table)
 #endif
 
-#if defined (STM32MP157Cxx)
+#if defined (LINUX_RPROC_MASTER)
  #ifdef VIRTIO_MASTER_ONLY
   #define CONST
  #else
@@ -82,7 +82,7 @@ extern char system_log_buf[];
 #endif
 
 #if defined(__GNUC__)
-#if !defined (__CC_ARM) && !defined (STM32MP157Cxx)
+#if !defined (__CC_ARM) && !defined (LINUX_RPROC_MASTER)
 
 /* Since GCC is not initializing the resource_table at startup, it is declared as volatile to avoid compiler optimization
  * for the CM4 (see resource_table_init() below)
@@ -95,7 +95,7 @@ CONST struct shared_resource_table __resource __attribute__((used)) resource_tab
 __root CONST struct shared_resource_table resource_table @ ".resource_table" = {
 #endif
 
-#if defined(__ICCARM__) || defined (__CC_ARM) || defined (STM32MP157Cxx)
+#if defined(__ICCARM__) || defined (__CC_ARM) || defined (LINUX_RPROC_MASTER)
 	.version = 1,
 #if defined (__LOG_TRACE_IO_)
 	.num = 2,
@@ -130,7 +130,7 @@ __root CONST struct shared_resource_table resource_table @ ".resource_table" = {
 void resource_table_init(int RPMsgRole, void **table_ptr, int *length)
 {
 
-#if !defined (STM32MP157Cxx)
+#if !defined (LINUX_RPROC_MASTER)
 #if defined (__GNUC__) && ! defined (__CC_ARM)
 #ifdef VIRTIO_MASTER_ONLY
 

system/Middlewares/OpenAMP/mw_if/st_readme.txt

@@ -18,6 +18,11 @@
   ******************************************************************************
   @endverbatim
 
+### V1.0.3/08-November-2019 ##
+===============================
+   + openamp_conf_template.h:
+   - replace the "STM32MP157Cxx" define macro with "LINUX_RPROC_MASTER" to support all STM32MP1 varieties
+
 ### V1.0.2/29-July-2019 ###
 ============================
 

system/Middlewares/OpenAMP/open-amp/lib/include/openamp/rpmsg.h

@@ -15,6 +15,7 @@
 #include <openamp/compiler.h>
 #include <metal/mutex.h>
 #include <metal/list.h>
+#include <metal/utilities.h>
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -25,7 +26,7 @@ extern "C" {
 
 /* Configurable parameters */
 #define RPMSG_NAME_SIZE		(32)
-#define RPMSG_ADDR_BMP_SIZE	(4)
+#define RPMSG_ADDR_BMP_SIZE	(128)
 
 #define RPMSG_NS_EPT_ADDR	(0x35)
 #define RPMSG_ADDR_ANY		0xFFFFFFFF
@@ -101,7 +102,7 @@ struct rpmsg_device_ops {
 struct rpmsg_device {
 	struct metal_list endpoints;
 	struct rpmsg_endpoint ns_ept;
-	unsigned long bitmap[RPMSG_ADDR_BMP_SIZE];
+	unsigned long bitmap[metal_bitmap_longs(RPMSG_ADDR_BMP_SIZE)];
 	metal_mutex_t lock;
 	rpmsg_ns_bind_cb ns_bind_cb;
 	struct rpmsg_device_ops ops;

system/Middlewares/OpenAMP/open-amp/lib/rpmsg/rpmsg.c

@@ -9,7 +9,6 @@
 
 #include <openamp/rpmsg.h>
 #include <metal/alloc.h>
-#include <metal/utilities.h>
 
 #include "rpmsg_internal.h"
 

system/Middlewares/OpenAMP/open-amp/st_readme.txt

@@ -19,6 +19,14 @@
 
   @endverbatim
 
+### V1.0.1/11-October-2019 ###
+===============================
+   + Change RPMSG_ADDR_BMP_SIZE to increase the number of Virtual UART instances
+
+     -lib/include/openamp/rpmsg.h
+     -lib/rpmsg/rpmsg.c
+
+
 ### V1.0.0/29-March-2019 ###
 ===============================
    + Integrate official release v2018.10