Merge "msm8960: Fix memory address and atags."
diff --git a/platform/msm8960/include/platform/iomap.h b/platform/msm8960/include/platform/iomap.h
index 044b461..045e815 100644
--- a/platform/msm8960/include/platform/iomap.h
+++ b/platform/msm8960/include/platform/iomap.h
@@ -59,7 +59,7 @@
#define MSM_SDC3_BASE 0x12180000
#define MSM_SDC4_BASE 0x121C0000
-#define MSM_SHARED_BASE 0x40000000
+#define MSM_SHARED_BASE 0x80000000
#define TLMM_BASE_ADDR 0x00800000
diff --git a/target/msm8960/atags.c b/target/msm8960/atags.c
index 328a10b..4717067 100644
--- a/target/msm8960/atags.c
+++ b/target/msm8960/atags.c
@@ -26,12 +26,13 @@
*
*/
-/* Note: As of now, kernel crashes when RAM size is configured as 2GB.
- * Configuring to 141MB for now.
- */
-#define SIZE_1M (1024 * 1024)
-#define SIZE_141M (141 * SIZE_1M)
-#define EBI1_ADDR_1026M 0x40200000
+#define SIZE_1M (1024 * 1024)
+#define SIZE_141M (141 * SIZE_1M)
+#define SIZE_768M (768 * SIZE_1M)
+#define SIZE_256M (256 * SIZE_1M)
+
+#define EBI1_CH0_CS0_HLOS_ADDR 0x80200000
+#define EBI1_CH1_CS0_HLOS_ADDR 0x90000000
unsigned* target_atag_mem(unsigned* ptr)
{
@@ -39,12 +40,17 @@
*ptr++ = 4;
*ptr++ = 0x54410002;
*ptr++ = SIZE_141M;
- *ptr++ = EBI1_ADDR_1026M;
+ *ptr++ = EBI1_CH0_CS0_HLOS_ADDR;
+
+ *ptr++ = 4;
+ *ptr++ = 0x54410002;
+ *ptr++ = SIZE_256M;
+ *ptr++ = EBI1_CH1_CS0_HLOS_ADDR;
return ptr;
}
void *target_get_scratch_address(void)
{
- return((void *)SCRATCH_ADDR);
+ return((void *)EBI1_CH1_CS0_HLOS_ADDR);
}
diff --git a/target/msm8960/rules.mk b/target/msm8960/rules.mk
index e61db07..bfab671 100644
--- a/target/msm8960/rules.mk
+++ b/target/msm8960/rules.mk
@@ -4,15 +4,15 @@
PLATFORM := msm8960
-MEMBASE := 0x40100000 # SDRAM
+MEMBASE := 0x88F00000 # SDRAM
MEMSIZE := 0x00100000 # 1MB
-BASE_ADDR := 0x40200000
+BASE_ADDR := 0x80200000
TAGS_ADDR := BASE_ADDR+0x00000100
KERNEL_ADDR := BASE_ADDR+0x00008000
RAMDISK_ADDR := BASE_ADDR+0x01000000
-SCRATCH_ADDR := 0x48000000
+SCRATCH_ADDR := 0x90000000
KEYS_USE_GPIO_KEYPAD := 1