summaryrefslogtreecommitdiff
path: root/Platform
diff options
context:
space:
mode:
authorPete Batard <pete@akeo.ie>2019-07-04 17:51:19 +0100
committerLeif Lindholm <leif.lindholm@linaro.org>2019-07-19 12:34:07 +0100
commitef3512a5332455dfc20fd32435b620fd59079e75 (patch)
tree9c1a9e71f0ad474e716861ea5f8d02699d0185e1 /Platform
parente80b3f804cae694349172ce46a36664afdd3bcf4 (diff)
Platform/RPi3: Set the boot option of UEFI Shell as non-active
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> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Diffstat (limited to 'Platform')
-rw-r--r--Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c3
-rw-r--r--Platform/RaspberryPi/RPi3/Readme.md6
2 files changed, 5 insertions, 4 deletions
diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
index 92f3b614..12c3829d 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
@@ -460,7 +460,8 @@ 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 7434233d..624f3a8d 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).