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

Commit 75205132 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Allow for a separate recovery DTBO to be used for non-A/B devices."

parents 7bd87533 a9418999

core/Makefile

+17 −0
Original line number Diff line number Diff line
@@ -1800,8 +1800,12 @@ ifdef BOARD_KERNEL_PAGESIZE 
  INTERNAL_RECOVERYIMAGE_ARGS += --pagesize $(BOARD_KERNEL_PAGESIZE)

endif

ifdef BOARD_INCLUDE_RECOVERY_DTBO

ifdef BOARD_PREBUILT_RECOVERY_DTBOIMAGE

  INTERNAL_RECOVERYIMAGE_ARGS += --recovery_dtbo $(BOARD_PREBUILT_RECOVERY_DTBOIMAGE)

else

  INTERNAL_RECOVERYIMAGE_ARGS += --recovery_dtbo $(BOARD_PREBUILT_DTBOIMAGE)

endif

endif

ifdef BOARD_INCLUDE_RECOVERY_ACPIO

  INTERNAL_RECOVERYIMAGE_ARGS += --recovery_acpio $(BOARD_RECOVERY_ACPIO)

endif
@@ -1892,8 +1896,12 @@ ifeq (true,$(BOARD_AVB_ENABLE)) 
$(INSTALLED_BOOTIMAGE_TARGET) : $(AVBTOOL) $(BOARD_AVB_BOOT_KEY_PATH)

endif

ifdef BOARD_INCLUDE_RECOVERY_DTBO

ifdef BOARD_PREBUILT_RECOVERY_DTBOIMAGE

$(INSTALLED_BOOTIMAGE_TARGET): $(BOARD_PREBUILT_RECOVERY_DTBOIMAGE)

else

$(INSTALLED_BOOTIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE)

endif

endif

ifdef BOARD_INCLUDE_RECOVERY_ACPIO

$(INSTALLED_BOOTIMAGE_TARGET): $(BOARD_RECOVERY_ACPIO)

endif
@@ -1918,8 +1926,12 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \ 
endif # BOARD_USES_RECOVERY_AS_BOOT



ifdef BOARD_INCLUDE_RECOVERY_DTBO

ifdef BOARD_PREBUILT_RECOVERY_DTBOIMAGE

$(INSTALLED_RECOVERYIMAGE_TARGET): $(BOARD_PREBUILT_RECOVERY_DTBOIMAGE)

else

$(INSTALLED_RECOVERYIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE)

endif

endif

ifdef BOARD_INCLUDE_RECOVERY_ACPIO

$(INSTALLED_RECOVERYIMAGE_TARGET): $(BOARD_RECOVERY_ACPIO)

endif
@@ -3597,6 +3609,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
	    $(INSTALLED_KERNEL_TARGET) \

	    $(INSTALLED_2NDBOOTLOADER_TARGET) \

	    $(BOARD_PREBUILT_DTBOIMAGE) \

	    $(BOARD_PREBUILT_RECOVERY_DTBOIMAGE) \

	    $(BOARD_RECOVERY_ACPIO) \

	    $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_BASE_FS_PATH) \

	    $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_BASE_FS_PATH) \
@@ -3636,8 +3649,12 @@ ifdef INSTALLED_2NDBOOTLOADER_TARGET 
	$(hide) cp $(INSTALLED_2NDBOOTLOADER_TARGET) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/second

endif

ifdef BOARD_INCLUDE_RECOVERY_DTBO

ifdef BOARD_PREBUILT_RECOVERY_DTBOIMAGE

	$(hide) cp $(BOARD_PREBUILT_RECOVERY_DTBOIMAGE) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/recovery_dtbo

else

	$(hide) cp $(BOARD_PREBUILT_DTBOIMAGE) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/recovery_dtbo

endif

endif

ifdef BOARD_INCLUDE_RECOVERY_ACPIO

	$(hide) cp $(BOARD_RECOVERY_ACPIO) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/recovery_acpio

endif