adds 10mb to linux memory by eliminating GPU1 memory and moving RAM C…

…ONSOLE to SMI
daproy · Dec 18, 2009 · e1deffc · e1deffc
1 parent 4d06f0e
commit e1deffc
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 74 deletions.
diff --git a/arch/arm/mach-msm/board-sapphire.h b/arch/arm/mach-msm/board-sapphire.h
@@ -16,28 +16,28 @@
 
 #include <mach/board.h>
 
-#define MSM_SMI_BASE		0x00000000
-#define MSM_SMI_SIZE		0x00800000
+#define MSM_SMI_BASE			0x00000000
+#define MSM_SMI_SIZE			0x00800000
 
-#define MSM_PMEM_GPU0_BASE	0x00000000
-#define MSM_PMEM_GPU0_SIZE	0x00700000
+#define MSM_PMEM_GPU0_BASE		0x00000000
+#define MSM_PMEM_GPU0_SIZE		0x00700000
 
 #if defined(CONFIG_MSM_AMSS_SUPPORT_256MB_EBI1)
 /* AMSS supports unified 128/256MB EBI1 */
-#define MSM_EBI_BASE				0x19200000
+#define MSM_EBI_BASE			0x19200000
 #define MSM_EBI_SMI64_128MB_SIZE	0x06600000
 #define MSM_EBI_SMI32_256MB_SIZE	0x0C600000
 
-#define SMI64_MSM_FB_BASE			0x00700000
-#define SMI64_MSM_FB_SIZE			0x0009B000
+#define SMI64_MSM_FB_BASE		0x00700000
+#define SMI64_MSM_FB_SIZE		0x0009B000
 
 #define SMI64_MSM_RAM_CONSOLE_BASE	0x007A0000
 #define SMI64_MSM_RAM_CONSOLE_SIZE	128 * SZ_1K
 
 #define SMI64_MSM_PMEM_MDP_BASE		0x02000000
 #define SMI64_MSM_PMEM_MDP_SIZE		0x00800000
 
-#define SMI64_MSM_PMEM_ADSP_BASE    0x02800000
+#define SMI64_MSM_PMEM_ADSP_BASE	0x02800000
 #define SMI64_MSM_PMEM_ADSP_SIZE	0x00800000
 
 #define SMI64_MSM_PMEM_CAMERA_BASE	0x03000000
@@ -46,8 +46,8 @@
 #define SMI64_MSM_PMEM_GPU1_BASE	0x1F800000
 #define SMI64_MSM_PMEM_GPU1_SIZE	0x800000
 
-#define SMI32_MSM_FB_BASE			0x00700000
-#define SMI32_MSM_FB_SIZE			0x0009B000
+#define SMI32_MSM_FB_BASE		0x00700000
+#define SMI32_MSM_FB_SIZE		0x0009B000
 
 #define SMI32_MSM_RAM_CONSOLE_BASE	0x007A0000
 #define SMI32_MSM_RAM_CONSOLE_SIZE	128 * SZ_1K
@@ -66,28 +66,29 @@
 
 #else
 /* AMSS supports only 128MB EBI1. */
-#define MSM_EBI_BASE				0x10000000
+#define MSM_EBI_BASE			0x10000000
+#define MSM_EBI_SIZE			0x06E00000
 
-#define SMI64_MSM_FB_BASE			0x00700000
-#define SMI64_MSM_FB_SIZE			0x00100000
+#define SMI64_MSM_FB_BASE		0x00700000
+#define SMI64_MSM_FB_SIZE		0x0009B000
+
+#define SMI64_MSM_RAM_CONSOLE_BASE	0x007A0000
+#define SMI64_MSM_RAM_CONSOLE_SIZE	128 * SZ_1K
 
 #define SMI64_MSM_PMEM_MDP_BASE		0x02000000
 #define SMI64_MSM_PMEM_MDP_SIZE		0x00800000
 
-#define SMI64_MSM_PMEM_ADSP_BASE    0x02800000
+#define SMI64_MSM_PMEM_ADSP_BASE	0x02800000
 #define SMI64_MSM_PMEM_ADSP_SIZE	0x00800000
 
 #define SMI64_MSM_PMEM_CAMERA_BASE	0x03000000
 #define SMI64_MSM_PMEM_CAMERA_SIZE	0x01000000
 
 #define SMI64_MSM_LINUX_BASE		MSM_EBI_BASE
-#define SMI64_MSM_LINUX_SIZE		0x06500000
+#define SMI64_MSM_LINUX_SIZE		0x06E00000	// 110*1024*1024
 
-#define SMI64_MSM_RAM_CONSOLE_BASE	MSM_EBI_BASE + 0x06D00000
-#define SMI64_MSM_RAM_CONSOLE_SIZE	128 * SZ_1K
-
-#define SMI64_MSM_PMEM_GPU1_SIZE	0x800000
-#define SMI64_MSM_PMEM_GPU1_BASE	(SMI64_MSM_RAM_CONSOLE_BASE - SMI64_MSM_PMEM_GPU1_SIZE)
+#define SMI64_MSM_PMEM_GPU1_SIZE	0
+#define SMI64_MSM_PMEM_GPU1_BASE	0
 
 #define SMI32_MSM_LINUX_BASE		MSM_EBI_BASE
 #define SMI32_MSM_LINUX_SIZE		0x5400000
@@ -98,8 +99,8 @@
 #define SMI32_MSM_PMEM_ADSP_BASE	(SMI32_MSM_PMEM_MDP_BASE + SMI32_MSM_PMEM_MDP_SIZE)
 #define SMI32_MSM_PMEM_ADSP_SIZE	0x800000
 
-#define SMI32_MSM_FB_BASE			(SMI32_MSM_PMEM_ADSP_BASE + SMI32_MSM_PMEM_ADSP_SIZE)
-#define SMI32_MSM_FB_SIZE			0x9b000
+#define SMI32_MSM_FB_BASE		(SMI32_MSM_PMEM_ADSP_BASE + SMI32_MSM_PMEM_ADSP_SIZE)
+#define SMI32_MSM_FB_SIZE		0x9b000
 
 #define SMI32_MSM_RAM_CONSOLE_BASE	(MSM_EBI_BASE + 0x6d00000)
 #define SMI32_MSM_RAM_CONSOLE_SIZE	128 * SZ_1K

diff --git a/arch/arm/mach-msm/board-trout.h b/arch/arm/mach-msm/board-trout.h
@@ -6,31 +6,28 @@
 
 #include <mach/board.h>
 
-#define MSM_SMI_BASE		0x00000000
-#define MSM_SMI_SIZE		0x00800000
+#define MSM_SMI_BASE			0x00000000
+#define MSM_SMI_SIZE			0x00800000
 
-//#define MSM_EBI_BASE		0x10000000
-//#define MSM_EBI_SIZE		0x06e00000
-
-#define MSM_PMEM_GPU0_BASE	0x00000000
-#define MSM_PMEM_GPU0_SIZE	0x00700000
+#define MSM_PMEM_GPU0_BASE		0x00000000
+#define MSM_PMEM_GPU0_SIZE		0x00700000
 
 #if defined(CONFIG_MSM_AMSS_SUPPORT_256MB_EBI1)
 /* AMSS supports unified 128/256MB EBI1 */
-#define MSM_EBI_BASE				0x19200000
+#define MSM_EBI_BASE			0x19200000
 #define MSM_EBI_SMI64_128MB_SIZE	0x06600000
 #define MSM_EBI_SMI32_256MB_SIZE	0x0C600000
 
-#define SMI64_MSM_FB_BASE			0x00700000
-#define SMI64_MSM_FB_SIZE			0x0009B000
+#define SMI64_MSM_FB_BASE		0x00700000
+#define SMI64_MSM_FB_SIZE		0x0009B000
 
 #define SMI64_MSM_RAM_CONSOLE_BASE	0x007A0000
 #define SMI64_MSM_RAM_CONSOLE_SIZE	128 * SZ_1K
 
 #define SMI64_MSM_PMEM_MDP_BASE		0x02000000
 #define SMI64_MSM_PMEM_MDP_SIZE		0x00800000
 
-#define SMI64_MSM_PMEM_ADSP_BASE    0x02800000
+#define SMI64_MSM_PMEM_ADSP_BASE	0x02800000
 #define SMI64_MSM_PMEM_ADSP_SIZE	0x00800000
 
 #define SMI64_MSM_PMEM_CAMERA_BASE	0x03000000
@@ -39,8 +36,8 @@
 #define SMI64_MSM_PMEM_GPU1_BASE	0x1F800000
 #define SMI64_MSM_PMEM_GPU1_SIZE	0x800000
 
-#define SMI32_MSM_FB_BASE			0x00700000
-#define SMI32_MSM_FB_SIZE			0x0009B000
+#define SMI32_MSM_FB_BASE		0x00700000
+#define SMI32_MSM_FB_SIZE		0x0009B000
 
 #define SMI32_MSM_RAM_CONSOLE_BASE	0x007A0000
 #define SMI32_MSM_RAM_CONSOLE_SIZE	128 * SZ_1K
@@ -60,11 +57,14 @@
 #else
 
 /* AMSS supports only 128MB EBI1. */
-#define MSM_EBI_BASE		0x10000000
-#define MSM_EBI_SIZE		0x06E00000
+#define MSM_EBI_BASE			0x10000000
+#define MSM_EBI_SIZE			0x06E00000
+
+#define SMI64_MSM_FB_BASE		0x00700000
+#define SMI64_MSM_FB_SIZE		0x0009B000
 
-#define SMI64_MSM_FB_BASE		0x03800000
-#define SMI64_MSM_FB_SIZE		0x00100000
+#define SMI64_MSM_RAM_CONSOLE_BASE	0x007A0000
+#define SMI64_MSM_RAM_CONSOLE_SIZE	128 * SZ_1K
 
 #define SMI64_MSM_PMEM_MDP_BASE		0x02000000
 #define SMI64_MSM_PMEM_MDP_SIZE		0x00800000
@@ -75,14 +75,11 @@
 #define SMI64_MSM_PMEM_CAMERA_BASE	0x03000000
 #define SMI64_MSM_PMEM_CAMERA_SIZE	0x00800000
 
-#define SMI64_MSM_PMEM_GPU1_SIZE	0x00800000
-#define SMI64_MSM_PMEM_GPU1_BASE	(SMI64_MSM_RAM_CONSOLE_BASE - SMI64_MSM_PMEM_GPU1_SIZE)
+#define SMI64_MSM_PMEM_GPU1_SIZE	0
+#define SMI64_MSM_PMEM_GPU1_BASE	0
 
 #define SMI64_MSM_LINUX_BASE		MSM_EBI_BASE
-#define SMI64_MSM_LINUX_SIZE		0x06500000
-
-#define SMI64_MSM_RAM_CONSOLE_BASE	(MSM_EBI_BASE + 0x6D00000)
-#define SMI64_MSM_RAM_CONSOLE_SIZE	128 * SZ_1K
+#define SMI64_MSM_LINUX_SIZE		0x06E00000	// 110*1024*1024
 
 #define SMI32_MSM_LINUX_BASE		MSM_EBI_BASE
 #define SMI32_MSM_LINUX_SIZE		0x5400000
@@ -93,8 +90,8 @@
 #define SMI32_MSM_PMEM_ADSP_BASE	(SMI32_MSM_PMEM_MDP_BASE + SMI32_MSM_PMEM_MDP_SIZE)
 #define SMI32_MSM_PMEM_ADSP_SIZE	0x800000
 
-#define SMI32_MSM_FB_BASE			(SMI32_MSM_PMEM_ADSP_BASE + SMI32_MSM_PMEM_ADSP_SIZE)
-#define SMI32_MSM_FB_SIZE			0x9b000
+#define SMI32_MSM_FB_BASE		(SMI32_MSM_PMEM_ADSP_BASE + SMI32_MSM_PMEM_ADSP_SIZE)
+#define SMI32_MSM_FB_SIZE		0x9b000
 
 #define SMI32_MSM_RAM_CONSOLE_BASE	(MSM_EBI_BASE + 0x6d00000)
 #define SMI32_MSM_RAM_CONSOLE_SIZE	128 * SZ_1K
@@ -107,33 +104,6 @@
 
 #endif
 
-/*
-#define MSM_PMEM_MDP_BASE	0x02000000
-#define MSM_PMEM_MDP_SIZE	0x00800000
-
-#define MSM_PMEM_ADSP_BASE      0x02800000
-#define MSM_PMEM_ADSP_SIZE	0x00800000
-
-#define MSM_PMEM_CAMERA_BASE	0x03000000
-#define MSM_PMEM_CAMERA_SIZE	0x00800000
-
-#define MSM_FB_BASE		0x03800000
-#define MSM_FB_SIZE		0x00100000
-
-#define MSM_LINUX_BASE		MSM_EBI_BASE
-#define MSM_LINUX_SIZE		0x06500000
-
-#define MSM_PMEM_GPU1_SIZE	0x800000
-#define MSM_PMEM_GPU1_BASE	MSM_RAM_CONSOLE_BASE - MSM_PMEM_GPU1_SIZE
-
-#define MSM_RAM_CONSOLE_BASE	MSM_EBI_BASE + 0x6d00000
-#define MSM_RAM_CONSOLE_SIZE	128 * SZ_1K
-
-#if (MSM_FB_BASE + MSM_FB_SIZE) >= (MSM_PMEM_GPU1_BASE)
-#error invalid memory map
-#endif
-
-*/
 #define DECLARE_MSM_IOMAP
 #include <mach/msm_iomap.h>