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

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

Merge "core: Drop support for BOARD_PREBUILT_PVMFWIMAGE"

parents 085a34b9 cb1d31c4

core/Makefile

+1 −7
Original line number Diff line number Diff line
@@ -3909,15 +3909,9 @@ endif # BOARD_PREBUILT_DTBOIMAGE 
ifeq ($(BOARD_USES_PVMFWIMAGE),true)

INSTALLED_PVMFWIMAGE_TARGET := $(PRODUCT_OUT)/pvmfw.img

INSTALLED_PVMFW_EMBEDDED_AVBKEY_TARGET := $(PRODUCT_OUT)/pvmfw_embedded.avbpubkey

INTERNAL_PREBUILT_PVMFWIMAGE := packages/modules/Virtualization/pvmfw/pvmfw.img

PREBUILT_PVMFWIMAGE_TARGET := packages/modules/Virtualization/pvmfw/pvmfw.img

INTERNAL_PVMFW_EMBEDDED_AVBKEY := external/avb/test/data/testkey_rsa4096_pub.bin



ifdef BOARD_PREBUILT_PVMFWIMAGE

PREBUILT_PVMFWIMAGE_TARGET := $(BOARD_PREBUILT_PVMFWIMAGE)

else

PREBUILT_PVMFWIMAGE_TARGET := $(INTERNAL_PREBUILT_PVMFWIMAGE)

endif



ifeq ($(BOARD_AVB_ENABLE),true)

$(INSTALLED_PVMFWIMAGE_TARGET): $(PREBUILT_PVMFWIMAGE_TARGET) $(AVBTOOL) $(BOARD_AVB_PVMFW_KEY_PATH)

	cp $< $@

core/board_config.mk

+0 −6
Original line number Diff line number Diff line
@@ -931,9 +931,6 @@ endif 
.KATI_READONLY := BUILDING_SYSTEM_DLKM_IMAGE



BOARD_USES_PVMFWIMAGE :=

ifdef BOARD_PREBUILT_PVMFWIMAGE

  BOARD_USES_PVMFWIMAGE := true

endif

ifeq ($(PRODUCT_BUILD_PVMFW_IMAGE),true)

  BOARD_USES_PVMFWIMAGE := true

endif
@@ -943,9 +940,6 @@ BUILDING_PVMFW_IMAGE := 
ifeq ($(PRODUCT_BUILD_PVMFW_IMAGE),true)

  BUILDING_PVMFW_IMAGE := true

endif

ifdef BOARD_PREBUILT_PVMFWIMAGE

  BUILDING_PVMFW_IMAGE :=

endif

.KATI_READONLY := BUILDING_PVMFW_IMAGE



###########################################

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ $(KATI_obsolete_var PRODUCT_SUPPORTS_VERITY,VB 1.0 and related variables are no 
$(KATI_obsolete_var PRODUCT_SUPPORTS_VERITY_FEC,VB 1.0 and related variables are no longer supported)

$(KATI_obsolete_var PRODUCT_SUPPORTS_BOOT_SIGNER,VB 1.0 and related variables are no longer supported)

$(KATI_obsolete_var PRODUCT_VERITY_SIGNING_KEY,VB 1.0 and related variables are no longer supported)

$(KATI_obsolete_var BOARD_PREBUILT_PVMFWIMAGE,pvmfw.bin is now built in AOSP and custom versions are no longer supported)

# Used to force goals to build.  Only use for conditionally defined goals.

.PHONY: FORCE

FORCE: