EmbeddedPkg: AndroidBootApp: fix clang compilation

Address an incorrect function prototype (using ; instead of ,)
in AndroidBootImg.h.

Also restructure code slightly to avoid a "may be used uninitialized"
warning.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

diff --git a/EmbeddedPkg/Include/Protocol/AndroidBootImg.h b/EmbeddedPkg/Include/Protocol/AndroidBootImg.h
index 1c458d0255a7a12a96cf8746e932daf8f7843d69..cd3c42e85816ee4636d80743b6e7aa4e8ee1d8b2 100644 (file)
--- a/EmbeddedPkg/Include/Protocol/AndroidBootImg.h
+++ b/EmbeddedPkg/Include/Protocol/AndroidBootImg.h
@@ -33,8 +33,8 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *ANDROID_BOOTIMG_UPDATE_DTB) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *ANDROID_BOOTIMG_UPDATE_DTB) (\r

-  IN  EFI_PHYSICAL_ADDRESS    OrigDtbBase;\r
-  OUT EFI_PHYSICAL_ADDRESS   *NewDtbBase;\r
+  IN  EFI_PHYSICAL_ADDRESS    OrigDtbBase,\r
+  OUT EFI_PHYSICAL_ADDRESS   *NewDtbBase\r

   );\r
 \r
 struct _ANDROID_BOOTIMG_PROTOCOL {\r
   );\r
 \r
 struct _ANDROID_BOOTIMG_PROTOCOL {\r

diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
index 09c4d924f10f6b8afbcae0322388c56690e44539..2e50cedf6a445bd9cb8dee837e1c82908e6a4714 100644 (file)
--- a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
+++ b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
@@ -357,12 +357,13 @@ AndroidBootImgUpdateFdt (
     if (EFI_ERROR (Status)) {\r
       goto Fdt_Exit;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       goto Fdt_Exit;\r
     }\r

+\r
+    Status = gBS->InstallConfigurationTable (\r
+                    &gFdtTableGuid,\r
+                    (VOID *)(UINTN)NewFdtBase\r
+                    );\r

   }\r
 \r
   }\r
 \r

-  Status = gBS->InstallConfigurationTable (\r
-                  &gFdtTableGuid,\r
-                  (VOID *)(UINTN)NewFdtBase\r
-                  );\r

   if (!EFI_ERROR (Status)) {\r
     return EFI_SUCCESS;\r
   }\r
   if (!EFI_ERROR (Status)) {\r
     return EFI_SUCCESS;\r
   }\r