platform : msm_shared : Modified mmc_page_size() function
Modified mmc_page_size() so as to prevent oob read in boot_verify_image
and such that it passes page size from image.
Change-Id: I2159e3d506bd156e7248ca3b849d930967bf2af8
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index f0158ab..5d522f8 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -240,7 +240,14 @@
#endif
/*As per spec delay wait time before shutdown in Red state*/
#define DELAY_WAIT 30000
-static unsigned page_size = 0;
+static unsigned page_size = BOARD_KERNEL_PAGESIZE;
+
+uint32_t kernel_hdr_page_size()
+{
+ return page_size;
+}
+
+
static unsigned page_mask = 0;
static unsigned mmc_blocksize = 0;
static unsigned mmc_blocksize_mask = 0;
diff --git a/app/aboot/bootimg.h b/app/aboot/bootimg.h
index 1ad5a64..ca5ead7 100644
--- a/app/aboot/bootimg.h
+++ b/app/aboot/bootimg.h
@@ -206,6 +206,7 @@
void bootimg_set_cmdline(boot_img_hdr *hdr, const char *cmdline);
+uint32_t kernel_hdr_page_size();
#define KERNEL64_HDR_MAGIC 0x644D5241 /* ARM64 */
struct kernel64_hdr
diff --git a/platform/msm_shared/mmc.c b/platform/msm_shared/mmc.c
index 350c40a..7673a42 100644
--- a/platform/msm_shared/mmc.c
+++ b/platform/msm_shared/mmc.c
@@ -35,6 +35,7 @@
#include <platform/iomap.h>
#include <platform/timer.h>
#include <bits.h>
+#include <app/aboot/bootimg.h>
#if MMC_BOOT_ADM
#include "adm.h"
@@ -161,7 +162,7 @@
uint32_t mmc_page_size()
{
- return BOARD_KERNEL_PAGESIZE;
+ return kernel_hdr_page_size();
}
void mmc_mclk_reg_wr_delay()