From: Leif Lindholm <leif.lindholm@linaro.org>
To: edk2-devel@lists.01.org
Cc: ard.biesheuvel@linaro.org, Jun Nie <jun.nie@linaro.org>
Subject: [PATCH] EmbeddedPkg: AndroidBootApp: fix clang compilation
Date: Wed, 6 Dec 2017 20:31:30 +0000 [thread overview]
Message-ID: <20171206203130.8219-1-leif.lindholm@linaro.org> (raw)
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>
---
EmbeddedPkg/Include/Protocol/AndroidBootImg.h | 4 ++--
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;
}
--
2.11.0
next reply other threads:[~2017-12-06 20:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-06 20:31 Leif Lindholm [this message]
2017-12-06 20:36 ` [PATCH] EmbeddedPkg: AndroidBootApp: fix clang compilation Ard Biesheuvel
2017-12-06 21:41 ` Leif Lindholm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171206203130.8219-1-leif.lindholm@linaro.org \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox