| author | Xindong Xu <xindong.xu@amlogic.com> | 2018-09-27 06:54:25 (GMT) |
|---|---|---|
| committer | Xindong Xu <xindong.xu@amlogic.com> | 2018-09-28 10:24:52 (GMT) |
| commit | 214d35eafbd722c53e58881564362813215c86cd (patch) | |
| tree | 7df528128dc48c3c2b9271ba7e9e2eafe484fb0f | |
| parent | 00fc0d615c02e69b2cd1525cda292494d70ce3cf (diff) | |
| download | curie-p-amlogic.zip curie-p-amlogic.tar.gz curie-p-amlogic.tar.bz2 | |
vts: add boot image header_version field & dtbo.img [10/20]
PD# 173146
PD# 173147
All devices launching with Android 9 must use a boot header version of 1.
https://source.android.com/devices/bootloader/boot-image-header
And add dtbo index command line.
https://source.android.com/devices/architecture/dto/compile
Change-Id: I269b3c7a79f1a1f7987f2f56d5574a53bcab8e35
| -rw-r--r-- | BoardConfig.mk | 9 | ||||
| -rw-r--r-- | Kernel.mk | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index e5bed97..68d83b4 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -101,6 +101,12 @@ BOARD_ODMIMAGE_PARTITION_SIZE := 134217728 BOARD_PRODUCTIMAGE_PARTITION_SIZE := 134217728 endif +# DTBO partition definitions +BOARD_PREBUILT_DTBOIMAGE := device/amlogic/curie-kernel/dtbo.img +BOARD_DTBOIMG_PARTITION_SIZE := 8388608 + +BOARD_KERNEL_CMDLINE += androidboot.dtbo_idx=0 + ifneq ($(USE_USB_AS_HOST),true) BOARD_KERNEL_CMDLINE += --cmdline "otg_device=1" endif @@ -157,3 +163,6 @@ BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true DEVICE_MANIFEST_FILE := device/amlogic/curie/manifest.xml #DEVICE_MATRIX_FILE := device/amlogic/common/compatibility_matrix.xml + +BOARD_BOOTIMG_HEADER_VERSION := 1 +BOARD_INCLUDE_RECOVERY_DTBO := true @@ -7,7 +7,7 @@ WIFI_MODULE := multiwifi INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel -BOARD_MKBOOTIMG_ARGS := --kernel_offset $(BOARD_KERNEL_OFFSET) +BOARD_MKBOOTIMG_ARGS := --kernel_offset $(BOARD_KERNEL_OFFSET) --header_version $(BOARD_BOOTIMG_HEADER_VERSION) INSTALLED_2NDBOOTLOADER_TARGET := $(PRODUCT_OUT)/2ndbootloader @@ -63,7 +63,7 @@ KERNEL_DEVICETREE := gxl_p241_1g gxl_p241_v2-1g KERNEL_DEFCONFIG := meson64_defconfig KERNEL_ARCH := arm64 - +DTBO_DEVICETREE := common_overlay_dt KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ KERNEL_CONFIG := $(KERNEL_OUT)/.config |