diff options
| author | Leif Lindholm <leif.lindholm@linaro.org> | 2017-12-06 17:29:26 +0000 |
|---|---|---|
| committer | Leif Lindholm <leif.lindholm@linaro.org> | 2017-12-06 21:39:51 +0000 |
| commit | ac811846f2db75335be74878a323d5602d595d79 (patch) | |
| tree | 9585f4bd1433bf461ef0d5f8adb3aa65729f3181 /EmbeddedPkg | |
| parent | 80ee06cee70cec00a4674964c477f99e128e21e6 (diff) | |
| download | edk2-ac811846f2db75335be74878a323d5602d595d79.tar.gz edk2-ac811846f2db75335be74878a323d5602d595d79.tar.bz2 edk2-ac811846f2db75335be74878a323d5602d595d79.zip | |
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>
Diffstat (limited to 'EmbeddedPkg')
| -rw-r--r-- | EmbeddedPkg/Include/Protocol/AndroidBootImg.h | 4 | ||||
| -rw-r--r-- | EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/EmbeddedPkg/Include/Protocol/AndroidBootImg.h b/EmbeddedPkg/Include/Protocol/AndroidBootImg.h index 1c458d0255..cd3c42e858 100644 --- a/EmbeddedPkg/Include/Protocol/AndroidBootImg.h +++ b/EmbeddedPkg/Include/Protocol/AndroidBootImg.h @@ -33,8 +33,8 @@ EFI_STATUS typedef
EFI_STATUS
(EFIAPI *ANDROID_BOOTIMG_UPDATE_DTB) (
- IN EFI_PHYSICAL_ADDRESS OrigDtbBase;
- OUT EFI_PHYSICAL_ADDRESS *NewDtbBase;
+ IN EFI_PHYSICAL_ADDRESS OrigDtbBase,
+ OUT EFI_PHYSICAL_ADDRESS *NewDtbBase
);
struct _ANDROID_BOOTIMG_PROTOCOL {
diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c index 09c4d924f1..2e50cedf6a 100644 --- a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c +++ b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c @@ -357,12 +357,13 @@ AndroidBootImgUpdateFdt ( if (EFI_ERROR (Status)) {
goto Fdt_Exit;
}
+
+ Status = gBS->InstallConfigurationTable (
+ &gFdtTableGuid,
+ (VOID *)(UINTN)NewFdtBase
+ );
}
- Status = gBS->InstallConfigurationTable (
- &gFdtTableGuid,
- (VOID *)(UINTN)NewFdtBase
- );
if (!EFI_ERROR (Status)) {
return EFI_SUCCESS;
}
|