Update OpenAmp Middleware to MP1 Cube version 1.6.0

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

Author: fpistm

system/Middlewares/OpenAMP/libmetal/CMakeLists.txt

@@ -7,6 +7,8 @@ if (POLICY CMP0077)
   cmake_policy(SET CMP0077 NEW)
 endif()
 
+set (LIBMETAL_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+
 list (APPEND CMAKE_MODULE_PATH
       "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
       "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"

system/Middlewares/OpenAMP/libmetal/MAINTAINERS.md

@@ -1,22 +1,15 @@
 # libmetal Maintainers
 
-libmetal project is maintained by the OpenAMP open source community.
+The libmetal project is maintained by the OpenAMP open source community.
 Everyone is encouraged to submit issues and changes to improve libmetal.
 
 The intention of this file is to provide a set of names that developers can
 consult when they have a question about OpenAMP and to provide a a set of
 names to be CC'd when submitting a patch.
 
 ## Project Administration
-Ed Mooring <ed.mooring@linaro.org>
+Ed Mooring <ed.mooring@gmail.com>
 Arnaud Pouliquen <arnaud.pouliquen@st.com>
 
 ### All patches CC here
 openamp-rp@lists.openampproject.org
-
-## Machines
-### Xilinx Platform - Zynq-7000
-Ed Mooring <ed.mooring@linaro.org>
-
-### Xilinx Platform - Zynq UltraScale+ MPSoC
-Ed Mooring <ed.mooring@linaro.org>

system/Middlewares/OpenAMP/libmetal/VERSION

@@ -1,3 +1,3 @@
 VERSION_MAJOR = 1
-VERSION_MINOR = 0
+VERSION_MINOR = 1
 VERSION_PATCH = 0

system/Middlewares/OpenAMP/libmetal/cmake/options.cmake

@@ -1,4 +1,4 @@
-file(READ ${CMAKE_SOURCE_DIR}/VERSION ver)
+file(READ ${LIBMETAL_ROOT_DIR}/VERSION ver)
 
 string(REGEX MATCH "VERSION_MAJOR = ([0-9]*)" _ ${ver})
 set(PROJECT_VERSION_MAJOR ${CMAKE_MATCH_1})

system/Middlewares/OpenAMP/libmetal/cmake/syscheck.cmake

@@ -7,7 +7,8 @@ if (WITH_ZEPHYR)
   if (NOT WITH_ZEPHYR_LIB)
     include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
   endif()
-  if (CONFIG_CPU_CORTEX_M)
-    set (MACHINE "cortexm" CACHE STRING "")
-  endif (CONFIG_CPU_CORTEX_M)
+  if (CONFIG_ARM)
+    set (MACHINE "arm" CACHE STRING "")
+  endif(CONFIG_ARM)
+
 endif (WITH_ZEPHYR)

system/Middlewares/OpenAMP/libmetal/lib/alloc.h

@@ -36,12 +36,13 @@ static inline void *metal_allocate_memory(unsigned int size);
  */
 static inline void metal_free_memory(void *ptr);
 
-#include <metal/system/@PROJECT_SYSTEM@/alloc.h>
-
 /** @} */
 
 #ifdef __cplusplus
 }
 #endif
 
+#include <metal/system/@PROJECT_SYSTEM@/alloc.h>
+
+
 #endif /* __METAL_ALLOC__H__ */

system/Middlewares/OpenAMP/libmetal/lib/condition.h

@@ -63,12 +63,12 @@ static inline int metal_condition_broadcast(struct metal_condition *cv);
  */
 int metal_condition_wait(struct metal_condition *cv, metal_mutex_t *m);
 
-#include <metal/system/@PROJECT_SYSTEM@/condition.h>
-
 /** @} */
 
 #ifdef __cplusplus
 }
 #endif
 
+#include <metal/system/@PROJECT_SYSTEM@/condition.h>
+
 #endif /* __METAL_CONDITION__H__ */

system/Middlewares/OpenAMP/libmetal/lib/dma.h

@@ -12,6 +12,9 @@
 #ifndef __METAL_DMA__H__
 #define __METAL_DMA__H__
 
+#include <stdint.h>
+#include <metal/sys.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -20,9 +23,6 @@ extern "C" {
  *  @{
  */
 
-#include <stdint.h>
-#include <metal/sys.h>
-
 #define METAL_DMA_DEV_R  1 /**< DMA direction, device read */
 #define METAL_DMA_DEV_W  2 /**< DMA direction, device write */
 #define METAL_DMA_DEV_WR 3 /**< DMA direction, device read/write */

system/Middlewares/OpenAMP/libmetal/lib/include/metal/alloc.h

@@ -36,16 +36,16 @@ static inline void *metal_allocate_memory(unsigned int size);
  */
 static inline void metal_free_memory(void *ptr);
 
-#ifdef METAL_FREERTOS
-#include <metal/system/freertos/alloc.h>
-#else
-#include <metal/system/generic/alloc.h>
-#endif
-
 /** @} */
 
 #ifdef __cplusplus
 }
 #endif
 
+#ifdef METAL_FREERTOS
+#include <metal/system/freertos/alloc.h>
+#else
+#include <metal/system/generic/alloc.h>
+#endif
+
 #endif /* __METAL_ALLOC__H__ */

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

@@ -63,16 +63,16 @@ static inline int metal_condition_broadcast(struct metal_condition *cv);
  */
 int metal_condition_wait(struct metal_condition *cv, metal_mutex_t *m);
 
-#ifdef METAL_FREERTOS
-#include <metal/system/freertos/condition.h>
-#else
-#include <metal/system/generic/condition.h>
-#endif
-
 /** @} */
 
 #ifdef __cplusplus
 }
 #endif
 
+#ifdef METAL_FREERTOS
+#include <metal/system/freertos/condition.h>
+#else
+#include <metal/system/generic/condition.h>
+#endif
+
 #endif /* __METAL_CONDITION__H__ */