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

Unverified Commit ca65cbea authored by David Ng's avatar David Ng Committed by Michael Bestas
Browse files

build: Add support for device tree in boot.img 

Add support for optional device tree image (dt.img)
to boot and recovery images.  Some devices use kernel device
tree and this adds the device tree image as a section within
the boot/recovery images.

Change-Id: I91431ef2f4b86485895678916e39a8572be878eb
parent 671dba1a

core/Makefile

+12 −2
Original line number Diff line number Diff line
@@ -552,6 +552,11 @@ INTERNAL_MKBOOTIMG_VERSION_ARGS := \ 
    --os_version $(PLATFORM_VERSION) \

    --os_patch_level $(PLATFORM_SECURITY_PATCH)



ifeq ($(strip $(BOARD_KERNEL_SEPARATED_DT)),true)

  INTERNAL_BOOTIMAGE_ARGS += --dt $(INSTALLED_DTIMAGE_TARGET)

  BOOTIMAGE_EXTRA_DEPS    := $(INSTALLED_DTIMAGE_TARGET)

endif



INSTALLED_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img



# BOARD_USES_RECOVERY_AS_BOOT = true must have BOARD_BUILD_SYSTEM_ROOT_IMAGE = true.
@@ -600,7 +605,7 @@ bootimage-nodeps: $(MKBOOTIMG) $(VBOOT_SIGNER) 


  else # PRODUCT_SUPPORTS_VBOOT != true



$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES)

$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(BOOTIMAGE_EXTRA_DEPS)

	$(call pretty,"Target boot image: $@")

	$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@

	$(hide) $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE))
@@ -976,6 +981,10 @@ BOARD_KERNEL_PAGESIZE := $(strip $(BOARD_KERNEL_PAGESIZE)) 
ifdef BOARD_KERNEL_PAGESIZE

  INTERNAL_RECOVERYIMAGE_ARGS += --pagesize $(BOARD_KERNEL_PAGESIZE)

endif

ifeq ($(strip $(BOARD_KERNEL_SEPARATED_DT)),true)

  INTERNAL_RECOVERYIMAGE_ARGS += --dt $(INSTALLED_DTIMAGE_TARGET)

  RECOVERYIMAGE_EXTRA_DEPS    := $(INSTALLED_DTIMAGE_TARGET)

endif



# Keys authorized to sign OTA packages this build will accept.  The

# build always uses dev-keys for this; release packaging tools will
@@ -1092,7 +1101,8 @@ $(recovery_ramdisk): $(MINIGZIP) \ 
	$(hide) $(MINIGZIP) < $(recovery_uncompressed_ramdisk) > $@



ifndef BOARD_CUSTOM_BOOTIMG_MK

$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) $(recovery_ramdisk) $(recovery_kernel)

$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) $(recovery_ramdisk) $(recovery_kernel) \

		$(RECOVERYIMAGE_EXTRA_DEPS)

	@echo -e ${CL_CYN}"----- Making recovery image ------"${CL_RST}

	$(call build-recoveryimage-target, $@)

endif # BOARD_CUSTOM_BOOTIMG_MK