commit 45e426ec00bbd10415b994c8a7744155e2e91ef8
author Linux Build Service Account <lnxbuild@localhost> Sun Mar 29 02:09:36 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Mar 29 02:09:36 2015 -0700
tree 342063add96a0332b6fc5eb9359c0283b261d9e2
parent 6298d93bb82c85ccb077bff43bc03a2b22e9003c
parent 095b02bee09649b4b83a131386331c1cb25bc041

Merge "target: msm8226: Fix DDR memory map"

target/msm8226/meminfo.c

diff --git a/target/msm8226/meminfo.c b/target/msm8226/meminfo.c
index 5de0ef0..5882a2f 100644
--- a/target/msm8226/meminfo.c
+++ b/target/msm8226/meminfo.c
@@ -78,24 +78,10 @@
 
 void *target_get_scratch_address(void)
 {
-	void *scratch_addr = 0;
-
-	if(target_is_cdp_qvga())
-		scratch_addr = (void *)SCRATCH_ADDR_128MAP;
-	else
-		scratch_addr = (void *)SCRATCH_ADDR_512MAP;
-
-	return scratch_addr;
+	return (void *)SCRATCH_ADDR;
 }
 
 unsigned target_get_max_flash_size(void)
 {
-	uint32_t max_flash_size = 0;
-
-	if(target_is_cdp_qvga())
-		max_flash_size = SCRATCH_SIZE_128MAP;
-	else
-		max_flash_size = SCRATCH_SIZE_512MAP;
-
-	return max_flash_size;
+	return SCRATCH_SIZE;
 }

target/msm8226/rules.mk

diff --git a/target/msm8226/rules.mk b/target/msm8226/rules.mk
index 91119ea..3be3c36 100755
--- a/target/msm8226/rules.mk
+++ b/target/msm8226/rules.mk
@@ -14,10 +14,7 @@
 KERNEL_ADDR      := BASE_ADDR+0x00008000
 RAMDISK_ADDR     := BASE_ADDR+0x01000000
 SCRATCH_ADDR     := 0x10000000
-SCRATCH_ADDR_128MAP     := 0x04200000
-SCRATCH_ADDR_512MAP     := 0x10000000
-SCRATCH_SIZE_128MAP     := 0x03D00000
-SCRATCH_SIZE_512MAP     := 0x20000000
+SCRATCH_SIZE     := 0x20000000
 
 DEFINES += DISPLAY_SPLASH_SCREEN=1
 DEFINES += DISPLAY_TYPE_MIPI=1
@@ -39,10 +36,7 @@
 	KERNEL_ADDR=$(KERNEL_ADDR) \
 	RAMDISK_ADDR=$(RAMDISK_ADDR) \
 	SCRATCH_ADDR=$(SCRATCH_ADDR) \
-	SCRATCH_ADDR_128MAP=$(SCRATCH_ADDR_128MAP) \
-	SCRATCH_ADDR_512MAP=$(SCRATCH_ADDR_512MAP) \
-	SCRATCH_SIZE_128MAP=$(SCRATCH_SIZE_128MAP) \
-	SCRATCH_SIZE_512MAP=$(SCRATCH_SIZE_512MAP)
+	SCRATCH_SIZE=$(SCRATCH_SIZE)
 
 
 OBJS += \