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

Commit 1a95fc38 authored by Baligh Uddin's avatar Baligh Uddin Committed by Gerrit Code Review
Browse files

Merge "Move pvmfw.img to PREBUILT_IMAGES temporarily"

parents ed1041b8 4bbb8dd8

core/Makefile

+2 −5
Original line number Diff line number Diff line
@@ -3647,7 +3647,7 @@ INTERNAL_PREBUILT_PVMFWIMAGE := packages/modules/Virtualization/pvmfw/pvmfw.img 


ifdef BOARD_PREBUILT_PVMFWIMAGE

PREBUILT_PVMFWIMAGE_TARGET := $(BOARD_PREBUILT_PVMFWIMAGE)

else ifeq ($(BUILDING_PVMFW_IMAGE),true)

else

PREBUILT_PVMFWIMAGE_TARGET := $(INTERNAL_PREBUILT_PVMFWIMAGE)

endif
@@ -5542,12 +5542,9 @@ ifdef BOARD_PREBUILT_DTBOIMAGE 
	$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES

	$(hide) cp $(INSTALLED_DTBOIMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/

endif # BOARD_PREBUILT_DTBOIMAGE

ifdef BOARD_PREBUILT_PVMFWIMAGE

ifeq ($(BOARD_USES_PVMFWIMAGE),true)

	$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES

	$(hide) cp $(INSTALLED_PVMFWIMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/

else ifeq ($(BUILDING_PVMFW_IMAGE),true)

	$(hide) mkdir -p $(zip_root)/IMAGES

	$(hide) cp $(INSTALLED_PVMFWIMAGE_TARGET) $(zip_root)/IMAGES/

endif

ifdef BOARD_PREBUILT_BOOTLOADER

	$(hide) mkdir -p $(zip_root)/IMAGES