[rtems commit] bsp/qoriq: Add BMan and QMan portals to memory map

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    dd863f895523c0b66d706104b4fe231d7f319441
Changeset: http://git.rtems.org/rtems/commit/?id=dd863f895523c0b66d706104b4fe231d7f319441

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Oct 28 13:06:02 2015 +0100

bsp/qoriq: Add BMan and QMan portals to memory map

---

 c/src/lib/libbsp/powerpc/qoriq/include/qoriq.h                 | 5 +++++
 c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_t2080rdb | 2 ++
 c/src/lib/libbsp/powerpc/qoriq/startup/mmu-config.c            | 8 ++++----
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/qoriq.h b/c/src/lib/libbsp/powerpc/qoriq/include/qoriq.h
index b9b1b37..ef75ad6 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/qoriq.h
+++ b/c/src/lib/libbsp/powerpc/qoriq/include/qoriq.h
@@ -497,6 +497,11 @@ typedef struct {
 
 extern volatile qoriq_ccsr qoriq;
 
+#if QORIQ_CHIP_IS_T_VARIANT(QORIQ_CHIP_VARIANT)
+extern uint8_t qoriq_bman_portal[2][16777216];
+extern uint8_t qoriq_qman_portal[2][16777216];
+#endif
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_t2080rdb b/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_t2080rdb
index 4e50b2c..ed1b25e 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_t2080rdb
+++ b/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_t2080rdb
@@ -33,5 +33,7 @@ REGION_ALIAS ("REGION_NVRAM", EMPTY);
 bsp_section_robarrier_align = 0x1000000;
 bsp_section_rwbarrier_align = 0x1000000;
 qoriq = 0xfe000000;
+qoriq_bman_portal = 0xf4000000;
+qoriq_qman_portal = 0xf6000000;
 
 INCLUDE linkcmds.base
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/mmu-config.c b/c/src/lib/libbsp/powerpc/qoriq/startup/mmu-config.c
index e46e5bd..a5e62a9 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/mmu-config.c
+++ b/c/src/lib/libbsp/powerpc/qoriq/startup/mmu-config.c
@@ -114,11 +114,11 @@ static const entry DATA config [] = {
 	ENTRY_IO(bsp_section_nocachenoload_begin, bsp_section_nocachenoload_size),
 #if QORIQ_CHIP_IS_T_VARIANT(QORIQ_CHIP_VARIANT)
 	/* BMan Portals */
-	ENTRY_DEV_CACHED(0xf4000000, 0x01000000),
-	ENTRY_DEV(0xf5000000, 0x01000000),
+	ENTRY_DEV_CACHED(&qoriq_bman_portal[0][0], sizeof(qoriq_bman_portal[0])),
+	ENTRY_DEV(&qoriq_bman_portal[1][0], sizeof(qoriq_bman_portal[1])),
 	/* QMan Portals */
-	ENTRY_DEV_CACHED(0xf6000000, 0x01000000),
-	ENTRY_DEV(0xf7000000, 0x01000000),
+	ENTRY_DEV_CACHED(&qoriq_qman_portal[0][0], sizeof(qoriq_qman_portal[0])),
+	ENTRY_DEV(&qoriq_qman_portal[1][0], sizeof(qoriq_qman_portal[1])),
 #endif
 	ENTRY_DEV(&qoriq, sizeof(qoriq))
 };