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


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#43172): https://edk2.groups.io/g/devel/message/43172
Mute This Topic: https://groups.io/mt/32287842/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

On Tue, Jul 02, 2019 at 05:13:40PM +0100, Pete Batard wrote:
> 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 you make a v2, could you break the above line please?

/
    Leif

>    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
> 

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#43215): https://edk2.groups.io/g/devel/message/43215
Mute This Topic: https://groups.io/mt/32287842/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-