fix: shmem after mem and 2MB multiple for baremetal/freeRTOS

DavidMCerdeira · DavidMCerdeira · commit 69a808b2be4e · 2026-01-13T14:49:33.000Z
diff --git a/demos/linux+freertos/configs/fvp-a-aarch32.c b/demos/linux+freertos/configs/fvp-a-aarch32.c
@@ -101,7 +101,7 @@ struct config config = {
                 .ipc_num = 1,
                 .ipcs = (struct ipc[]) {
                     {
-                        .base = 0x70000000,
+                        .base = 0xf0000000,
                         .size = 0x00010000,
                         .shmem_id = 0,
                         .interrupt_num = 1,
diff --git a/demos/linux+freertos/configs/fvp-a.c b/demos/linux+freertos/configs/fvp-a.c
@@ -101,7 +101,7 @@ struct config config = {
                 .ipc_num = 1,
                 .ipcs = (struct ipc[]) {
                     {
-                        .base = 0x70000000,
+                        .base = 0xf0000000,
                         .size = 0x00010000,
                         .shmem_id = 0,
                         .interrupt_num = 1,
diff --git a/demos/linux+freertos/configs/fvp-r.c b/demos/linux+freertos/configs/fvp-r.c
@@ -6,7 +6,6 @@ struct config config = {
     .shmemlist_size = 1,
     .shmemlist = (struct shmem[]) {
         [0] = { 
-            .base = 0x70000000,
             .size = 0x00010000, 
         }
     },
@@ -93,7 +92,7 @@ struct config config = {
                 .ipc_num = 1,
                 .ipcs = (struct ipc[]) {
                     {
-                        .base = 0x70000000,
+                        .base = 0xf0000000,
                         .size = 0x00010000,
                         .shmem_id = 0,
                         .interrupt_num = 1,
diff --git a/demos/linux+freertos/configs/imx8qm.c b/demos/linux+freertos/configs/imx8qm.c
@@ -119,7 +119,7 @@ struct config config = {
                 .ipc_num = 1,
                 .ipcs = (struct ipc[]) {
                     {
-                        .base = 0x70000000,
+                        .base = 0xf0000000,
                         .size = 0x00010000,
                         .shmem_id = 0,
                         .interrupt_num = 1,
diff --git a/demos/linux+freertos/configs/qemu-aarch64-virt.c b/demos/linux+freertos/configs/qemu-aarch64-virt.c
@@ -95,7 +95,7 @@ struct config config = {
                .ipc_num = 1,
                 .ipcs = (struct ipc[]) {
                     {
-                        .base = 0x70000000,
+                        .base = 0xf0000000,
                         .size = 0x00010000,
                         .shmem_id = 0,
                         .interrupt_num = 1,
diff --git a/demos/linux+freertos/configs/qemu-riscv64-virt.c b/demos/linux+freertos/configs/qemu-riscv64-virt.c
@@ -87,7 +87,7 @@ struct config config = {
                 .ipc_num = 1,
                 .ipcs = (struct ipc[]) {
                     {
-                        .base = 0x70000000,
+                        .base = 0xf0000000,
                         .size = 0x00010000,
                         .shmem_id = 0,
                         .interrupt_num = 1,
diff --git a/demos/linux+freertos/configs/rpi4.c b/demos/linux+freertos/configs/rpi4.c
@@ -96,7 +96,7 @@ struct config config = {
                .ipc_num = 1,
                 .ipcs = (struct ipc[]) {
                     {
-                        .base = 0x70000000,
+                        .base = 0xf0000000,
                         .size = 0x00010000,
                         .shmem_id = 0,
                         .interrupt_num = 1,
diff --git a/demos/linux+freertos/configs/tx2.c b/demos/linux+freertos/configs/tx2.c
@@ -123,7 +123,7 @@ struct config config = {
                .ipc_num = 1,
                 .ipcs = (struct ipc[]) {
                     {
-                        .base = 0x70000000,
+                        .base = 0xf0000000,
                         .size = 0x00010000,
                         .shmem_id = 0,
                         .interrupt_num = 1,
diff --git a/demos/linux+freertos/configs/zcu104.c b/demos/linux+freertos/configs/zcu104.c
@@ -106,7 +106,7 @@ struct config config = {
                .ipc_num = 1,
                 .ipcs = (struct ipc[]) {
                     {
-                        .base = 0x70000000,
+                        .base = 0xf0000000,
                         .size = 0x00010000,
                         .shmem_id = 0,
                         .interrupt_num = 1,
diff --git a/demos/linux+freertos/freertos-app/demo.c b/demos/linux+freertos/freertos-app/demo.c
@@ -59,8 +59,8 @@ void vTask(void *pvParameters)
 
 #define SHMEM_IRQ_ID (52)
 
-char* const freertos_message = (char*)0x70000000;
-char* const linux_message    = (char*)0x70002000;
+char* const freertos_message = (char*)SHMEM_BASE;
+char* const linux_message    = (char*)(SHMEM_BASE + 0x2000);
 const size_t shmem_channel_size = 0x2000;
 
 
diff --git a/demos/linux+freertos/make.mk b/demos/linux+freertos/make.mk
@@ -14,6 +14,7 @@ fvpr_image_data:=$(freertos_image)@0x10000000 $(linux_image)@0x20000000
 else
 make_args+=STD_ADDR_SPACE=y
 endif
+make_args+=SHMEM_BASE=0xf0000000 SHMEM_SIZE=0x200000
 
 $(eval $(call build-freertos, $(freertos_image), $(make_args)))
 
diff --git a/demos/zephyr+baremetal/baremetal-app/demo.c b/demos/zephyr+baremetal/baremetal-app/demo.c
@@ -20,8 +20,8 @@
  
  #define SHMEM_IRQ_ID (52)
  
- char* const baremetal_message = (char*)0x70000000;
- char* const zephyr_message    = (char*)0x70002000;
+char* const baremetal_message = (char*)SHMEM_BASE;
+char* const zephyr_message    = (char*)(SHMEM_BASE + 0x2000);
  const size_t shmem_channel_size = 0x2000;
  
  void shmem_update_msg(int irq_count) {
@@ -110,4 +110,4 @@
  
      while(1) wfi();
  }
- 
+ 
diff --git a/demos/zephyr+baremetal/configs/fvp-a-aarch32.c b/demos/zephyr+baremetal/configs/fvp-a-aarch32.c
@@ -91,7 +91,7 @@ struct config config = {
                 .ipc_num = 1,
                 .ipcs = (struct ipc[]) {
                     {
-                        .base = 0x70000000,
+                        .base = 0xf0000000,
                         .size = 0x00010000,
                         .shmem_id = 0,
                         .interrupt_num = 1,
diff --git a/demos/zephyr+baremetal/configs/fvp-a.c b/demos/zephyr+baremetal/configs/fvp-a.c
@@ -91,7 +91,7 @@ struct config config = {
                 .ipc_num = 1,
                 .ipcs = (struct ipc[]) {
                     {
-                        .base = 0x70000000,
+                        .base = 0xf0000000,
                         .size = 0x00010000,
                         .shmem_id = 0,
                         .interrupt_num = 1,
diff --git a/demos/zephyr+baremetal/configs/fvp-r-aarch32.c b/demos/zephyr+baremetal/configs/fvp-r-aarch32.c
@@ -5,7 +5,6 @@ struct config config = {
     .shmemlist_size = 1,
     .shmemlist = (struct shmem[]) {
         [0] = { 
-            .base = 0x70000000,
             .size = 0x00010000, 
         }
     },
@@ -82,7 +81,7 @@ struct config config = {
                 .ipc_num = 1,
                 .ipcs = (struct ipc[]) {
                     {
-                        .base = 0x70000000,
+                        .base = 0xf0000000,
                         .size = 0x00010000,
                         .shmem_id = 0,
                         .interrupt_num = 1,
diff --git a/demos/zephyr+baremetal/configs/fvp-r.c b/demos/zephyr+baremetal/configs/fvp-r.c
@@ -6,7 +6,6 @@ struct config config = {
     .shmemlist_size = 1,
     .shmemlist = (struct shmem[]) {
         [0] = { 
-            .base = 0x70000000,
             .size = 0x00010000, 
         }
     },
@@ -83,7 +82,7 @@ struct config config = {
                 .ipc_num = 1,
                 .ipcs = (struct ipc[]) {
                     {
-                        .base = 0x70000000,
+                        .base = 0xf0000000,
                         .size = 0x00010000,
                         .shmem_id = 0,
                         .interrupt_num = 1,
diff --git a/demos/zephyr+baremetal/make.mk b/demos/zephyr+baremetal/make.mk
@@ -13,6 +13,7 @@ fvpr_image_data:=$(baremetal_image)@0x10000000 $(zephyr_image)@0x24000000
 else
 baremetal_args+=STD_ADDR_SPACE=y
 endif
+baremetal_args+=SHMEM_BASE=0xf0000000 SHMEM_SIZE=0x200000
 $(eval $(call build-baremetal, $(baremetal_image), $(baremetal_args)))
 
 guest_images:=$(zephyr_image) $(baremetal_image)

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ struct config config = {`
`101`	`101`	`.ipc_num = 1,`
`102`	`102`	`.ipcs = (struct ipc[]) {`
`103`	`103`	`{`
`104`		`- .base = 0x70000000,`
	`104`	`+ .base = 0xf0000000,`
`105`	`105`	`.size = 0x00010000,`
`106`	`106`	`.shmem_id = 0,`
`107`	`107`	`.interrupt_num = 1,`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ struct config config = {`
`119`	`119`	`.ipc_num = 1,`
`120`	`120`	`.ipcs = (struct ipc[]) {`
`121`	`121`	`{`
`122`		`- .base = 0x70000000,`
	`122`	`+ .base = 0xf0000000,`
`123`	`123`	`.size = 0x00010000,`
`124`	`124`	`.shmem_id = 0,`
`125`	`125`	`.interrupt_num = 1,`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ struct config config = {`
`95`	`95`	`.ipc_num = 1,`
`96`	`96`	`.ipcs = (struct ipc[]) {`
`97`	`97`	`{`
`98`		`- .base = 0x70000000,`
	`98`	`+ .base = 0xf0000000,`
`99`	`99`	`.size = 0x00010000,`
`100`	`100`	`.shmem_id = 0,`
`101`	`101`	`.interrupt_num = 1,`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ struct config config = {`
`87`	`87`	`.ipc_num = 1,`
`88`	`88`	`.ipcs = (struct ipc[]) {`
`89`	`89`	`{`
`90`		`- .base = 0x70000000,`
	`90`	`+ .base = 0xf0000000,`
`91`	`91`	`.size = 0x00010000,`
`92`	`92`	`.shmem_id = 0,`
`93`	`93`	`.interrupt_num = 1,`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ struct config config = {`
`96`	`96`	`.ipc_num = 1,`
`97`	`97`	`.ipcs = (struct ipc[]) {`
`98`	`98`	`{`
`99`		`- .base = 0x70000000,`
	`99`	`+ .base = 0xf0000000,`
`100`	`100`	`.size = 0x00010000,`
`101`	`101`	`.shmem_id = 0,`
`102`	`102`	`.interrupt_num = 1,`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ struct config config = {`
`123`	`123`	`.ipc_num = 1,`
`124`	`124`	`.ipcs = (struct ipc[]) {`
`125`	`125`	`{`
`126`		`- .base = 0x70000000,`
	`126`	`+ .base = 0xf0000000,`
`127`	`127`	`.size = 0x00010000,`
`128`	`128`	`.shmem_id = 0,`
`129`	`129`	`.interrupt_num = 1,`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ struct config config = {`
`106`	`106`	`.ipc_num = 1,`
`107`	`107`	`.ipcs = (struct ipc[]) {`
`108`	`108`	`{`
`109`		`- .base = 0x70000000,`
	`109`	`+ .base = 0xf0000000,`
`110`	`110`	`.size = 0x00010000,`
`111`	`111`	`.shmem_id = 0,`
`112`	`112`	`.interrupt_num = 1,`