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

Commit 3a58e227 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Support custom DTBO image for 16KB target" into main am: 8e7b07af 

Original change: https://android-review.googlesource.com/c/platform/build/+/3150937



Change-Id: I49a85f86ce35ff95eba9fd2400dd693433d3e190
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 745bb814 8e7b07af

core/Makefile

+27 −0
Original line number Diff line number Diff line
@@ -1165,6 +1165,33 @@ ramdisk_16k: $(BUILT_RAMDISK_16K_TARGET) 


endif



# -----------------------------------------------------------------

# 16KB dtbo image

ifdef BOARD_PREBUILT_DTBOIMAGE_16KB

INSTALLED_DTBOIMAGE_16KB_TARGET := $(PRODUCT_OUT)/dtbo_16k.img



ifeq ($(BOARD_AVB_ENABLE),true)

$(INSTALLED_DTBOIMAGE_16KB_TARGET): $(BOARD_PREBUILT_DTBOIMAGE_16KB) $(AVBTOOL) $(BOARD_AVB_DTBO_KEY_PATH)

	cp $(BOARD_PREBUILT_DTBOIMAGE_16KB) $@

	chmod +w $@

	$(AVBTOOL) add_hash_footer \

	    --image $@ \

	    $(call get-partition-size-argument,$(BOARD_DTBOIMG_PARTITION_SIZE)) \

	    --partition_name dtbo $(INTERNAL_AVB_DTBO_SIGNING_ARGS) \

	    $(BOARD_AVB_DTBO_ADD_HASH_FOOTER_ARGS)



$(call declare-1p-container,$(INSTALLED_DTBOIMAGE_16KB_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_DTBOIMAGE_16KB_TARGET),$(BOARD_PREBUILT_DTBOIMAGE_16KB),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_VENDOR_DEPS += $(INSTALLED_DTBOIMAGE_16KB_TARGET)

else

$(INSTALLED_DTBOIMAGE_16KB_TARGET): $(BOARD_PREBUILT_DTBOIMAGE_16KB)

	cp $(BOARD_PREBUILT_DTBOIMAGE_16KB) $@

endif



endif # BOARD_PREBUILT_DTBOIMAGE_16KB





ifneq ($(BOARD_KERNEL_PATH_16K),)

BUILT_KERNEL_16K_TARGET := $(PRODUCT_OUT)/kernel_16k