variants: Update definitions for boards that use Open-AMP.

iabdalkader · iabdalkader · commit f85307f4fbc2 · 2023-12-29T10:19:46.000+01:00
- Update deprecated Open-AMP definitions.
- Update RPMSG buffer size to match the default configuration.

Signed-off-by: iabdalkader &lt;i.abdalkader@gmail.com&gt;
diff --git a/variants/GENERIC_STM32H747_M4/conf/mbed_app.json b/variants/GENERIC_STM32H747_M4/conf/mbed_app.json
@@ -19,11 +19,11 @@
         "BT_UART_NO_3M_SUPPORT",
         "NO_VTOR_RELOCATE",
         "METAL_INTERNAL",
-        "VIRTIO_SLAVE_ONLY",
+        "VIRTIO_DEVICE_ONLY",
         "NO_ATOMIC_64_SUPPORT",
         "METAL_MAX_DEVICE_REGIONS=2",
         "RPMSG_BUFFER_SIZE=2048"
       ]
     }
   }
-}
+}
diff --git a/variants/GENERIC_STM32H747_M4/defines.txt b/variants/GENERIC_STM32H747_M4/defines.txt
@@ -77,7 +77,7 @@
 -DTRANSACTION_QUEUE_SIZE_SPI=2
 -DUSE_FULL_LL_DRIVER
 -DUSE_HAL_DRIVER
--DVIRTIO_SLAVE_ONLY
+-DVIRTIO_DEVICE_ONLY
 -DMBED_NO_GLOBAL_USING_DIRECTIVE=1
 -DCORE_MAJOR=
 -DCORE_MINOR=
diff --git a/variants/GIGA/conf/mbed_app.json b/variants/GIGA/conf/mbed_app.json
@@ -13,10 +13,10 @@
       "target.mbed_app_start": "0x8040000",
       "target.macros_add": [
         "METAL_INTERNAL",
-        "VIRTIO_MASTER_ONLY",
+        "VIRTIO_DRIVER_ONLY",
         "NO_ATOMIC_64_SUPPORT",
         "METAL_MAX_DEVICE_REGIONS=2",
-        "RPMSG_BUFFER_SIZE=100"
+        "RPMSG_BUFFER_SIZE=2048"
       ]
     }
   }
diff --git a/variants/GIGA/defines.txt b/variants/GIGA/defines.txt
@@ -53,7 +53,7 @@
 -DMETAL_MAX_DEVICE_REGIONS=2
 -DNO_ATOMIC_64_SUPPORT
 -DQSPI_NO_SAMPLE_SHIFT
--DRPMSG_BUFFER_SIZE=100
+-DRPMSG_BUFFER_SIZE=2048
 -DSTM32H747xx
 -DTARGET_CORDIO
 -DTARGET_CORTEX
@@ -78,7 +78,7 @@
 -DTRANSACTION_QUEUE_SIZE_SPI=2
 -DUSE_FULL_LL_DRIVER
 -DUSE_HAL_DRIVER
--DVIRTIO_MASTER_ONLY
+-DVIRTIO_DRIVER_ONLY
 -DMBED_NO_GLOBAL_USING_DIRECTIVE=1
 -DCORE_MAJOR=
 -DCORE_MINOR=
diff --git a/variants/NICLA_VISION/conf/mbed_app.json b/variants/NICLA_VISION/conf/mbed_app.json
@@ -14,7 +14,7 @@
       "target.mbed_app_start": "0x8040000",
       "target.macros_add": [
         "METAL_INTERNAL",
-        "VIRTIO_MASTER_ONLY",
+        "VIRTIO_DRIVER_ONLY",
         "NO_ATOMIC_64_SUPPORT",
         "METAL_MAX_DEVICE_REGIONS=2",
         "RPMSG_BUFFER_SIZE=100"
diff --git a/variants/NICLA_VISION/defines.txt b/variants/NICLA_VISION/defines.txt
@@ -54,7 +54,7 @@
 -DMETAL_MAX_DEVICE_REGIONS=2
 -DNO_ATOMIC_64_SUPPORT
 -DQSPI_NO_SAMPLE_SHIFT
--DRPMSG_BUFFER_SIZE=100
+-DRPMSG_BUFFER_SIZE=2048
 -DSTM32H747xx
 -DT1oI2C
 -DT1oI2C_UM11225
@@ -81,7 +81,7 @@
 -DTRANSACTION_QUEUE_SIZE_SPI=2
 -DUSE_FULL_LL_DRIVER
 -DUSE_HAL_DRIVER
--DVIRTIO_MASTER_ONLY
+-DVIRTIO_DRIVER_ONLY
 -DMBED_NO_GLOBAL_USING_DIRECTIVE=1
 -DCORE_MAJOR=
 -DCORE_MINOR=
diff --git a/variants/OPTA/conf/mbed_app.json b/variants/OPTA/conf/mbed_app.json
@@ -13,10 +13,10 @@
       "target.mbed_app_start": "0x8040000",
       "target.macros_add": [
         "METAL_INTERNAL",
-        "VIRTIO_MASTER_ONLY",
+        "VIRTIO_DRIVER_ONLY",
         "NO_ATOMIC_64_SUPPORT",
         "METAL_MAX_DEVICE_REGIONS=2",
-        "RPMSG_BUFFER_SIZE=100"
+        "RPMSG_BUFFER_SIZE=2048"
       ]
     }
   }
diff --git a/variants/OPTA/defines.txt b/variants/OPTA/defines.txt
@@ -53,7 +53,7 @@
 -DMETAL_MAX_DEVICE_REGIONS=2
 -DNO_ATOMIC_64_SUPPORT
 -DQSPI_NO_SAMPLE_SHIFT
--DRPMSG_BUFFER_SIZE=100
+-DRPMSG_BUFFER_SIZE=2048
 -DSTM32H747xx
 -DTARGET_CORDIO
 -DTARGET_CORTEX
@@ -78,7 +78,7 @@
 -DTRANSACTION_QUEUE_SIZE_SPI=2
 -DUSE_FULL_LL_DRIVER
 -DUSE_HAL_DRIVER
--DVIRTIO_MASTER_ONLY
+-DVIRTIO_DRIVER_ONLY
 -DMBED_NO_GLOBAL_USING_DIRECTIVE=1
 -DCORE_MAJOR=
 -DCORE_MINOR=
diff --git a/variants/PORTENTA_H7_M7/conf/mbed_app.json b/variants/PORTENTA_H7_M7/conf/mbed_app.json
@@ -19,7 +19,7 @@
         "BT_UART_NO_3M_SUPPORT",
         "USB_DYNAMIC_CONFIGURATION",
         "METAL_INTERNAL",
-        "VIRTIO_MASTER_ONLY",
+        "VIRTIO_DRIVER_ONLY",
         "NO_ATOMIC_64_SUPPORT",
         "METAL_MAX_DEVICE_REGIONS=2",
         "RPMSG_BUFFER_SIZE=2048",
diff --git a/variants/PORTENTA_H7_M7/defines.txt b/variants/PORTENTA_H7_M7/defines.txt
@@ -81,7 +81,7 @@
 -DUSB_DYNAMIC_CONFIGURATION
 -DUSE_FULL_LL_DRIVER
 -DUSE_HAL_DRIVER
--DVIRTIO_MASTER_ONLY
+-DVIRTIO_DRIVER_ONLY
 -DMBED_NO_GLOBAL_USING_DIRECTIVE=1
 -DCORE_MAJOR=
 -DCORE_MINOR=
diff --git a/variants/PORTENTA_X8/conf/mbed_app.json b/variants/PORTENTA_X8/conf/mbed_app.json
@@ -13,11 +13,11 @@
       "target.macros_add": [
         "NO_VTOR_RELOCATE",
         "METAL_INTERNAL",
-        "VIRTIO_SLAVE_ONLY",
+        "VIRTIO_DEVICE_ONLY",
         "NO_ATOMIC_64_SUPPORT",
         "METAL_MAX_DEVICE_REGIONS=2",
         "RPMSG_BUFFER_SIZE=2048"
       ]
     }
   }
-}
+}
diff --git a/variants/PORTENTA_X8/defines.txt b/variants/PORTENTA_X8/defines.txt
@@ -68,7 +68,7 @@
 -DTRANSACTION_QUEUE_SIZE_SPI=2
 -DUSE_FULL_LL_DRIVER
 -DUSE_HAL_DRIVER
--DVIRTIO_SLAVE_ONLY
+-DVIRTIO_DEVICE_ONLY
 -DMBED_NO_GLOBAL_USING_DIRECTIVE=1
 -DCORE_MAJOR=
 -DCORE_MINOR=

Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,11 @@`
`19`	`19`	`"BT_UART_NO_3M_SUPPORT",`
`20`	`20`	`"NO_VTOR_RELOCATE",`
`21`	`21`	`"METAL_INTERNAL",`
`22`		`- "VIRTIO_SLAVE_ONLY",`
	`22`	`+ "VIRTIO_DEVICE_ONLY",`
`23`	`23`	`"NO_ATOMIC_64_SUPPORT",`
`24`	`24`	`"METAL_MAX_DEVICE_REGIONS=2",`
`25`	`25`	`"RPMSG_BUFFER_SIZE=2048"`
`26`	`26`	`]`
`27`	`27`	`}`
`28`	`28`	`}`
`29`		`-}`
	`29`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@`
`13`	`13`	`"target.mbed_app_start": "0x8040000",`
`14`	`14`	`"target.macros_add": [`
`15`	`15`	`"METAL_INTERNAL",`
`16`		`- "VIRTIO_MASTER_ONLY",`
	`16`	`+ "VIRTIO_DRIVER_ONLY",`
`17`	`17`	`"NO_ATOMIC_64_SUPPORT",`
`18`	`18`	`"METAL_MAX_DEVICE_REGIONS=2",`
`19`		`- "RPMSG_BUFFER_SIZE=100"`
	`19`	`+ "RPMSG_BUFFER_SIZE=2048"`
`20`	`20`	`]`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@`
`13`	`13`	`"target.macros_add": [`
`14`	`14`	`"NO_VTOR_RELOCATE",`
`15`	`15`	`"METAL_INTERNAL",`
`16`		`- "VIRTIO_SLAVE_ONLY",`
	`16`	`+ "VIRTIO_DEVICE_ONLY",`
`17`	`17`	`"NO_ATOMIC_64_SUPPORT",`
`18`	`18`	`"METAL_MAX_DEVICE_REGIONS=2",`
`19`	`19`	`"RPMSG_BUFFER_SIZE=2048"`
`20`	`20`	`]`
`21`	`21`	`}`
`22`	`22`	`}`
`23`		`-}`
	`23`	`+}`