From 67c9e2ad71df637ebc6f4fefedbc4d8f2ee2cb02 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Wed, 1 Jul 2020 17:36:26 +0200 Subject: [PATCH] sm8250-common: Include dtbo in recovery image * This allows us to drop dependency on dtbo partition being in sync with recovery. * Test: fastboot erase dtbo && fastboot boot recovery.img --- BoardConfigCommon.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 4ee8794..319c066 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -42,11 +42,13 @@ TARGET_BOOTLOADER_BOARD_NAME := kona TARGET_NO_BOOTLOADER := true # Kernel +BOARD_BOOT_HEADER_VERSION := 2 BOARD_KERNEL_BASE := 0x80000000 BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom androidboot.console=ttyMSM0 androidboot.memcg=1 lpm_levels.sleep_disabled=1 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 service_locator.enable=1 androidboot.usbcontroller=a600000.dwc3 swiotlb=2048 loop.max_part=7 cgroup.memory=nokmem,nosocket reboot=panic_warm BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb BOARD_KERNEL_PAGESIZE := 4096 BOARD_KERNEL_SEPARATED_DTBO := true +BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) NEED_KERNEL_MODULE_SYSTEM := true TARGET_KERNEL_ADDITIONAL_FLAGS := DTC_EXT=$(shell pwd)/prebuilts/misc/linux-x86/dtc/dtc TARGET_KERNEL_ARCH := arm64 @@ -128,6 +130,8 @@ TARGET_COPY_OUT_PRODUCT := product TARGET_COPY_OUT_VENDOR := vendor # Recovery +BOARD_INCLUDE_DTB_IN_BOOTIMG := true +BOARD_INCLUDE_RECOVERY_DTBO := true TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888" TARGET_USERIMAGES_USE_EXT4 := true