public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Pete Batard" <pete@akeo.ie>
To: devel@edk2.groups.io
Cc: ard.biesheuvel@linaro.org, leif.lindholm@linaro.org
Subject: [edk2-platforms: PATCH 1/2] Platform/RPi3: Set the boot option of UEFI Shell as non-active
Date: Tue,  2 Jul 2019 17:13:40 +0100	[thread overview]
Message-ID: <20190702161341.2652-2-pete@akeo.ie> (raw)
In-Reply-To: <20190702161341.2652-1-pete@akeo.ie>

This makes boot from SD/USB the default, which is what most users
should expect. Pressing F1 at boot still boots to UEFI Shell.

Signed-off-by: Pete Batard <pete@akeo.ie>
---
 Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c | 2 +-
 Platform/RaspberryPi/RPi3/Readme.md                                   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
index 92f3b6146dd7..e7757115d82c 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
@@ -460,7 +460,7 @@ PlatformRegisterOptionsAndKeys (
 
   RemoveStaleBootOptions ();
 
-  ShellOption = PlatformRegisterFvBootOption (&gUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_ACTIVE);
+  ShellOption = PlatformRegisterFvBootOption (&gUefiShellFileGuid, L"UEFI Shell", LOAD_OPTION_CATEGORY_APP);
   if (ShellOption != -1) {
     //
     // F1 boots Shell.
diff --git a/Platform/RaspberryPi/RPi3/Readme.md b/Platform/RaspberryPi/RPi3/Readme.md
index 7434233df0fb..624f3a8d287a 100644
--- a/Platform/RaspberryPi/RPi3/Readme.md
+++ b/Platform/RaspberryPi/RPi3/Readme.md
@@ -26,9 +26,9 @@ It also provides support for ATF ([Arm Trusted Platform](https://github.com/ARM-
 HDMI and the mini-UART serial port can be used for output devices, with mirrored output.
 USB keyboards and the mini-UART serial port can be used as input.
 
-On a freshly built firmware, the default is to boot the UEFI shell.
-To change the default boot order (for instance to boot uSD media by default) you
-will need to edit the preferences in _Boot Maintenance Manager_.
+The default for the firmware is to first attempt boot from SD then USB. The UEFI
+Shell can also be accessed by pressing F1. To change the boot order you can edit
+the preferences in the _Boot Maintenance Manager_ menu.
 
 For additional information about the tested systems and how to set them up,
 please see [Systems.md](./Systems.md).
-- 
2.21.0.windows.1


  reply	other threads:[~2019-07-02 16:13 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-02 16:13 [edk2-platforms: PATCH 0/2] Platform/RPi3 improve boot order and add custom freqs Pete Batard
2019-07-02 16:13 ` Pete Batard [this message]
2019-07-03 11:43   ` [edk2-platforms: PATCH 1/2] Platform/RPi3: Set the boot option of UEFI Shell as non-active Leif Lindholm
2019-07-02 16:13 ` [edk2-platforms: PATCH 2/2] Platform/Rpi3: Add custom CPU frequency support Pete Batard
2019-07-03 11:42   ` Leif Lindholm
2019-07-03 12:09     ` Pete Batard

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=20190702161341.2652-2-pete@akeo.ie \
    --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