From 0d7905e608c916af5841344d298c83a1b228b733 Mon Sep 17 00:00:00 2001 From: Kinjal Pravinbhai Patel Date: Wed, 26 Aug 2015 17:01:53 +0530 Subject: [PATCH] sw_apps: openamp rpc demo application is modified This patch changes openamp rpc demo application linker script to keep everything in DDR except vectors. It fixes the order of text carve out memory. Signed-off-by: Kinjal Pravinbhai Patel Acked-for-series: Anirudha Sarangi --- lib/sw_apps/openamp_rpc_demo/src/baremetal.c | 2 +- lib/sw_apps/openamp_rpc_demo/src/lscript.ld | 4 ++-- lib/sw_apps/openamp_rpc_demo/src/rsc_table.h | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/sw_apps/openamp_rpc_demo/src/baremetal.c b/lib/sw_apps/openamp_rpc_demo/src/baremetal.c index 1e125bbc..5b74f02f 100644 --- a/lib/sw_apps/openamp_rpc_demo/src/baremetal.c +++ b/lib/sw_apps/openamp_rpc_demo/src/baremetal.c @@ -34,7 +34,7 @@ #include "xil_exception.h" #include "xscugic.h" #include "xil_cache.h" -#include "xil_mmu.h" +#include "xil_mpu.h" #include "baremetal.h" #include "env.h" diff --git a/lib/sw_apps/openamp_rpc_demo/src/lscript.ld b/lib/sw_apps/openamp_rpc_demo/src/lscript.ld index 6612d721..76f86356 100644 --- a/lib/sw_apps/openamp_rpc_demo/src/lscript.ld +++ b/lib/sw_apps/openamp_rpc_demo/src/lscript.ld @@ -294,7 +294,7 @@ _SDA2_BASE_ = __sdata2_start + ((__sbss2_end - __sdata2_start) / 2 ); . += _HEAP_SIZE; _heap_end = .; HeapLimit = .; -} > ps8_ocm_ram_1_S_AXI_BASEADDR +} > ps8_ddr_S_AXI_BASEADDR .stack (NOLOAD) : { . = ALIGN(16); @@ -322,7 +322,7 @@ _SDA2_BASE_ = __sdata2_start + ((__sbss2_end - __sdata2_start) / 2 ); . += _UNDEF_STACK_SIZE; . = ALIGN(16); __undef_stack = .; -} > ps8_ocm_ram_1_S_AXI_BASEADDR +} > ps8_ddr_S_AXI_BASEADDR _end = .; } diff --git a/lib/sw_apps/openamp_rpc_demo/src/rsc_table.h b/lib/sw_apps/openamp_rpc_demo/src/rsc_table.h index 5af45cbd..fcf8eb71 100644 --- a/lib/sw_apps/openamp_rpc_demo/src/rsc_table.h +++ b/lib/sw_apps/openamp_rpc_demo/src/rsc_table.h @@ -44,10 +44,9 @@ struct remote_resource_table { unsigned int reserved[2]; unsigned int offset[NO_RESOURCE_ENTRIES]; /* text carve out entry */ - + struct fw_rsc_carveout ocm_1_cout; struct fw_rsc_carveout ddr_cout; - struct fw_rsc_carveout ocm_1_cout; - /* rpmsg vdev entry */ + /* rpmsg vdev entry */ struct fw_rsc_vdev rpmsg_vdev; struct fw_rsc_vdev_vring rpmsg_vring0; struct fw_rsc_vdev_vring rpmsg_vring1;