public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Jeff Brasen" <jbrasen@nvidia.com>
To: <devel@edk2.groups.io>
Cc: <daniel.schaefer@hpe.com>, <abner.chang@hpe.com>,
	<ardb+tianocore@kernel.org>, <leif@nuviainc.com>,
	Jeff Brasen <jbrasen@nvidia.com>
Subject: [PATCH v3 3/4] EmbeddedPkg: Install FDT if UpdateDtb is not present
Date: Mon, 13 Sep 2021 23:18:50 +0000	[thread overview]
Message-ID: <526fa9e66249647ee98ca58946168a912eb755dd.1631574815.git.jbrasen@nvidia.com> (raw)
In-Reply-To: <cover.1631574815.git.jbrasen@nvidia.com>

Currently if mAndroidBootImg->UpdateDtb is not supported on the platform
the device tree updates of the initrd are not made.

Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
---
 .../Library/AndroidBootImgLib/AndroidBootImgLib.c     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
index 324933013d91..4f8ff5b261ca 100644
--- a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
+++ b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
@@ -349,12 +349,13 @@ AndroidBootImgUpdateFdt (
     if (EFI_ERROR (Status)) {
       goto Fdt_Exit;
     }
-
-    Status = gBS->InstallConfigurationTable (
-                    &gFdtTableGuid,
-                    (VOID *)(UINTN)NewFdtBase
-                    );
+  } else {
+    NewFdtBase = UpdatedFdtBase;
   }
+  Status = gBS->InstallConfigurationTable (
+                  &gFdtTableGuid,
+                  (VOID *)(UINTN)NewFdtBase
+                  );
 
   if (!EFI_ERROR (Status)) {
     return EFI_SUCCESS;
-- 
2.17.1


  parent reply	other threads:[~2021-09-13 23:19 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-13 23:18 [PATCH v3 0/4] AndroidBootImgLib improvements Jeff Brasen
2021-09-13 23:18 ` [PATCH v3 1/4] EmbeddedPkg: Remove duplicate libfdt.h include Jeff Brasen
2021-09-13 23:18 ` [PATCH v3 2/4] EmbeddedPkg: AndroidBootImgBoot error handling updates Jeff Brasen
2021-09-13 23:18 ` Jeff Brasen [this message]
2021-09-13 23:18 ` [PATCH v3 4/4] EmbeddedPkg: Add LoadFile2 for linux initrd Jeff Brasen
2021-09-14 15:00 ` [PATCH v3 0/4] AndroidBootImgLib improvements Leif Lindholm
2021-09-14 16:57   ` Jeff Brasen
2021-09-21 16:32     ` Jeff Brasen
2021-09-22  2:15       ` Jun Nie
2021-09-23 11:06       ` Leif Lindholm
2021-09-23 15:20         ` Jeff Brasen
2021-09-23 18:38           ` 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=526fa9e66249647ee98ca58946168a912eb755dd.1631574815.git.jbrasen@nvidia.com \
    --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