commit b1bd22f2912a0656b4d9772656957339da2b8fec
author Linux Build Service Account <lnxbuild@localhost> Tue Mar 27 22:56:21 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Tue Mar 27 22:57:22 2012 -0700
tree 1d116033bf969c9ad71733dbe9a535d284b37bad
parent 933fbd9c94a5ef4a4e23edb4daf8673465f4cfd5
parent 5cb168df5fba6f03c9ef3e96fd5a89ebe1fea3eb

Merge "msm8960: Reduce kernel memory to account for the increased TZ Apps size."

target/msm8960/atags.c

diff --git a/target/msm8960/atags.c b/target/msm8960/atags.c
index c21634b..f7854b2 100644
--- a/target/msm8960/atags.c
+++ b/target/msm8960/atags.c
@@ -33,7 +33,7 @@
 
 #define SIZE_1M     (1024 * 1024)
 #define SIZE_2M		(2 * SIZE_1M)
-#define SIZE_141M	(141 * SIZE_1M)
+#define SIZE_140M	(140 * SIZE_1M)
 #define SIZE_256M	(256 * SIZE_1M)
 #define SIZE_512M	(512 * SIZE_1M)
 
@@ -44,7 +44,7 @@
 
 	if (smem_ram_ptable_init(&ram_ptable)) {
 		for (i = 0; i < ram_ptable.len; i++) {
-			/* Use only 141M from memory bank starting at 0x80000000 */
+			/* Use only 140M from memory bank starting at 0x80000000 */
 			if (ram_ptable.parts[i].category == SDRAM &&
 			    ram_ptable.parts[i].type == SYS_MEMORY &&
 			    ram_ptable.parts[i].start == 0x80000000) {
@@ -52,7 +52,7 @@
 
 				*ptr++ = 4;
 				*ptr++ = 0x54410002;
-				*ptr++ = SIZE_141M;
+				*ptr++ = SIZE_140M;
 				*ptr++ = ram_ptable.parts[i].start + SIZE_2M;
 
 				if (ram_ptable.parts[i].size > SIZE_256M) {