From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::243; helo=mail-wr0-x243.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 95A792217CE28 for ; Wed, 6 Dec 2017 12:27:02 -0800 (PST) Received: by mail-wr0-x243.google.com with SMTP id l22so5221019wrc.11 for ; Wed, 06 Dec 2017 12:31:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=dKST8WWlzo1lxxMcxHcw1q8pnl/rmbxc5xwcDqYi5Xw=; b=jChXovONlB7GYIZrnRYkddSeGmj/rAEpp3wIKZhbOss+Z9LVEvnMoi46d0Opl1KsV3 aOSu5Rl8DlT4o1sCrpRfwLMbZd66WY/kG4PKquKymSL1bve6aHKCFwGHKVKq8NrcFCru xvPSOSF+pvRsN44Mnm2K4oKXBovQgOyO8P1bI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=dKST8WWlzo1lxxMcxHcw1q8pnl/rmbxc5xwcDqYi5Xw=; b=ZvauQytLJ7ehcyrdc4KuFTipU1hyqMEve0P6IC6I4RizKeDdxfIHSDNn+qitUpdG0K ccJssvjS+30nx3CtiZ2fZ/xoCseXl90nth2UEOTMJyHFe/kz6JAWqfl0CqI4wFCwt4ms YUPSF+k31KC+5btC4sBYYGPP8e+TXNz7uZ5Zc/oq+VNn8DjN1+sDL1u17x06AbTtpeI5 8phXC4IZVSIVolIKLltKwEbEb32hBtrTG6PM2XgARL0NAVhw++O4/ISCRO5XMRiv7Xah WKyhKXvhDXQ9YqpV1Ao6TOFIWWsXui8vtnMJlBdupKNL4EQ8FNLJtANGYRnpzIWsQWHS uUGA== X-Gm-Message-State: AJaThX4Xr5pRTkUIuVODocEctBnUUAjiSte6/s6y1PnW1m8SbH1f/iRu 28IvyL/zkzkC09aGlhd+fTL+J1Hq7Dw= X-Google-Smtp-Source: AGs4zMaAeIDnvZMpFy6uGkzA1afrcDKs3NZHZcXLhrXtixHtISGKairGYR3tbiqaSxs0GXHIzaVEhw== X-Received: by 10.223.174.211 with SMTP id y77mr20281444wrc.196.1512592292658; Wed, 06 Dec 2017 12:31:32 -0800 (PST) Received: from vanye.hemma.eciton.net (cpc92316-cmbg19-2-0-cust118.5-4.cable.virginm.net. [82.12.0.119]) by smtp.gmail.com with ESMTPSA id x75sm4009085wme.44.2017.12.06.12.31.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Dec 2017 12:31:31 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.01.org Cc: ard.biesheuvel@linaro.org, Jun Nie Date: Wed, 6 Dec 2017 20:31:30 +0000 Message-Id: <20171206203130.8219-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 Subject: [PATCH] EmbeddedPkg: AndroidBootApp: fix clang compilation X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2017 20:27:03 -0000 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 --- 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