From 4de6b5bfc89de95b18514e75329a2ec7491bebbd Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Wed, 25 Aug 2010 14:29:34 -0700
Subject: [PATCH] Fix mkbootimg parameters for releasetools.

Change-Id: I6192743e9db415f5fe7f3b82081f8a82061254b3
---
 core/Makefile                | 10 ++++++++++
 tools/releasetools/common.py |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/core/Makefile b/core/Makefile
index fbfe11385..5060e456a 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -618,6 +618,10 @@ endif
 ifdef BOARD_KERNEL_BASE
   INTERNAL_RECOVERYIMAGE_ARGS += --base $(BOARD_KERNEL_BASE)
 endif
+BOARD_KERNEL_PAGESIZE := $(strip $(BOARD_KERNEL_PAGESIZE))
+ifdef BOARD_KERNEL_PAGESIZE
+  INTERNAL_RECOVERYIMAGE_ARGS += --pagesize $(BOARD_KERNEL_PAGESIZE)
+endif
 
 # Keys authorized to sign OTA packages this build will accept.  The
 # build always uses test-keys for this; release packaging tools will
@@ -948,6 +952,9 @@ ifdef BOARD_KERNEL_CMDLINE
 endif
 ifdef BOARD_KERNEL_BASE
 	$(hide) echo "$(BOARD_KERNEL_BASE)" > $(zip_root)/RECOVERY/base
+endif
+ifdef BOARD_KERNEL_PAGESIZE
+	$(hide) echo "$(BOARD_KERNEL_PAGESIZE)" > $(zip_root)/RECOVERY/pagesize
 endif
 	@# Components of the boot image
 	$(hide) mkdir -p $(zip_root)/BOOT
@@ -965,6 +972,9 @@ ifdef BOARD_KERNEL_CMDLINE
 endif
 ifdef BOARD_KERNEL_BASE
 	$(hide) echo "$(BOARD_KERNEL_BASE)" > $(zip_root)/BOOT/base
+endif
+ifdef BOARD_KERNEL_PAGESIZE
+	$(hide) echo "$(BOARD_KERNEL_PAGESIZE)" > $(zip_root)/BOOT/pagesize
 endif
 	$(hide) $(foreach t,$(INSTALLED_RADIOIMAGE_TARGET),\
 	            mkdir -p $(zip_root)/RADIO; \
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index ab6678ac6..037c4cf3e 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -121,6 +121,11 @@ def BuildBootableImage(sourcedir):
     cmd.append("--base")
     cmd.append(open(fn).read().rstrip("\n"))
 
+  fn = os.path.join(sourcedir, "pagesize")
+  if os.access(fn, os.F_OK):
+    cmd.append("--pagesize")
+    cmd.append(open(fn).read().rstrip("\n"))
+
   cmd.extend(["--ramdisk", ramdisk_img.name,
               "--output", img.name])