commit 3860bbfca8e2049c470953e3bf735f81e210e7b4
author Shivaprasad Hongal <shongal@codeaurora.org> Thu Apr 27 17:40:13 2017 -0700
committer Shivaprasad Hongal <shongal@codeaurora.org> Thu May 04 14:51:36 2017 -0700
tree 1b0fdbae37fac1497628864b1f9df5935534de5f
parent e3b5339c266275d25b035f9e22ecf4c931f9b795

QcomModulePkg: Update inf for avb 2.0

Update build files for avb 2.0 support.

Change-Id: I982cb79bebbed362d99230a4153e5f431dc9d7a5

AndroidBoot.mk

diff --git a/AndroidBoot.mk b/AndroidBoot.mk
index c12a124..8c275fb 100644
--- a/AndroidBoot.mk
+++ b/AndroidBoot.mk
@@ -8,6 +8,12 @@
 	VERIFIED_BOOT := VERIFIED_BOOT=0
 endif
 
+ifeq ($(BOARD_AVB_ENABLE),true)
+	VERIFIED_BOOT_2 := VERIFIED_BOOT_2=1
+else
+	VERIFIED_BOOT_2 := VERIFIED_BOOT_2=0
+endif
+
 ifeq ($(TARGET_BUILD_VARIANT),user)
 	USER_BUILD_VARIANT := USER_BUILD_VARIANT=1
 else
@@ -27,7 +33,7 @@
 
 # Top level target
 $(TARGET_ABL): abl_clean | $(ABL_OUT) $(INSTALLED_KEYSTOREIMAGE_TARGET)
-	$(MAKE) -C bootable/bootloader/edk2 BOOTLOADER_OUT=../../../$(ABL_OUT) all $(VERIFIED_BOOT) $(USER_BUILD_VARIANT) CLANG_BIN=$(CLANG_BIN)
+	$(MAKE) -C bootable/bootloader/edk2 BOOTLOADER_OUT=../../../$(ABL_OUT) all $(VERIFIED_BOOT) $(VERIFIED_BOOT_2) $(USER_BUILD_VARIANT) CLANG_BIN=$(CLANG_BIN)
 
 .PHONY: abl
 

QcomModulePkg/Library/avb/AvbLib.inf

diff --git a/QcomModulePkg/Library/avb/AvbLib.inf b/QcomModulePkg/Library/avb/AvbLib.inf
index 3fdd9e6..2fb107a 100644
--- a/QcomModulePkg/Library/avb/AvbLib.inf
+++ b/QcomModulePkg/Library/avb/AvbLib.inf
@@ -41,7 +41,26 @@
 
 
 [Sources]
+   libavb/avb_chain_partition_descriptor.c
+   libavb/avb_crc32.c
+   libavb/avb_crypto.c
+   libavb/avb_descriptor.c
+   libavb/avb_footer.c
+   libavb/avb_hash_descriptor.c
+   libavb/avb_hashtree_descriptor.c
+   libavb/avb_kernel_cmdline_descriptor.c
+   libavb/avb_property_descriptor.c
+   libavb/avb_rsa.c
+   libavb/avb_sha256.c
+   libavb/avb_sha512.c
+   libavb/avb_slot_verify.c
+   libavb/avb_sysdeps.c
+   libavb/avb_util.c
+   libavb/avb_vbmeta_image.c
+   libavb/avb_version.c
+   libavb/avb_ops.c
    VerifiedBoot.c
+   KeymasterClient.c
 
 
 [Packages]
@@ -69,6 +88,7 @@
 
 [Protocols]
 	gQcomQseecomProtocolGuid
+	gEfiPartitionRecordGuid
 
 [FixedPcd]
 	gQcomTokenSpaceGuid.EnableMdtpSupport

QcomModulePkg/QcomModulePkg.dsc

diff --git a/QcomModulePkg/QcomModulePkg.dsc b/QcomModulePkg/QcomModulePkg.dsc
index fda5df4..3ba7a50 100644
--- a/QcomModulePkg/QcomModulePkg.dsc
+++ b/QcomModulePkg/QcomModulePkg.dsc
@@ -93,6 +93,9 @@
   !if $(VERIFIED_BOOT)
       GCC:*_*_*_CC_FLAGS = -DVERIFIED_BOOT
   !endif
+  !if $(VERIFIED_BOOT_2)
+      GCC:*_*_*_CC_FLAGS = -DVERIFIED_BOOT_2
+  !endif
   !if $(USER_BUILD_VARIANT) == 0
       GCC:*_*_*_CC_FLAGS = -DENABLE_UPDATE_PARTITIONS_CMDS -DENABLE_BOOT_CMD -DENABLE_DEVICE_CRITICAL_LOCK_UNLOCK_CMDS
   !else

makefile

diff --git a/makefile b/makefile
index 1c94049..56962e1 100644
--- a/makefile
+++ b/makefile
@@ -36,7 +36,7 @@
 
 ABL_FV_IMG: EDK_TOOLS_BIN
 	@. ./edksetup.sh BaseTools && \
-	build -p $(WORKSPACE)/QcomModulePkg/QcomModulePkg.dsc -a AARCH64 -t $(TARGET_TOOLS) -b $(TARGET) -D ABL_OUT_DIR=$(ANDROID_PRODUCT_OUT) -D VERIFIED_BOOT=$(VERIFIED_BOOT) -D USER_BUILD_VARIANT=$(USER_BUILD_VARIANT) -j build_modulepkg.log $*
+	build -p $(WORKSPACE)/QcomModulePkg/QcomModulePkg.dsc -a AARCH64 -t $(TARGET_TOOLS) -b $(TARGET) -D ABL_OUT_DIR=$(ANDROID_PRODUCT_OUT) -D VERIFIED_BOOT=$(VERIFIED_BOOT) -D VERIFIED_BOOT_2=$(VERIFIED_BOOT_2) -D USER_BUILD_VARIANT=$(USER_BUILD_VARIANT) -j build_modulepkg.log $*
 	cp $(BUILD_ROOT)/FV/FVMAIN_COMPACT.Fv $(ABL_FV_IMG)
 
 ABL_FV_ELF: ABL_FV_IMG