diff options
| -rw-r--r-- | core/Makefile | 8 | ||||
| -rw-r--r-- | core/board_config.mk | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/core/Makefile b/core/Makefile index c51babb7b1..caca06510b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -3477,7 +3477,7 @@ endif # BOARD_PREBUILT_DTBOIMAGE # ----------------------------------------------------------------- # Protected VM firmware image -ifdef BOARD_PREBUILT_PVMFWIMAGE +ifeq ($(BOARD_USES_PVMFWIMAGE),true) INSTALLED_PVMFWIMAGE_TARGET := $(PRODUCT_OUT)/pvmfw.img ifeq ($(BOARD_AVB_ENABLE),true) @@ -3493,7 +3493,7 @@ $(INSTALLED_PVMFWIMAGE_TARGET): $(BOARD_PREBUILT_PVMFWIMAGE) cp $(BOARD_PREBUILT_PVMFWIMAGE) $@ endif -endif # BOARD_PREBUILT_PVMFWIMAGE +endif # BOARD_USES_PVMFWIMAGE # Returns a list of image targets corresponding to the given list of partitions. For example, it # returns "$(INSTALLED_PRODUCTIMAGE_TARGET)" for "product", or "$(INSTALLED_SYSTEMIMAGE_TARGET) @@ -4668,7 +4668,7 @@ ifdef BOARD_AVB_DTBO_KEY_PATH endif # BOARD_AVB_DTBO_KEY_PATH endif # BOARD_AVB_ENABLE endif # BOARD_PREBUILT_DTBOIMAGE -ifdef BOARD_PREBUILT_PVMFWIMAGE +ifeq ($(BOARD_USES_PVMFWIMAGE),true) $(hide) echo "has_pvmfw=true" >> $@ ifeq ($(BOARD_AVB_ENABLE),true) $(hide) echo "pvmfw_size=$(BOARD_PVMFWIMG_PARTITION_SIZE)" >> $@ @@ -4679,7 +4679,7 @@ ifdef BOARD_AVB_PVMFW_KEY_PATH $(hide) echo "avb_pvmfw_rollback_index_location=$(BOARD_AVB_PVMFW_ROLLBACK_INDEX_LOCATION)" >> $@ endif # BOARD_AVB_PVMFW_KEY_PATH endif # BOARD_AVB_ENABLE -endif # BOARD_PREBUILT_PVMFWIMAGE +endif # BOARD_USES_PVMFWIMAGE $(call dump-dynamic-partitions-info,$@) @# VINTF checks ifeq ($(PRODUCT_ENFORCE_VINTF_MANIFEST),true) diff --git a/core/board_config.mk b/core/board_config.mk index 53dbb92c19..56c3e7125c 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -695,6 +695,12 @@ ifdef BOARD_PREBUILT_ODM_DLKMIMAGE endif .KATI_READONLY := BUILDING_ODM_DLKM_IMAGE +BOARD_USES_PVMFWIMAGE := +ifdef BOARD_PREBUILT_PVMFWIMAGE + BOARD_USES_PVMFWIMAGE := true +endif +.KATI_READONLY := BOARD_USES_PVMFWIMAGE + ########################################### # Ensure consistency among TARGET_RECOVERY_UPDATER_LIBS, AB_OTA_UPDATER, and PRODUCT_OTA_FORCE_NON_AB_PACKAGE. TARGET_RECOVERY_UPDATER_LIBS ?= |