Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dee1098 authored by Jan Altensen's avatar Jan Altensen Committed by Aayush Gupta
Browse files

2e: Adopt to new DTBO generation method

Change-Id: I90b3c1c8c3e8ee19d0f99ad8a3d9ba8bdb2be55a
parent 436a7fe0
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -78,14 +78,18 @@ BOARD_DTB_OFFSET := 0x07880000
BOARD_KERNEL_PAGESIZE := 2048
BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb
BOARD_BOOTIMG_HEADER_VERSION := 2

TARGET_KERNEL_ARCH := arm64
TARGET_KERNEL_HEADER_ARCH := arm64
TARGET_KERNEL_SOURCE := kernel/teracube/2e
TARGET_KERNEL_CONFIG := 2e_defconfig
TARGET_KERNEL_VERSION := 4.9
TARGET_KERNEL_CLANG_COMPILE := true

BOARD_DTBO_CFG := $(DEVICE_PATH)/configs/dtboimg.cfg
BOARD_INCLUDE_DTB_IN_BOOTIMG := true
BOARD_KERNEL_SEPARATED_DTBO := true

BOARD_MKBOOTIMG_ARGS += --base $(BOARD_KERNEL_BASE)
BOARD_MKBOOTIMG_ARGS += --dtb_offset $(BOARD_DTB_OFFSET)
BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOTIMG_HEADER_VERSION)
@@ -93,7 +97,6 @@ BOARD_MKBOOTIMG_ARGS += --kernel_offset $(BOARD_KERNEL_OFFSET)
BOARD_MKBOOTIMG_ARGS += --pagesize $(BOARD_KERNEL_PAGESIZE)
BOARD_MKBOOTIMG_ARGS += --ramdisk_offset $(BOARD_RAMDISK_OFFSET)
BOARD_MKBOOTIMG_ARGS += --tags_offset $(BOARD_KERNEL_TAGS_OFFSET)
BOARD_CUSTOM_DTBOIMG_MK := $(DEVICE_PATH)/configs/dtbo/dtbo.mk

# Avb
BOARD_AVB_ENABLE := true

configs/dtbo/dtbo.mk

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line
BOARD_KERNEL_DTBO_CFG := dtboimg.cfg
MKDTBOIMG := system/libufdt/utils/src/mkdtboimg.py

# BUG: mkdtboimg.py doesn't support absolute paths yet. Fix this later.
define build-dtboimage-target-from-cfg
    $(call pretty,"Target dtbo image from cfg: $(BOARD_PREBUILT_DTBOIMAGE)")
    $(hide) $(MKDTBOIMG) cfg_create $@ $(KERNEL_OUT)/$(BOARD_KERNEL_DTBO_CFG) -d /
    $(hide) chmod a+r $@
endef

$(BOARD_PREBUILT_DTBOIMAGE): $(MKDTBOIMG) $(INSTALLED_KERNEL_TARGET)
	$(build-dtboimage-target-from-cfg)

configs/dtboimg.cfg

0 → 100644
+2 −0
Original line number Diff line number Diff line
arch/arm64/boot/dts/mediatek/yk673v6_lwg62_64.dtb
        id=0