Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd68b35c

Browse files
committed
[MP1] Update OpenAMP to v1.0.3
https://github.com/STMicroelectronics/STM32CubeMP1/releases/tag/1.1.1Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent4583246 commitd68b35c

File tree

9 files changed

+36
-11
lines changed

9 files changed

+36
-11
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#if defined (__CC_ARM)
2020
#include<stdio.h>
2121
#endif
22-
#include<unistd.h>
2322
#include<metal/atomic.h>
2423
#include<stdint.h>
2524
#include<limits.h>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
#define__METAL_GENERIC_SYS__H__
1818

1919
#include<metal/errno.h>
20-
#include<fcntl.h>
21-
#include<libgen.h>
2220
#include<limits.h>
2321
#include<stdio.h>
2422
#include<stdlib.h>

‎system/Middlewares/OpenAMP/libmetal/st_readme.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@
1818
******************************************************************************
1919
@endverbatim
2020

21+
### V1.0.1/11-October-2019 ###
22+
===============================
23+
24+
+ Remove include files not used to fix compilation on IAR and KEIL
25+
- lib/include/metal/system/generic/condition.h
26+
- lib/include/metal/system/generic/sys.h
27+
28+
2129
### V1.0.0/29-March-2019 ###
2230
===============================
2331
+ Integrate official release v2018.10

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,13 @@
7474
#endif/* VIRTUAL_I2C_MODULE_ENABLED */
7575

7676

77+
/* ########################## Linux Master Selection ############################## */
78+
/**
79+
* @brief Due to Linux compatibility, it's important to distinguish if the MASTER is Linux or not.
80+
* In that case, the LINUX_RPROC_MASTER define is required
81+
*/
82+
//#define LINUX_RPROC_MASTER
83+
7784

7885
/* USER CODE BEGIN INCLUDE */
7986

@@ -154,7 +161,7 @@ extern int __OPENAMP_region_end__[]; /* defined by linker script */
154161

155162
#endif
156163

157-
#if definedSTM32MP157Cxx
164+
#if definedLINUX_RPROC_MASTER
158165
#defineVRING_RX_ADDRESS -1/* allocated by Master processor: CA7 */
159166
#defineVRING_TX_ADDRESS -1/* allocated by Master processor: CA7 */
160167
#defineVRING_BUFF_ADDRESS -1/* allocated by Master processor: CA7 */

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
#define__resource __section_t(.resource_table)
6262
#endif
6363

64-
#if defined (STM32MP157Cxx)
64+
#if defined (LINUX_RPROC_MASTER)
6565
#ifdefVIRTIO_MASTER_ONLY
6666
#defineCONST
6767
#else
@@ -82,7 +82,7 @@ extern char system_log_buf[];
8282
#endif
8383

8484
#if defined(__GNUC__)
85-
#if !defined (__CC_ARM)&& !defined (STM32MP157Cxx)
85+
#if !defined (__CC_ARM)&& !defined (LINUX_RPROC_MASTER)
8686

8787
/* Since GCC is not initializing the resource_table at startup, it is declared as volatile to avoid compiler optimization
8888
* for the CM4 (see resource_table_init() below)
@@ -95,7 +95,7 @@ CONST struct shared_resource_table __resource __attribute__((used)) resource_tab
9595
__rootCONSTstructshared_resource_tableresource_table @".resource_table"= {
9696
#endif
9797

98-
#if defined(__ICCARM__)|| defined (__CC_ARM)|| defined (STM32MP157Cxx)
98+
#if defined(__ICCARM__)|| defined (__CC_ARM)|| defined (LINUX_RPROC_MASTER)
9999
.version=1,
100100
#if defined (__LOG_TRACE_IO_)
101101
.num=2,
@@ -130,7 +130,7 @@ __root CONST struct shared_resource_table resource_table @ ".resource_table" = {
130130
voidresource_table_init(intRPMsgRole,void**table_ptr,int*length)
131131
{
132132

133-
#if !defined (STM32MP157Cxx)
133+
#if !defined (LINUX_RPROC_MASTER)
134134
#if defined (__GNUC__)&& ! defined (__CC_ARM)
135135
#ifdefVIRTIO_MASTER_ONLY
136136

‎system/Middlewares/OpenAMP/mw_if/st_readme.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
******************************************************************************
1919
@endverbatim
2020

21+
### V1.0.3/08-November-2019 ##
22+
===============================
23+
+ openamp_conf_template.h:
24+
- replace the "STM32MP157Cxx" define macro with "LINUX_RPROC_MASTER" to support all STM32MP1 varieties
25+
2126
### V1.0.2/29-July-2019 ###
2227
============================
2328

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include<openamp/compiler.h>
1616
#include<metal/mutex.h>
1717
#include<metal/list.h>
18+
#include<metal/utilities.h>
1819
#include<string.h>
1920
#include<stdbool.h>
2021
#include<stdint.h>
@@ -25,7 +26,7 @@ extern "C" {
2526

2627
/* Configurable parameters */
2728
#defineRPMSG_NAME_SIZE(32)
28-
#defineRPMSG_ADDR_BMP_SIZE(4)
29+
#defineRPMSG_ADDR_BMP_SIZE(128)
2930

3031
#defineRPMSG_NS_EPT_ADDR(0x35)
3132
#defineRPMSG_ADDR_ANY0xFFFFFFFF
@@ -101,7 +102,7 @@ struct rpmsg_device_ops {
101102
structrpmsg_device {
102103
structmetal_listendpoints;
103104
structrpmsg_endpointns_ept;
104-
unsigned longbitmap[RPMSG_ADDR_BMP_SIZE];
105+
unsigned longbitmap[metal_bitmap_longs(RPMSG_ADDR_BMP_SIZE)];
105106
metal_mutex_tlock;
106107
rpmsg_ns_bind_cbns_bind_cb;
107108
structrpmsg_device_opsops;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#include<openamp/rpmsg.h>
1111
#include<metal/alloc.h>
12-
#include<metal/utilities.h>
1312

1413
#include"rpmsg_internal.h"
1514

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@
1919

2020
@endverbatim
2121

22+
### V1.0.1/11-October-2019 ###
23+
===============================
24+
+ Change RPMSG_ADDR_BMP_SIZE to increase the number of Virtual UART instances
25+
26+
-lib/include/openamp/rpmsg.h
27+
-lib/rpmsg/rpmsg.c
28+
29+
2230
### V1.0.0/29-March-2019 ###
2331
===============================
2432
+ Integrate official release v2018.10

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp