File tree Expand file tree Collapse file tree 14 files changed +126
-71
lines changed
system/Middlewares/OpenAMP
lib/include/metal/system/generic Expand file tree Collapse file tree 14 files changed +126
-71
lines changed Original file line number Diff line number Diff line change @@ -916,7 +916,7 @@ uint16_t adc_read_value(PinName pin)
916
916
!defined (STM32WBxx) && !defined (STM32F373xC) && !defined (STM32F378xx)
917
917
AdcChannelConf.Offset = 0 ; /* Parameter discarded because offset correction is disabled */
918
918
#endif
919
- #if defined (STM32H7xx)
919
+ #if defined (STM32H7xx) || defined(STM32MP1xx)
920
920
AdcChannelConf.OffsetRightShift = DISABLE; /* No Right Offset Shift */
921
921
AdcChannelConf.OffsetSignedSaturation = DISABLE; /* Signed saturation feature is not used */
922
922
#endif
@@ -929,12 +929,13 @@ uint16_t adc_read_value(PinName pin)
929
929
930
930
#if defined(STM32F0xx) || defined(STM32F1xx) || defined(STM32F3xx) || \
931
931
defined (STM32G0xx) || defined (STM32G4xx) || defined (STM32H7xx) || \
932
- defined (STM32L0xx) || defined (STM32L4xx) || defined (STM32WBxx)
932
+ defined (STM32L0xx) || defined (STM32L4xx) || defined (STM32MP1xx) || \
933
+ defined (STM32WBxx)
933
934
/* ##-2.1- Calibrate ADC then Start the conversion process ####################*/
934
935
#if defined(STM32F0xx) || defined(STM32G0xx) || defined(STM32F1xx) || \
935
936
defined (STM32F373xC) || defined (STM32F378xx)
936
937
if (HAL_ADCEx_Calibration_Start (&AdcHandle) != HAL_OK)
937
- #elif defined (STM32H7xx)
938
+ #elif defined (STM32H7xx) || defined(STM32MP1xx)
938
939
if (HAL_ADCEx_Calibration_Start (&AdcHandle, ADC_CALIB_OFFSET, ADC_SINGLE_ENDED) != HAL_OK)
939
940
#else
940
941
if (HAL_ADCEx_Calibration_Start (&AdcHandle, ADC_SINGLE_ENDED) != HAL_OK)
Original file line number Diff line number Diff line change @@ -209,4 +209,4 @@ tools.remoteproc_gen.busybox.windows={path}/win/busybox.exe
209
209
tools.remoteproc_gen.script=run_arduino_gen.sh
210
210
tools.remoteproc_gen.upload.params.verbose=
211
211
tools.remoteproc_gen.upload.params.quiet=
212
- tools.remoteproc_gen.upload.pattern="{busybox}" sh "{path}/{script}" generate "{build.path}/{build.project_name}.elf" "{build.path}/run_arduino .sh"
212
+ tools.remoteproc_gen.upload.pattern="{busybox}" sh "{path}/{script}" generate "{build.path}/{build.project_name}.elf" "{build.path}/run_arduino_{build.project_name} .sh"
Original file line number Diff line number Diff line change 19
19
#if defined (__CC_ARM )
20
20
#include <stdio.h>
21
21
#endif
22
- #include <unistd.h>
23
22
#include <metal/atomic.h>
24
23
#include <stdint.h>
25
24
#include <limits.h>
Original file line number Diff line number Diff line change 17
17
#define __METAL_GENERIC_SYS__H__
18
18
19
19
#include <metal/errno.h>
20
- #include <fcntl.h>
21
- #include <libgen.h>
22
20
#include <limits.h>
23
21
#include <stdio.h>
24
22
#include <stdlib.h>
Original file line number Diff line number Diff line change 18
18
******************************************************************************
19
19
@endverbatim
20
20
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
+
21
29
### V1.0.0/29-March-2019 ###
22
30
===============================
23
31
+ Integrate official release v2018.10
Original file line number Diff line number Diff line change 74
74
#endif /* VIRTUAL_I2C_MODULE_ENABLED */
75
75
76
76
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
+
77
84
78
85
/* USER CODE BEGIN INCLUDE */
79
86
@@ -154,7 +161,7 @@ extern int __OPENAMP_region_end__[]; /* defined by linker script */
154
161
155
162
#endif
156
163
157
- #if defined STM32MP157Cxx
164
+ #if defined LINUX_RPROC_MASTER
158
165
#define VRING_RX_ADDRESS -1 /* allocated by Master processor: CA7 */
159
166
#define VRING_TX_ADDRESS -1 /* allocated by Master processor: CA7 */
160
167
#define VRING_BUFF_ADDRESS -1 /* allocated by Master processor: CA7 */
Original file line number Diff line number Diff line change 61
61
#define __resource __section_t(.resource_table)
62
62
#endif
63
63
64
- #if defined (STM32MP157Cxx )
64
+ #if defined (LINUX_RPROC_MASTER )
65
65
#ifdef VIRTIO_MASTER_ONLY
66
66
#define CONST
67
67
#else
@@ -82,7 +82,7 @@ extern char system_log_buf[];
82
82
#endif
83
83
84
84
#if defined(__GNUC__ )
85
- #if !defined (__CC_ARM ) && !defined (STM32MP157Cxx )
85
+ #if !defined (__CC_ARM ) && !defined (LINUX_RPROC_MASTER )
86
86
87
87
/* Since GCC is not initializing the resource_table at startup, it is declared as volatile to avoid compiler optimization
88
88
* for the CM4 (see resource_table_init() below)
@@ -95,7 +95,7 @@ CONST struct shared_resource_table __resource __attribute__((used)) resource_tab
95
95
__root CONST struct shared_resource_table resource_table @ ".resource_table" = {
96
96
#endif
97
97
98
- #if defined(__ICCARM__ ) || defined (__CC_ARM ) || defined (STM32MP157Cxx )
98
+ #if defined(__ICCARM__ ) || defined (__CC_ARM ) || defined (LINUX_RPROC_MASTER )
99
99
.version = 1 ,
100
100
#if defined (__LOG_TRACE_IO_ )
101
101
.num = 2 ,
@@ -130,7 +130,7 @@ __root CONST struct shared_resource_table resource_table @ ".resource_table" = {
130
130
void resource_table_init (int RPMsgRole , void * * table_ptr , int * length )
131
131
{
132
132
133
- #if !defined (STM32MP157Cxx )
133
+ #if !defined (LINUX_RPROC_MASTER )
134
134
#if defined (__GNUC__ ) && ! defined (__CC_ARM )
135
135
#ifdef VIRTIO_MASTER_ONLY
136
136
Original file line number Diff line number Diff line change 18
18
******************************************************************************
19
19
@endverbatim
20
20
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
+
21
26
### V1.0.2/29-July-2019 ###
22
27
============================
23
28
Original file line number Diff line number Diff line change 15
15
#include <openamp/compiler.h>
16
16
#include <metal/mutex.h>
17
17
#include <metal/list.h>
18
+ #include <metal/utilities.h>
18
19
#include <string.h>
19
20
#include <stdbool.h>
20
21
#include <stdint.h>
@@ -25,7 +26,7 @@ extern "C" {
25
26
26
27
/* Configurable parameters */
27
28
#define RPMSG_NAME_SIZE (32)
28
- #define RPMSG_ADDR_BMP_SIZE (4 )
29
+ #define RPMSG_ADDR_BMP_SIZE (128 )
29
30
30
31
#define RPMSG_NS_EPT_ADDR (0x35)
31
32
#define RPMSG_ADDR_ANY 0xFFFFFFFF
@@ -101,7 +102,7 @@ struct rpmsg_device_ops {
101
102
struct rpmsg_device {
102
103
struct metal_list endpoints ;
103
104
struct rpmsg_endpoint ns_ept ;
104
- unsigned long bitmap [RPMSG_ADDR_BMP_SIZE ];
105
+ unsigned long bitmap [metal_bitmap_longs ( RPMSG_ADDR_BMP_SIZE ) ];
105
106
metal_mutex_t lock ;
106
107
rpmsg_ns_bind_cb ns_bind_cb ;
107
108
struct rpmsg_device_ops ops ;
Original file line number Diff line number Diff line change 9
9
10
10
#include <openamp/rpmsg.h>
11
11
#include <metal/alloc.h>
12
- #include <metal/utilities.h>
13
12
14
13
#include "rpmsg_internal.h"
15
14
You can’t perform that action at this time.
0 commit comments