examples: Update memory map to match update in Linux dts

Updated memory region for each core to be 16 MB each
    R5F0: 0xA0000000-0xA0FFFFFF: 16 MB
    R5F1: 0xA1000000-0xA1FFFFFF: 16 MB
    Also re-arranged memory sections to keep the resource table on the
top
    at offset 0x100000.
    Updated resource table addresses and MPU settings accordingly.
Signed-off-by: Sam Nelson <sam.nelson@ti.com>

diff --git a/src/examples/templates/ex02_messageq/slave/R5FLink_hostlinux.cmd b/src/examples/templates/ex02_messageq/slave/R5FLink_hostlinux.cmd
index e6bbf014797698ccfefa2761bfdba3d185ca3c64..cdf7d8597367df77574d42139e81862d17b1992b 100644 (file)
--- a/src/examples/templates/ex02_messageq/slave/R5FLink_hostlinux.cmd
+++ b/src/examples/templates/ex02_messageq/slave/R5FLink_hostlinux.cmd
@@ -24,9 +24,9 @@
 % if (platform.match(/^AM65XX_linux_elf$/)
 %       && target.match(/\.R5F$/)) {
 %   if (lcCore.match(/r5f-0/)) {
-#define EXT_BASE 0x9C000000
+#define EXT_BASE 0xA0000000
 %   } else if (lcCore.match(/r5f-1/)) {
-#define EXT_BASE 0x9B000000
+#define EXT_BASE 0xA1000000
 %   }
 % }
 
@@ -37,14 +37,15 @@ MEMORY{
     BTCM       (RWX) : origin=BTCM_START          length=0x00008000
     RAM0       (RW)  : origin=RAM0_ADDR           length=0x00080000
     DMA_REGION (RW)  : origin=EXT_BASE            length=0x00100000
-    TRACE_BUF  (RW)  : origin=(EXT_BASE+0x100000) length=0x00008000
-    EXC_DATA   (RW)  : origin=(EXT_BASE+0x110000) length=0x00010000
-    PM_DATA    (RW)  : origin=(EXT_BASE+0x120000) length=0x00020000
-    SPARE_REG  (RW)  : origin=(EXT_BASE+0x140000) length=0x00040000
-    RSRC_TABLE (RW)  : origin=(EXT_BASE+0x180000) length=0x00080000
+    RSRC_TABLE (RW)  : origin=(EXT_BASE+0x100000) length=0x00080000
+    TRACE_BUF  (RW)  : origin=(EXT_BASE+0x180000) length=0x00008000
+    EXC_DATA   (RW)  : origin=(EXT_BASE+0x188000) length=0x00010000
+    PM_DATA    (RW)  : origin=(EXT_BASE+0x198000) length=0x00020000
+    SPARE_REG  (RW)  : origin=(EXT_BASE+0x1b8000) length=0x00048000
     EXT_CODE   (RWX) : origin=(EXT_BASE+0x200000) length=0x00100000
     EXT_DATA   (RW)  : origin=(EXT_BASE+0x300000) length=0x00100000
     EXT_HEAP   (RW)  : origin=(EXT_BASE+0x400000) length=0x00300000
+    SPARE_REG2 (RW)  : origin=(EXT_BASE+0x700000) length=0x00900000
 
 }
 

diff --git a/src/examples/templates/ex02_messageq/slave/R5fmpu_am65xx_hostlinux.cfg b/src/examples/templates/ex02_messageq/slave/R5fmpu_am65xx_hostlinux.cfg
index 9c12e327fbdc9318d97c5aa202a8ccbd1d0e27c3..53075b0b1d645aeeae428c44b0dec52be9fa4582 100644 (file)
--- a/src/examples/templates/ex02_messageq/slave/R5fmpu_am65xx_hostlinux.cfg
+++ b/src/examples/templates/ex02_messageq/slave/R5fmpu_am65xx_hostlinux.cfg
@@ -150,9 +150,9 @@ attrs.subregionDisableMask = 0;
 % if (platform.match(/^AM65XX_linux_elf$/)
 %       && target.match(/\.R5F$/)) {
 %   if (lcCore.match(/r5f-0/)) {
-MPU.setRegionMeta(6, 0x9C000000, MPU.RegionSize_8M, attrs);
+MPU.setRegionMeta(6, 0xA0000000, MPU.RegionSize_16M, attrs);
 %   } else if (lcCore.match(/r5f-1/)) {
-MPU.setRegionMeta(6, 0x9B000000, MPU.RegionSize_8M, attrs);
+MPU.setRegionMeta(6, 0xA1000000, MPU.RegionSize_16M, attrs);
 %   }
 % }
 /* This entry covers DDR memory */
@@ -172,8 +172,8 @@ attrs.subregionDisableMask = 0;
 % if (platform.match(/^AM65XX_linux_elf$/)
 %       && target.match(/\.R5F$/)) {
 %   if (lcCore.match(/r5f-0/)) {
-MPU.setRegionMeta(7, 0x9C000000, MPU.RegionSize_2M, attrs);
+MPU.setRegionMeta(7, 0xA0000000, MPU.RegionSize_2M, attrs);
 %   } else if (lcCore.match(/r5f-1/)) {
-MPU.setRegionMeta(7, 0x9B000000, MPU.RegionSize_2M, attrs);
+MPU.setRegionMeta(7, 0xA1000000, MPU.RegionSize_2M, attrs);
 %   }
 % }

diff --git a/src/examples/templates/ex02_messageq/slave/rsc_table_am65xx_r5f.h b/src/examples/templates/ex02_messageq/slave/rsc_table_am65xx_r5f.h
index bb373d4d8bb00b29ec589641d511911799e38c19..9aacb2bb8cadef5875e0edb8f6359144cea69f41 100644 (file)
--- a/src/examples/templates/ex02_messageq/slave/rsc_table_am65xx_r5f.h
+++ b/src/examples/templates/ex02_messageq/slave/rsc_table_am65xx_r5f.h
@@ -53,9 +53,9 @@
 % if (platform.match(/^AM65XX_linux_elf$/)
 %       && target.match(/\.R5F$/)) {
 %   if (lcCore.match(/r5f-0/)) {
-#define R5F_MEM_IPC_VRING       0x9C000000
+#define R5F_MEM_IPC_VRING       0xA0000000
 %   } else if (lcCore.match(/r5f-1/)) {
-#define R5F_MEM_IPC_VRING       0x9B000000
+#define R5F_MEM_IPC_VRING       0xA1000000
 %   }
 % }
 

diff --git a/src/examples/templates/ex11_ping/slave/R5FLink_hostlinux.cmd b/src/examples/templates/ex11_ping/slave/R5FLink_hostlinux.cmd
index e6bbf014797698ccfefa2761bfdba3d185ca3c64..eef10c28121d78b560c42d3421cb325567550edd 100644 (file)
--- a/src/examples/templates/ex11_ping/slave/R5FLink_hostlinux.cmd
+++ b/src/examples/templates/ex11_ping/slave/R5FLink_hostlinux.cmd
@@ -24,9 +24,9 @@
 % if (platform.match(/^AM65XX_linux_elf$/)
 %       && target.match(/\.R5F$/)) {
 %   if (lcCore.match(/r5f-0/)) {
-#define EXT_BASE 0x9C000000
+#define EXT_BASE 0xA0000000
 %   } else if (lcCore.match(/r5f-1/)) {
-#define EXT_BASE 0x9B000000
+#define EXT_BASE 0xA1000000
 %   }
 % }