Merge "target: msm8953: Change to refactor LK memory mapping."
diff --git a/target/msm8953/include/target/display.h b/target/msm8953/include/target/display.h
index a57620b..07b3f26 100755
--- a/target/msm8953/include/target/display.h
+++ b/target/msm8953/include/target/display.h
@@ -66,7 +66,7 @@
/*---------------------------------------------------------------------------*/
#define DISPLAY_CMDLINE_PREFIX " mdss_mdp.panel="
-#define MIPI_FB_ADDR 0x90000000
+#define MIPI_FB_ADDR 0x90100000
#define MIPI_HSYNC_PULSE_WIDTH 12
#define MIPI_HSYNC_BACK_PORCH_DCLK 32
diff --git a/target/msm8953/meminfo.c b/target/msm8953/meminfo.c
index 3968185..1f0de63 100644
--- a/target/msm8953/meminfo.c
+++ b/target/msm8953/meminfo.c
@@ -81,5 +81,5 @@
unsigned target_get_max_flash_size(void)
{
- return (510 * 1024 * 1024);
+ return (SCRATCH_SIZE * 1048576);
}
diff --git a/target/msm8953/rules.mk b/target/msm8953/rules.mk
index 26faca4..55aeb86 100644
--- a/target/msm8953/rules.mk
+++ b/target/msm8953/rules.mk
@@ -9,10 +9,11 @@
PLATFORM := msm8953
MEMBASE := 0x8F600000 # SDRAM
-MEMSIZE := 0x00600000 # 6MB
+MEMSIZE := 0x00A00000 # 10MB
BASE_ADDR := 0x80000000
SCRATCH_ADDR := 0xA0100000
+SCRATCH_SIZE := 510 # 510MB
DEFINES += PMI_CONFIGURED=1
DEFINES += DISPLAY_TYPE_MIPI=1
@@ -33,7 +34,8 @@
MEMSIZE=$(MEMSIZE) \
MEMBASE=$(MEMBASE) \
BASE_ADDR=$(BASE_ADDR) \
- SCRATCH_ADDR=$(SCRATCH_ADDR)
+ SCRATCH_ADDR=$(SCRATCH_ADDR) \
+ SCRATCH_SIZE=$(SCRATCH_SIZE)
OBJS += \
$(LOCAL_DIR)/init.o \