summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 77e17fa)
raw | patch | inline | side by side (parent: 77e17fa)
author | Suman Anna <s-anna@ti.com> | |
Thu, 19 Dec 2013 01:12:26 +0000 (17:12 -0800) | ||
committer | Chris Ring <cring@ti.com> | |
Thu, 19 Dec 2013 01:12:26 +0000 (17:12 -0800) |
OMAP5 has it own resource table files, so clean up any references
to OMAP5 from the DRA7xx resource table files.
Signed-off-by: Suman Anna <s-anna@ti.com>
to OMAP5 from the DRA7xx resource table files.
Signed-off-by: Suman Anna <s-anna@ti.com>
packages/ti/ipc/remoteproc/rsc_table_vayu_dsp.h | patch | blob | history | |
packages/ti/ipc/remoteproc/rsc_table_vayu_ipu.h | patch | blob | history |
diff --git a/packages/ti/ipc/remoteproc/rsc_table_vayu_dsp.h b/packages/ti/ipc/remoteproc/rsc_table_vayu_dsp.h
index 328aee1260d3ce13ff0cfac94f5cb15992d9b02f..763134a58495c653011d13adef4123be9d46a2c7 100644 (file)
*/
/*
- * ======== rsc_table_omap5_dsp.h ========
+ * ======== rsc_table_vayu_dsp.h ========
*
* Define the resource table entries for all DSP cores. This will be
* incorporated into corresponding base images, and used by the remoteproc
*
*/
-#ifndef _RSC_TABLE_DSP_H_
-#define _RSC_TABLE_DSP_H_
+#ifndef _RSC_TABLE_VAYU_DSP_H_
+#define _RSC_TABLE_VAYU_DSP_H_
#include "rsc_types.h"
* Assign fixed RAM addresses to facilitate a fixed MMU table.
*/
/* See CMA BASE addresses in Linux side: arch/arm/mach-omap2/remoteproc.c */
-#ifdef OMAP5
-#define PHYS_MEM_IPC_VRING 0x95000000
-#elif defined (VAYU_DSP_1)
+#if defined (VAYU_DSP_1)
#define PHYS_MEM_IPC_VRING 0x95000000
#elif defined (VAYU_DSP_2)
#define PHYS_MEM_IPC_VRING 0x94800000
-#else
-#define PHYS_MEM_IPC_VRING 0x98800000
#endif
/* Need to be identical to that of IPU */
},
};
-#endif /* _RSC_TABLE_DSP_H_ */
+#endif /* _RSC_TABLE_VAYU_DSP_H_ */
diff --git a/packages/ti/ipc/remoteproc/rsc_table_vayu_ipu.h b/packages/ti/ipc/remoteproc/rsc_table_vayu_ipu.h
index fb9ce9623cfbf441b954e0e8176b14f474b1f939..df8c0f1a2c860e152f5b526ba44ab5e580e967b0 100644 (file)
*/
/*
- * ======== rsc_table_omap5_ipu.h ========
+ * ======== rsc_table_vayu_ipu.h ========
*
* Define the resource table entries for all IPU cores. This will be
* incorporated into corresponding base images, and used by the remoteproc
*
*/
-#ifndef _RSC_TABLE_IPU_H_
-#define _RSC_TABLE_IPU_H_
+#ifndef _RSC_TABLE_VAYU_IPU_H_
+#define _RSC_TABLE_VAYU_IPU_H_
#include "rsc_types.h"
#define IPU_MEM_TEXT 0x0
#define IPU_MEM_DATA 0x80000000
-#if defined(OMAP5) || defined(VAYU_IPU_1) || defined(VAYU_IPU_2)
#define IPU_MEM_IOBUFS 0x90000000
-#else
-#define IPU_MEM_IOBUFS 0x88000000
-#endif
#define IPU_MEM_IPC_DATA 0x9F000000
#define IPU_MEM_IPC_VRING 0x60000000
#define IPU_MEM_IPC_VRING_SIZE SZ_1M
#define IPU_MEM_IPC_DATA_SIZE SZ_1M
-#ifdef VAYU_IPU_1
+#if defined(VAYU_IPU_1)
#define IPU_MEM_TEXT_SIZE (SZ_1M)
-#else
+#elif defined(VAYU_IPU_2)
#define IPU_MEM_TEXT_SIZE (SZ_1M * 6)
#endif
-#if defined(OMAP5) || defined(VAYU_IPU_2)
+#if defined(VAYU_IPU_2)
#define IPU_MEM_DATA_SIZE (SZ_1M * 156)
#elif defined(VAYU_IPU_1)
#define IPU_MEM_DATA_SIZE (SZ_1M * 5)
-#else
-#define IPU_MEM_DATA_SIZE (SZ_1M * 100)
#endif
#define IPU_MEM_IOBUFS_SIZE (SZ_1M * 90)
* PHYS_MEM_IPC_VRING & PHYS_MEM_IPC_DATA MUST be together.
*/
/* See CMA BASE addresses in Linux side: arch/arm/mach-omap2/remoteproc.c */
-#ifdef OMAP5
-#define PHYS_MEM_IPC_VRING 0x95800000
-#elif defined(VAYU_IPU_1)
+#if defined(VAYU_IPU_1)
#define PHYS_MEM_IPC_VRING 0x94000000
#elif defined (VAYU_IPU_2)
#define PHYS_MEM_IPC_VRING 0x95800000
-#else
-#define PHYS_MEM_IPC_VRING 0x99000000
#endif
#define PHYS_MEM_IOBUFS 0xBA300000
},
};
-#endif /* _RSC_TABLE_IPU_H_ */
+#endif /* _RSC_TABLE_VAYU_IPU_H_ */