From: Alexander Graf <agraf@suse.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/2] efi_loader: Pass fdt address directly to bootefi cmd
Date: Thu, 14 Apr 2016 15:48:20 +0200 [thread overview]
Message-ID: <570F9FA4.8080704@suse.de> (raw)
In-Reply-To: <570ED425.40309@wwwdotorg.org>
On 04/14/2016 01:20 AM, Stephen Warren wrote:
> On 04/13/2016 03:22 PM, Alexander Graf wrote:
>> The bootefi cmd today fetches its device tree pointer from either the
>> location appointed by "fdt addr" with a fallback to the U-Boot control
>> fdt.
>>
>> This integration is unusual for U-Boot and diverges from the way we
>> usually handle parameters to boot commands. So let's pass the fdt
>> directly into the bootefi command instead and move the control fdt
>> logic into the distro boot script.
>
>> diff --git a/cmd/bootefi.c b/cmd/bootefi.c
>
>> @@ -155,13 +154,7 @@ static unsigned long do_bootefi_exec(void *efi)
>> */
>> efi_save_gd();
>>
>> - /* Update system table to point to our currently loaded FDT */
>> -
>> - /* Fall back to included fdt if none was manually loaded */
>> - if (!fdt && gd->fdt_blob)
>> - fdt = (void *)gd->fdt_blob;
>> -
>> - if (fdt) {
>> + if (fdt && !fdt_check_header(fdt)) {
>> /* Prepare fdt for payload */
>> fdt = copy_fdt(fdt);
>>
>> @@ -185,7 +178,7 @@ static unsigned long do_bootefi_exec(void *efi)
>> efi_add_memory_map(fdt_start, fdt_pages,
>> EFI_BOOT_SERVICES_DATA, true);
>> } else {
>> - printf("WARNING: No device tree loaded, expect boot to
>> fail\n");
>> + printf("WARNING: Invalid device tree, expect boot to fail\n");
>
> I'm not familiar with this code, so I'm not really sure what the
> implication of this if/else is.
>
> Still, this looks like it's a move in the right direction. I do agree
> the FDT address parameter likely should be optional, and if not
> specified by the user default to whatever other bootz/booti default
> too (I suspect $fdt_addr_r).
So what bootz/booti do is to either take the 3rd parameter as fdt, have
the fdt included in the image you boot (FIT or legacy combined images)
and when it's loaded, they call
set_working_fdt_addr((ulong)images.ft_addr);
which basically does the same as my previous "fdt addr". But I see no
fallback to $fdt_addr_r. It just doesn't use an fdt if no fdt parameter
/ fit image was provided.
Alex
next prev parent reply other threads:[~2016-04-14 13:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-13 21:22 [U-Boot] [PATCH 1/2] efi_loader: Pass fdt address directly to bootefi cmd Alexander Graf
2016-04-13 21:22 ` [U-Boot] [PATCH 2/2] efi_loader: Fall back to fdtfile naming convention Alexander Graf
2016-04-13 23:24 ` Stephen Warren
2016-04-14 13:53 ` Alexander Graf
2016-04-14 13:43 ` Andreas Färber
2016-04-14 13:46 ` Alexander Graf
2016-04-13 22:26 ` [U-Boot] [PATCH 1/2] efi_loader: Pass fdt address directly to bootefi cmd Andreas Färber
2016-04-13 22:41 ` Alexander Graf
2016-04-13 23:20 ` Stephen Warren
2016-04-14 13:48 ` Alexander Graf [this message]
2016-04-14 15:27 ` Stephen Warren
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-all 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=570F9FA4.8080704@suse.de \
--to=agraf@suse.de \
--cc=u-boot@lists.denx.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.