diff --git a/libraries/RPC/LICENSE b/libraries/RPC/LICENSE
new file mode 100644
index 000000000..a612ad981
--- /dev/null
+++ b/libraries/RPC/LICENSE
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+ means each individual or legal entity that creates, contributes to
+ the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+ means the combination of the Contributions of others (if any) used
+ by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+ means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+ means Source Code Form to which the initial Contributor has attached
+ the notice in Exhibit A, the Executable Form of such Source Code
+ Form, and Modifications of such Source Code Form, in each case
+ including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+ means
+
+ (a) that the initial Contributor has attached the notice described
+ in Exhibit B to the Covered Software; or
+
+ (b) that the Covered Software was made available under the terms of
+ version 1.1 or earlier of the License, but not also under the
+ terms of a Secondary License.
+
+1.6. "Executable Form"
+ means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+ means a work that combines Covered Software with other material, in
+ a separate file or files, that is not Covered Software.
+
+1.8. "License"
+ means this document.
+
+1.9. "Licensable"
+ means having the right to grant, to the maximum extent possible,
+ whether at the time of the initial grant or subsequently, any and
+ all of the rights conveyed by this License.
+
+1.10. "Modifications"
+ means any of the following:
+
+ (a) any file in Source Code Form that results from an addition to,
+ deletion from, or modification of the contents of Covered
+ Software; or
+
+ (b) any new file in Source Code Form that contains any Covered
+ Software.
+
+1.11. "Patent Claims" of a Contributor
+ means any patent claim(s), including without limitation, method,
+ process, and apparatus claims, in any patent Licensable by such
+ Contributor that would be infringed, but for the grant of the
+ License, by the making, using, selling, offering for sale, having
+ made, import, or transfer of either its Contributions or its
+ Contributor Version.
+
+1.12. "Secondary License"
+ means either the GNU General Public License, Version 2.0, the GNU
+ Lesser General Public License, Version 2.1, the GNU Affero General
+ Public License, Version 3.0, or any later versions of those
+ licenses.
+
+1.13. "Source Code Form"
+ means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+ means an individual or a legal entity exercising rights under this
+ License. For legal entities, "You" includes any entity that
+ controls, is controlled by, or is under common control with You. For
+ purposes of this definition, "control" means (a) the power, direct
+ or indirect, to cause the direction or management of such entity,
+ whether by contract or otherwise, or (b) ownership of more than
+ fifty percent (50%) of the outstanding shares or beneficial
+ ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+ Licensable by such Contributor to use, reproduce, make available,
+ modify, display, perform, distribute, and otherwise exploit its
+ Contributions, either on an unmodified basis, with Modifications, or
+ as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+ for sale, have made, import, and otherwise transfer either its
+ Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+ or
+
+(b) for infringements caused by: (i) Your and any other third party's
+ modifications of Covered Software, or (ii) the combination of its
+ Contributions with other software (except as part of its Contributor
+ Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+ its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+ Form, as described in Section 3.1, and You must inform recipients of
+ the Executable Form how they can obtain a copy of such Source Code
+ Form by reasonable means in a timely manner, at a charge no more
+ than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+ License, or sublicense it under different terms, provided that the
+ license for the Executable Form does not attempt to limit or alter
+ the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+* *
+* 6. Disclaimer of Warranty *
+* ------------------------- *
+* *
+* Covered Software is provided under this License on an "as is" *
+* basis, without warranty of any kind, either expressed, implied, or *
+* statutory, including, without limitation, warranties that the *
+* Covered Software is free of defects, merchantable, fit for a *
+* particular purpose or non-infringing. The entire risk as to the *
+* quality and performance of the Covered Software is with You. *
+* Should any Covered Software prove defective in any respect, You *
+* (not any Contributor) assume the cost of any necessary servicing, *
+* repair, or correction. This disclaimer of warranty constitutes an *
+* essential part of this License. No use of any Covered Software is *
+* authorized under this License except under this disclaimer. *
+* *
+************************************************************************
+
+************************************************************************
+* *
+* 7. Limitation of Liability *
+* -------------------------- *
+* *
+* Under no circumstances and under no legal theory, whether tort *
+* (including negligence), contract, or otherwise, shall any *
+* Contributor, or anyone who distributes Covered Software as *
+* permitted above, be liable to You for any direct, indirect, *
+* special, incidental, or consequential damages of any character *
+* including, without limitation, damages for lost profits, loss of *
+* goodwill, work stoppage, computer failure or malfunction, or any *
+* and all other commercial damages or losses, even if such party *
+* shall have been informed of the possibility of such damages. This *
+* limitation of liability shall not apply to liability for death or *
+* personal injury resulting from such party's negligence to the *
+* extent applicable law prohibits such limitation. Some *
+* jurisdictions do not allow the exclusion or limitation of *
+* incidental or consequential damages, so this exclusion and *
+* limitation may not apply to You. *
+* *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+ This Source Code Form is "Incompatible With Secondary Licenses", as
+ defined by the Mozilla Public License, v. 2.0.
diff --git a/libraries/RPC/src/RPC.cpp b/libraries/RPC/src/RPC.cpp
index 1fde36501..65d0c2b5a 100644
--- a/libraries/RPC/src/RPC.cpp
+++ b/libraries/RPC/src/RPC.cpp
@@ -1,3 +1,5 @@
+// Copyright (c) 2024 Arduino SA
+// SPDX-License-Identifier: MPL-2.0
#include "RPC.h"
#define ENDPOINT_ID_RAW 0
@@ -161,6 +163,35 @@ int RPCClass::begin() {
#endif
#ifdef CORE_CM4
+#if (CM4_BINARY_START >= 0x60000000) && (CM4_BINARY_START < 0xe0000000)
+class M4Init {
+public:
+ M4Init() {
+ // If the Cortex-M4 core is booting from SDRAM, the memory region must be
+ // configured as Strongly Ordered. Note that the Cortex-M4 core does not
+ // seem to implement speculative prefetching, so there is no need to protect
+ // the whole region from speculative prefetching with a second MPU region.
+ HAL_MPU_Disable();
+ MPU_Region_InitTypeDef MPU_InitStruct;
+ MPU_InitStruct.Number = MPU_REGION_NUMBER1;
+ MPU_InitStruct.Enable = MPU_REGION_ENABLE;
+ MPU_InitStruct.BaseAddress = CM4_BINARY_START;
+ MPU_InitStruct.Size = MPU_REGION_SIZE_1MB;
+ MPU_InitStruct.TypeExtField = MPU_TEX_LEVEL0;
+ MPU_InitStruct.AccessPermission = MPU_REGION_FULL_ACCESS;
+ MPU_InitStruct.DisableExec = MPU_INSTRUCTION_ACCESS_ENABLE;
+ MPU_InitStruct.IsShareable = MPU_ACCESS_NOT_SHAREABLE;
+ MPU_InitStruct.IsCacheable = MPU_ACCESS_NOT_CACHEABLE;
+ MPU_InitStruct.IsBufferable = MPU_ACCESS_NOT_BUFFERABLE;
+ MPU_InitStruct.SubRegionDisable = 0x00;
+ HAL_MPU_ConfigRegion(&MPU_InitStruct);
+ HAL_MPU_Enable(MPU_PRIVILEGED_DEFAULT);
+ }
+};
+
+M4Init __m4init __attribute__ ((init_priority (101)));
+#endif
+
int RPCClass::begin() {
eventThread = new rtos::Thread(osPriorityHigh, 16*1024, nullptr, "rpc_evt");
eventThread->start(&eventHandler);
diff --git a/libraries/RPC/src/RPC.h b/libraries/RPC/src/RPC.h
index d4a8729b8..92255f4c8 100644
--- a/libraries/RPC/src/RPC.h
+++ b/libraries/RPC/src/RPC.h
@@ -1,3 +1,5 @@
+// Copyright (c) 2024 Arduino SA
+// SPDX-License-Identifier: MPL-2.0
#ifdef __cplusplus
#ifndef __ARDUINO_RPC_IMPLEMENTATION__
diff --git a/libraries/RPC/src/RPC_client.h b/libraries/RPC/src/RPC_client.h
index 860c0be32..64bbf55b1 100644
--- a/libraries/RPC/src/RPC_client.h
+++ b/libraries/RPC/src/RPC_client.h
@@ -1,3 +1,5 @@
+// Copyright (c) 2024 Arduino SA
+// SPDX-License-Identifier: MPL-2.0
#include "Arduino.h"
#include "mbed.h"
#include "rpc/dispatcher.h"
diff --git a/libraries/RPC/src/SerialRPC.cpp b/libraries/RPC/src/SerialRPC.cpp
index 1965e0cba..0b2d57348 100644
--- a/libraries/RPC/src/SerialRPC.cpp
+++ b/libraries/RPC/src/SerialRPC.cpp
@@ -1,3 +1,5 @@
+// Copyright (c) 2024 Arduino SA
+// SPDX-License-Identifier: MPL-2.0
#include "SerialRPC.h"
#include "RPC.h"
@@ -22,4 +24,4 @@ arduino::SerialRPCClass::operator bool() {
return RPC;
}
-arduino::SerialRPCClass SerialRPC;
\ No newline at end of file
+arduino::SerialRPCClass SerialRPC;
diff --git a/libraries/RPC/src/SerialRPC.h b/libraries/RPC/src/SerialRPC.h
index e732f19db..7c7a4768c 100644
--- a/libraries/RPC/src/SerialRPC.h
+++ b/libraries/RPC/src/SerialRPC.h
@@ -1,3 +1,5 @@
+// Copyright (c) 2024 Arduino SA
+// SPDX-License-Identifier: MPL-2.0
#ifndef __SERIAL_RPC__
#define __SERIAL_RPC__
@@ -69,4 +71,4 @@ class SerialRPCClass : public Stream {
extern arduino::SerialRPCClass SerialRPC;
-#endif
\ No newline at end of file
+#endif
diff --git a/libraries/openamp_arduino/src/openamp_conf.h b/libraries/openamp_arduino/src/openamp_conf.h
index 922b45239..1eeacd81a 100644
--- a/libraries/openamp_arduino/src/openamp_conf.h
+++ b/libraries/openamp_arduino/src/openamp_conf.h
@@ -151,6 +151,9 @@ extern int __OPENAMP_region_end__[];
#define SHM_START_ADDRESS ((metal_phys_addr_t)__OPENAMP_region_start__)
#define SHM_SIZE (size_t)((void *)__OPENAMP_region_end__ - (void *) __OPENAMP_region_start__)
+#define SHM_RSC_SIZE (1024)
+#define SHM_RSC_ADDR ((void *)__OPENAMP_region_start__ - SHM_RSC_SIZE)
+
#endif
#define VRING_RX_ADDRESS SHM_START_ADDRESS
diff --git a/libraries/openamp_arduino/src/rsc_table.c b/libraries/openamp_arduino/src/rsc_table.c
index 3fde24727..f2335dd8f 100644
--- a/libraries/openamp_arduino/src/rsc_table.c
+++ b/libraries/openamp_arduino/src/rsc_table.c
@@ -21,137 +21,58 @@
******************************************************************************
*/
-/** @addtogroup RSC_TABLE
- * @{
- */
-
-/** @addtogroup resource_table
- * @{
- */
-
-/** @addtogroup resource_table_Private_Includes
- * @{
- */
-
-
#if defined(__ICCARM__) || defined (__CC_ARM)
#include <stddef.h> /* needed for offsetof definition*/
#endif
#include "rsc_table.h"
#include "openamp/open_amp.h"
-/**
- * @}
- */
-
-/** @addtogroup resource_table_Private_TypesDefinitions
- * @{
- */
-
-/**
- * @}
- */
-
-/** @addtogroup resource_table_Private_Defines
- * @{
- */
-
-/* Place resource table in special ELF section */
-#if defined(__GNUC__)
-#define __section_t(S) __attribute__((__section__(#S)))
-#define __resource __section_t(.resource_table)
-#endif
-
-#define RPMSG_IPU_C0_FEATURES 1
-#define VRING_COUNT 2
-
-/* VirtIO rpmsg device id */
-#define VIRTIO_ID_RPMSG_ 7
-
#if defined (__LOG_TRACE_IO_)
extern char system_log_buf[];
#endif
-#if defined(__GNUC__)
-#if !defined (__CC_ARM)
-/* 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)
- */
-volatile struct shared_resource_table __resource __attribute__((used)) resource_table;
-#else
-struct shared_resource_table __resource __attribute__((used)) resource_table = {
-#endif
-#elif defined(__ICCARM__)
-__root struct shared_resource_table resource_table @ ".resource_table" = {
-#endif
-
-#if defined(__ICCARM__) || defined (__CC_ARM)
- .version = 1,
- .num = 2,
- .reserved = {0, 0},
- .offset = {
- offsetof(struct shared_resource_table, vdev),
- offsetof(struct shared_resource_table, cm_trace),
- },
-
- /* Virtio device entry */
- .vdev= {
- RSC_VDEV, VIRTIO_ID_RPMSG_, 0, RPMSG_IPU_C0_FEATURES, 0, 0, 0,
- VRING_COUNT, {0, 0},
- },
-
- /* Vring rsc entry - part of vdev rsc entry */
- .vring0 = {VRING_TX_ADDRESS, VRING_ALIGNMENT, VRING_NUM_BUFFS, VRING0_ID, 0},
- .vring1 = {VRING_RX_ADDRESS, VRING_ALIGNMENT, VRING_NUM_BUFFS, VRING1_ID, 0},
-
-#if defined (__LOG_TRACE_IO_)
- .cm_trace = {
- RSC_TRACE,
- (uint32_t)system_log_buf, SYSTEM_TRACE_BUF_SZ, 0, "cm4_log",
- },
-#endif
-} ;
-#endif
-
-void resource_table_init(int RPMsgRole, void **table_ptr, int *length)
-{
-
-#if defined (__GNUC__) && ! defined (__CC_ARM)
-#ifdef CORE_CM7
- /*
- * Currently the GCC linker doesn't initialize the resource_table global variable at startup
- * it is done here by the CM7 application.
- */
- memset(&resource_table, '\0', sizeof(struct shared_resource_table));
- resource_table.num = 1;
- resource_table.version = 1;
- resource_table.offset[0] = offsetof(struct shared_resource_table, vdev);
-
- resource_table.vring0.da = VRING_TX_ADDRESS;
- resource_table.vring0.align = VRING_ALIGNMENT;
- resource_table.vring0.num = VRING_NUM_BUFFS;
- resource_table.vring0.notifyid = VRING0_ID;
-
- resource_table.vring1.da = VRING_RX_ADDRESS;
- resource_table.vring1.align = VRING_ALIGNMENT;
- resource_table.vring1.num = VRING_NUM_BUFFS;
- resource_table.vring1.notifyid = VRING1_ID;
-
-
- resource_table.vdev.type = RSC_VDEV;
- resource_table.vdev.id = VIRTIO_ID_RPMSG_;
- resource_table.vdev.num_of_vrings=VRING_COUNT;
- resource_table.vdev.dfeatures = RPMSG_IPU_C0_FEATURES;
-#else
- /* For CM4 let's wait until the resource_table is correctly initialized */
- while(resource_table.vring1.da != VRING_RX_ADDRESS)
- {
-
- }
-#endif
-#endif
-
- (void)RPMsgRole;
- *length = sizeof(resource_table);
- *table_ptr = &resource_table;
+void resource_table_init(int RPMsgRole, void **table_ptr, int *length) {
+ (void)RPMsgRole;
+ volatile struct shared_resource_table *resource_table = SHM_RSC_ADDR;
+
+ #ifdef CORE_CM7
+ memset(resource_table, 0, SHM_RSC_SIZE);
+ resource_table->num = 1;
+ resource_table->version = 1;
+ resource_table->offset[0] = offsetof(struct shared_resource_table, vdev);
+ #if defined (__LOG_TRACE_IO_)
+ resource_table->offset[1] = offsetof(struct shared_resource_table, cm_trace);
+ #endif
+
+ resource_table->vring0.da = VRING_TX_ADDRESS;
+ resource_table->vring0.align = VRING_ALIGNMENT;
+ resource_table->vring0.num = VRING_NUM_BUFFS;
+ resource_table->vring0.notifyid = VRING0_ID;
+
+ resource_table->vring1.da = VRING_RX_ADDRESS;
+ resource_table->vring1.align = VRING_ALIGNMENT;
+ resource_table->vring1.num = VRING_NUM_BUFFS;
+ resource_table->vring1.notifyid = VRING1_ID;
+
+ #if defined (__LOG_TRACE_IO_)
+ resource_table->cm_trace.type;
+ resource_table->cm_trace.da;
+ resource_table->cm_trace.len;
+ resource_table->cm_trace.reserved = 0;
+ resource_table->cm_trace.name = (uint8_t[]){"cm_trace"};
+ #endif
+
+ resource_table->vdev.type = RSC_VDEV;
+ resource_table->vdev.id = VIRTIO_ID_RPMSG;
+ resource_table->vdev.num_of_vrings=VRING_COUNT;
+ resource_table->vdev.dfeatures = (1 << VIRTIO_RPMSG_F_NS);
+ #else
+ // For CM4, wait until the resource_table is initialized by the host
+ while(resource_table->vring1.da != VRING_RX_ADDRESS) {
+
+ }
+ #endif
+
+ *length = SHM_RSC_SIZE;
+ *table_ptr = resource_table;
}
diff --git a/mbed-os-to-arduino b/mbed-os-to-arduino
index ef911b5e4..87143d3ce 100755
--- a/mbed-os-to-arduino
+++ b/mbed-os-to-arduino
@@ -187,31 +187,16 @@ generate_flags () {
echo "Patching '-fno-exceptions' flag for $ARDUINOVARIANT/${fl}flags.txt"
sed -i '/-fno-exceptions/d' "$ARDUINOVARIANT"/${fl}flags.txt
set +e
- HAS_OPENAMP_SECTION=`grep openamp_section "$ARDUINOVARIANT"/linker_script.ld`
+ HAS_PDM_SECTION=`grep pdm_section "$ARDUINOVARIANT"/linker_script.ld`
set -e
- if [ x"$HAS_OPENAMP_SECTION" == x ]; then
- echo "Adding OpenAMP section to $ARDUINOVARIANT/linker_script.ld"
- OPENAMP_SECTION=".openamp_section (NOLOAD) : {\n \
- . = ABSOLUTE(0x38000000);\n \
- *(.resource_table)\n \
- } >RAM_D3 AT > FLASH\n \
- .pdm_section (NOLOAD) : {\n \
- . = ABSOLUTE(0x3800FC00);\n \
+ if [ x"$HAS_PDM_SECTION" == x ]; then
+ echo "Adding PDM section to $ARDUINOVARIANT/linker_script.ld"
+ PDM_SECTION=".pdm_section 0x3800FC00 (NOLOAD): {\n \
*(.pdm_buffer)\n \
} > RAM_D3\n"
- if [[ $ARDUINOVARIANT == *GENERIC*M4 ]]; then
- echo "Fixing VTOR base in $ARDUINOVARIANT/linker_script.ld"
- VTOR_SECTION="#if (CM4_BINARY_START == 0x60000000)\n \
- REGION_ALIAS(\"RAM\", FLASH);\n \
- #else\n \
- REGION_ALIAS(\"RAM\", RAM_D2);\n \
- #endif\n"
- sed -i "s?REGION_ALIAS.*?${VTOR_SECTION}?g" $ARDUINOVARIANT/linker_script.ld
- fi
-
if [[ $ARDUINOVARIANT == *PORTENTA*M7* || $ARDUINOVARIANT == *GIGA* || $ARDUINOVARIANT == *OPTA* ]]; then
- OPENAMP_SECTION="${OPENAMP_SECTION} \
+ PDM_SECTION="${PDM_SECTION} \
_dtcm_lma = __etext + SIZEOF(.data);\n \
.dtcm : AT(_dtcm_lma) {\n \
_sdtcm = .;\n \
@@ -220,9 +205,22 @@ generate_flags () {
} > DTCMRAM"
fi
- sed -i "s?.heap (COPY):?${OPENAMP_SECTION}\n .heap (COPY):?g" $ARDUINOVARIANT/linker_script.ld
+ sed -i "s?.heap (COPY):?${PDM_SECTION}\n .heap (COPY):?g" $ARDUINOVARIANT/linker_script.ld
OPENAMP_REGIONS="__OPENAMP_region_start__ = 0x38000400;\n__OPENAMP_region_end__ = 0x38000400 + LENGTH(RAM_D3) - 1K;"
sed -i "s?ENTRY(Reset_Handler)?${OPENAMP_REGIONS}\nENTRY(Reset_Handler)?g" $ARDUINOVARIANT/linker_script.ld
+
+ if [[ $ARDUINOVARIANT == *GENERIC*M4 ]]; then
+ echo "Fixing VTOR base in $ARDUINOVARIANT/linker_script.ld"
+ VTOR_SECTION="#if (CM4_BINARY_START == 0x60000000)\n \
+ REGION_ALIAS(\"RAM\", FLASH);\n \
+ #else\n \
+ REGION_ALIAS(\"RAM\", RAM_D2);\n \
+ #endif\n"
+ sed -i "s?REGION_ALIAS.*?${VTOR_SECTION}?g" $ARDUINOVARIANT/linker_script.ld
+ echo "Fixing shared memory attributes in $ARDUINOVARIANT/linker_script.ld"
+ sed -i "s?.heap (COPY)?.heap (NOLOAD)?g" $ARDUINOVARIANT/linker_script.ld
+ sed -i "s?.stack_dummy (COPY)?.stack_dummy (NOLOAD)?g" $ARDUINOVARIANT/linker_script.ld
+ fi
fi
echo "Patching linker scripts"
sed -i 's/0x8100000/CM4_BINARY_START/g' "$ARDUINOVARIANT"/linker_script.ld
diff --git a/variants/GENERIC_STM32H747_M4/linker_script.ld b/variants/GENERIC_STM32H747_M4/linker_script.ld
index f93b6e2e6..d05b0095b 100644
--- a/variants/GENERIC_STM32H747_M4/linker_script.ld
+++ b/variants/GENERIC_STM32H747_M4/linker_script.ld
@@ -91,16 +91,12 @@ SECTIONS
__bss_end__ = .;
_ebss = .;
} > RAM
- .openamp_section (NOLOAD) : {
- . = ABSOLUTE(0x38000000);
- *(.resource_table)
- } >RAM_D3 AT > FLASH
- .pdm_section (NOLOAD) : {
- . = ABSOLUTE(0x3800FC00);
- *(.pdm_buffer)
- } > RAM_D3
- .heap (COPY):
+ .pdm_section 0x3800FC00 (NOLOAD): {
+ *(.pdm_buffer)
+ } > RAM_D3
+
+ .heap (NOLOAD):
{
__end__ = .;
PROVIDE(end = .);
@@ -108,7 +104,8 @@ SECTIONS
. = ORIGIN(RAM) + LENGTH(RAM) - 0x400;
__HeapLimit = .;
} > RAM
- .stack_dummy (COPY):
+
+ .stack_dummy (NOLOAD):
{
*(.stack*)
} > RAM