system(openamp): update middleware to MP1 Cube version 1.7.0

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

Author: fpistm

Diff for: system/Middlewares/OpenAMP/libmetal/lib/atomic.h

@@ -94,7 +94,7 @@ using std::atomic_fetch_and_explicit;
 using std::atomic_thread_fence;
 using std::atomic_signal_fence;
 
-#elif defined(HAVE_STDATOMIC_H) && !defined(__CC_ARM) && \
+#elif defined(HAVE_STDATOMIC_H) && !defined(__ARMCC_VERSION) && \
       !defined(__STDC_NO_ATOMICS__)
 # include <stdint.h>
 # include <stdatomic.h>

Diff for: system/Middlewares/OpenAMP/libmetal/lib/compiler.h

@@ -16,7 +16,7 @@
 # include <metal/compiler/gcc/compiler.h>
 #elif defined(__ICCARM__)
 # include <metal/compiler/iar/compiler.h>
-#elif defined(__CC_ARM)
+#elif defined(__ARMCC_VERSION)
 # error "MDK-ARM ARMCC compiler requires the GNU extentions to work correctly"
 #else
 # error "Missing compiler support"

Diff for: system/Middlewares/OpenAMP/libmetal/lib/errno.h

@@ -14,7 +14,7 @@
 
 #if defined(__ICCARM__)
 # include <metal/compiler/iar/errno.h>
-#elif defined(__CC_ARM)
+#elif defined(__ARMCC_VERSION)
 # include <metal/compiler/armcc/errno.h>
 #else
 # include <errno.h>

Diff for: system/Middlewares/OpenAMP/libmetal/lib/include/metal/atomic.h

@@ -94,7 +94,7 @@ using std::atomic_fetch_and_explicit;
 using std::atomic_thread_fence;
 using std::atomic_signal_fence;
 
-#elif defined(HAVE_STDATOMIC_H) && !defined(__CC_ARM) && \
+#elif defined(HAVE_STDATOMIC_H) && !defined(__ARMCC_VERSION) && \
       !defined(__STDC_NO_ATOMICS__)
 # include <stdint.h>
 # include <stdatomic.h>

Diff for: system/Middlewares/OpenAMP/libmetal/lib/include/metal/compiler.h

@@ -16,7 +16,7 @@
 # include <metal/compiler/gcc/compiler.h>
 #elif defined(__ICCARM__)
 # include <metal/compiler/iar/compiler.h>
-#elif defined(__CC_ARM)
+#elif defined(__ARMCC_VERSION)
 # error "MDK-ARM ARMCC compiler requires the GNU extentions to work correctly"
 #else
 # error "Missing compiler support"

Diff for: system/Middlewares/OpenAMP/libmetal/lib/include/metal/errno.h

@@ -14,7 +14,7 @@
 
 #if defined(__ICCARM__)
 # include <metal/compiler/iar/errno.h>
-#elif defined(__CC_ARM)
+#elif defined(__ARMCC_VERSION)
 # include <metal/compiler/armcc/errno.h>
 #else
 # include <errno.h>

Diff for: system/Middlewares/OpenAMP/libmetal/st_readme.txt

@@ -18,6 +18,16 @@
   ******************************************************************************
   @endverbatim
 
+### V1.0.6/13-December-2024 ###
+===============================
+   + Fix compilation error with ARM Compiler verion 6 MDK-ARM
+     - lib/atomic.h
+     - lib/errno.h
+     - lib/compiler.h
+     - lib/include/metal/atomic.h
+     - lib/include/metal/errno.h
+     - lib/include/metal/compiler.h
+
 ### V1.0.5/18-January-2022 ###
 ===============================
    + Integrate official release v2021.10

Diff for: system/Middlewares/OpenAMP/virtual_driver/virt_uart.c

@@ -46,13 +46,7 @@
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
 /* this string will be sent to remote processor */
-/* Since openSTLinux distribution 4.0 with Linux 5.15,
-   RPMSG_SERVICE_NAME has been renamed from 'rpmsg-tty-channel' to 'rpmsg-tty'
-   if older distribution is used, it is required to redefine it to 'rpmsg-tty-channel'
-*/
-#ifndef RPMSG_SERVICE_NAME
-  #define RPMSG_SERVICE_NAME              "rpmsg-tty"
-#endif
+#define RPMSG_SERVICE_NAME              "rpmsg-tty"
 
 /* Private macro -------------------------------------------------------------*/
 /* Private variables ---------------------------------------------------------*/