commit f1f49571d5bc91c95c194e4d039c6b63d065a61d
author Alistair Strachan <astrachan@google.com> Tue May 14 15:07:51 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 14 15:07:51 2019 -0700
tree 99482fdb559cf39af9d40bc627445ba0968f1957
parent c26d854e4110323ad1856fe0200af10cbd36a98c
parent 3574f5ad00797adc9b15f77f5fbe6b51fb692941

Merge "HiKey/HiKey960: Add BOARD_BOOTIMAGE_PARTITION_SIZE to make sure boot.img is created"
am: 3574f5ad00

Change-Id: I7890e0ec999527e9912f7dd9241faced182a73f4

hikey/BoardConfig.mk

diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk
index 0660a8e..b30c328 100644
--- a/hikey/BoardConfig.mk
+++ b/hikey/BoardConfig.mk
@@ -34,6 +34,7 @@
 
 TARGET_NO_DTIMAGE := true
 
+BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
 ifeq ($(TARGET_USERDATAIMAGE_4GB), true) # to build for aosp-4g partition table
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 1595915776

hikey960/BoardConfig.mk

diff --git a/hikey960/BoardConfig.mk b/hikey960/BoardConfig.mk
index d382d42..3cd7a63 100644
--- a/hikey960/BoardConfig.mk
+++ b/hikey960/BoardConfig.mk
@@ -40,6 +40,7 @@
 
 BOARD_MKBOOTIMG_ARGS := --base 0x0 --tags_offset 0x07a00000 --kernel_offset 0x00080000 --ramdisk_offset 0x07c00000
 
+BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 4915724288    # 4688MB
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 25845301248 # 24648MB
 BOARD_FLASH_BLOCK_SIZE := 512