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

Commit b1752d33 authored by Pierre-Clément Tosi's avatar Pierre-Clément Tosi Committed by Automerger Merge Worker
Browse files

Merge "Introduce BOARD_PVMFWIMAGE_PARTITION_SIZE" am: 88cceca4 am:... 

Merge "Introduce BOARD_PVMFWIMAGE_PARTITION_SIZE" am: 88cceca4 am: dc5093fa am: 072dec09 am: 3c25c045

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

Change-Id: Ie43cdd304f5f1dd232222c81d39243a761fb044b
parents e35b0a0f 3c25c045

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -3396,7 +3396,7 @@ $(INSTALLED_PVMFWIMAGE_TARGET): $(BUILT_PVMFWIMAGE_TARGET) $(AVBTOOL) $(BOARD_AV 
	cp $(BUILT_PVMFWIMAGE_TARGET) $@

	$(AVBTOOL) add_hash_footer \

	    --image $@ \

	    --partition_size $(BOARD_PVMFWIMG_PARTITION_SIZE) \

	    --partition_size $(BOARD_PVMFWIMAGE_PARTITION_SIZE) \

	    --partition_name pvmfw $(INTERNAL_AVB_PVMFW_SIGNING_ARGS) \

	    $(BOARD_AVB_PVMFW_ADD_HASH_FOOTER_ARGS)

else
@@ -4581,7 +4581,7 @@ endif # BOARD_PREBUILT_DTBOIMAGE 
ifeq ($(BOARD_USES_PVMFWIMAGE),true)

	$(hide) echo "has_pvmfw=true" >> $@

ifeq ($(BOARD_AVB_ENABLE),true)

	$(hide) echo "pvmfw_size=$(BOARD_PVMFWIMG_PARTITION_SIZE)" >> $@

	$(hide) echo "pvmfw_size=$(BOARD_PVMFWIMAGE_PARTITION_SIZE)" >> $@

	$(hide) echo "avb_pvmfw_add_hash_footer_args=$(BOARD_AVB_PVMFW_ADD_HASH_FOOTER_ARGS)" >> $@

ifdef BOARD_AVB_PVMFW_KEY_PATH

	$(hide) echo "avb_pvmfw_key_path=$(BOARD_AVB_PVMFW_KEY_PATH)" >> $@

core/board_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ _board_strip_readonly_list += BOARD_VENDOR_DLKMIMAGE_PARTITION_SIZE 
_board_strip_readonly_list += BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE

_board_strip_readonly_list += BOARD_ODM_DLKMIMAGE_PARTITION_SIZE

_board_strip_readonly_list += BOARD_ODM_DLKMIMAGE_FILE_SYSTEM_TYPE

_board_strip_readonly_list += BOARD_PVMFWIMAGE_PARTITION_SIZE



# Logical partitions related variables.

_board_strip_readonly_list += BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE