Merge "app: aboot: ensure NULL termination to cmdine buffer of bootimage header"
diff --git a/platform/msm8996/include/platform/iomap.h b/platform/msm8996/include/platform/iomap.h
index 2a31c8f..bafac78 100644
--- a/platform/msm8996/include/platform/iomap.h
+++ b/platform/msm8996/include/platform/iomap.h
@@ -195,7 +195,7 @@
* as device memory, define the start address
* and size in MB
*/
-#define RPMB_SND_RCV_BUF 0x91400000
+#define RPMB_SND_RCV_BUF 0x91A00000
#define RPMB_SND_RCV_BUF_SZ 0x2
#define TCSR_BOOT_MISC_DETECT 0x007B3000
diff --git a/platform/msm8996/platform.c b/platform/msm8996/platform.c
index 08c0025..6bad8f6 100644
--- a/platform/msm8996/platform.c
+++ b/platform/msm8996/platform.c
@@ -85,8 +85,7 @@
static mmu_section_t dload_mmu_section_table[] =
{
/* Physical addr, Virtual addr, Mapping type , Size (in MB), Flags */
- { 0x85800000, 0x85800000, MMU_L2_NS_SECTION_MAPPING, 8, DLOAD_MEMORY},
- { 0x86200000, 0x86200000, MMU_L2_NS_SECTION_MAPPING, 174, DLOAD_MEMORY},
+ { 0x85800000, 0x85800000, MMU_L2_NS_SECTION_MAPPING, 189, DLOAD_MEMORY},
};
void platform_early_init(void)
diff --git a/target/msm8996/rules.mk b/target/msm8996/rules.mk
index fa207a4..49bacca 100644
--- a/target/msm8996/rules.mk
+++ b/target/msm8996/rules.mk
@@ -8,13 +8,13 @@
PLATFORM := msm8996
-MEMBASE := 0x91000000 # SDRAM
+MEMBASE := 0x91600000 # SDRAM
MEMSIZE := 0x00400000 # 4MB
BASE_ADDR := 0x0000000
-SCRATCH_ADDR := 0x91600000
-SCRATCH_SIZE := 746
+SCRATCH_ADDR := 0x91C00000
+SCRATCH_SIZE := 740
# LPAE supports only 32 virtual address, L1 pt size is 4
L1_PT_SZ := 4
L2_PT_SZ := 3