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

Commit 592a3ca9 authored Oct 04, 2021 by Pierre-Clément Tosi

Introduce BOARD_PVMFWIMAGE_PARTITION_SIZE

Rename the BOARD_PVMFWIMG_PARTITION_SIZE variable to follow the format
used by all other partitions: BOARD_$(name)IMAGE_PARTITION_SIZE. Note
that all boards using that variable should have been updated to also
define the new version, by now.

Define the new variable as board read-only, as done for other
partitions.

Bug: 199717422
Test: m ${ANDROID_PRODUCT_OUT}/pvmfw.img
Change-Id: I5664c903db6388458e906e996115b695220932ca

parent b9306ac4

core/Makefile

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3485,7 +3485,7 @@ $(INSTALLED_PVMFWIMAGE_TARGET): $(BOARD_PREBUILT_PVMFWIMAGE) $(AVBTOOL) $(BOARD_
	cp $(BOARD_PREBUILT_PVMFWIMAGE) $@		cp $(BOARD_PREBUILT_PVMFWIMAGE) $@
	$(AVBTOOL) add_hash_footer \		$(AVBTOOL) add_hash_footer \
	--image $@ \		--image $@ \
	--partition_size $(BOARD_PVMFWIMG_PARTITION_SIZE) \		--partition_size $(BOARD_PVMFWIMAGE_PARTITION_SIZE) \
	--partition_name pvmfw $(INTERNAL_AVB_PVMFW_SIGNING_ARGS) \		--partition_name pvmfw $(INTERNAL_AVB_PVMFW_SIGNING_ARGS) \
	$(BOARD_AVB_PVMFW_ADD_HASH_FOOTER_ARGS)		$(BOARD_AVB_PVMFW_ADD_HASH_FOOTER_ARGS)
	else		else
	@@ -4671,7 +4671,7 @@ endif # BOARD_PREBUILT_DTBOIMAGE
	ifdef BOARD_PREBUILT_PVMFWIMAGE		ifdef BOARD_PREBUILT_PVMFWIMAGE
	$(hide) echo "has_pvmfw=true" >> $@		$(hide) echo "has_pvmfw=true" >> $@
	ifeq ($(BOARD_AVB_ENABLE),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)" >> $@		$(hide) echo "avb_pvmfw_add_hash_footer_args=$(BOARD_AVB_PVMFW_ADD_HASH_FOOTER_ARGS)" >> $@
	ifdef BOARD_AVB_PVMFW_KEY_PATH		ifdef BOARD_AVB_PVMFW_KEY_PATH
	$(hide) echo "avb_pvmfw_key_path=$(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	Original line	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_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE
	_board_strip_readonly_list += BOARD_ODM_DLKMIMAGE_PARTITION_SIZE		_board_strip_readonly_list += BOARD_ODM_DLKMIMAGE_PARTITION_SIZE
	_board_strip_readonly_list += BOARD_ODM_DLKMIMAGE_FILE_SYSTEM_TYPE		_board_strip_readonly_list += BOARD_ODM_DLKMIMAGE_FILE_SYSTEM_TYPE
			_board_strip_readonly_list += BOARD_PVMFWIMAGE_PARTITION_SIZE

	# Logical partitions related variables.		# Logical partitions related variables.
	_board_strip_readonly_list += BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE		_board_strip_readonly_list += BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE