commit 7982467bdf2360d438febba6807ecd7ce7e1221b
author Linux Build Service Account <lnxbuild@localhost> Thu Apr 05 13:51:18 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Apr 05 13:51:18 2018 -0700
tree b812bbba7f504824faea2643f1a7026998808c7b
parent f40ed4ad8c6adb2a5f818320cb5f9d49112d4f19
parent 818a976ae5787b968aa488058e741d6e234ce64e

Merge "QcomModulePkg: Updates verity mode as enforcing while flashing system image"

QcomModulePkg/Library/BootLib/LocateDeviceTree.c

diff --git a/QcomModulePkg/Library/BootLib/LocateDeviceTree.c b/QcomModulePkg/Library/BootLib/LocateDeviceTree.c
index 42ba162..952d016 100644
--- a/QcomModulePkg/Library/BootLib/LocateDeviceTree.c
+++ b/QcomModulePkg/Library/BootLib/LocateDeviceTree.c
@@ -613,8 +613,7 @@
                                        INT32 MinPlatIdLen)
 {
 
-  if (CurDtbInfo == NULL ||
-      PlatProp == NULL) {
+  if (CurDtbInfo == NULL) {
     DEBUG ((EFI_D_VERBOSE, "Input parameters null\n"));
     return EFI_INVALID_PARAMETER;
   }
@@ -676,8 +675,7 @@
                                     CONST CHAR8 *BoardProp,
                                     INT32 LenBoardId)
 {
-  if (CurDtbInfo == NULL ||
-      BoardProp == NULL) {
+  if (CurDtbInfo == NULL) {
     DEBUG ((EFI_D_VERBOSE, "Input parameters null\n"));
     return EFI_INVALID_PARAMETER;
   }

QcomModulePkg/Library/FastbootLib/FastbootCmds.c

diff --git a/QcomModulePkg/Library/FastbootLib/FastbootCmds.c b/QcomModulePkg/Library/FastbootLib/FastbootCmds.c
index 0d23186..b9d6dbd 100644
--- a/QcomModulePkg/Library/FastbootLib/FastbootCmds.c
+++ b/QcomModulePkg/Library/FastbootLib/FastbootCmds.c
@@ -1605,11 +1605,10 @@
       if (Status == EFI_SUCCESS) {
         FastbootOkay ("");
         goto out;
-      } else {
-        FastbootFail ("Error Updating partition Table\n");
-        goto out;
       }
     }
+    FastbootFail ("Error Updating partition Table\n");
+    goto out;
   }
 
   sparse_header = (sparse_header_t *)mFlashDataBuffer;

makefile

diff --git a/makefile b/makefile
index 1a09f4c..d36115f 100644
--- a/makefile
+++ b/makefile
@@ -43,14 +43,18 @@
 	UBSAN_GCC_FLAG_ALIGNMENT :=
 endif
 
-ifeq ($(ENABLE_LE_VARIANT), true)
-	ENABLE_LE_VARIANT := 1
+ifeq ($(TARGET_ARCHITECTURE), arm)
 	LOAD_ADDRESS := 0X8FB00000
 else
-	ENABLE_LE_VARIANT := 0
 	LOAD_ADDRESS := 0X9FA00000
 endif
 
+ifeq ($(ENABLE_LE_VARIANT), true)
+	ENABLE_LE_VARIANT := 1
+else
+	ENABLE_LE_VARIANT := 0
+endif
+
 .PHONY: all cleanall
 
 all: ABL_FV_ELF