From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=yoxQD45d; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.208.68, mailfrom: pete@akeo.ie) Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by groups.io with SMTP; Tue, 02 Jul 2019 09:13:57 -0700 Received: by mail-ed1-f68.google.com with SMTP id a14so27820128edv.12 for ; Tue, 02 Jul 2019 09:13:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MCcpadbxNNwoe+q02A6chPAbJEjtDk89VPzvxgHRJpY=; b=yoxQD45d2mnZQpA8j+JXGOPSj4+ZMgIrPxmsIYqlvXw3cjLAtThVBtpzEEMvDZ5oyI nO1HJvpXp5npPKA132rKsq7NA55YgNzOYcQIOuvoIh81GWxaNSI3RMora8OX1Xlaec+f uVUCEVNk4zypTziiiUeGx5ylpgmh1me0x0eOzRZTsUR6B4iCFsiExjp/N2mGK7n/cRcB AVqRmzLRw7lzPL73sJF8RAFnizhN6qu/esvdP3ts+XuZJTl/LKOlaeV+vZ/aRehvfR1r gui6SfeOdnl7smJ/V51GnOwcZvEuDD1z/+KtODQ9Lo6D//kWHwUCu3SNiRwj8mezX2tz ZJMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MCcpadbxNNwoe+q02A6chPAbJEjtDk89VPzvxgHRJpY=; b=EfW2kXi6ATvNE0RqDmpCCTSS9b28YnXZv26Q7GIh3R+71jP5LC/iJM/P1yghxkN7UP 2JjhT6HwhKTzk6QiZdv0QbPqllnBFZ73lorWo+Ex/BnUYRjbZAdRxzuean8m8s83tFHA QiJ+UPyO7UZ2HW+MxjjV0MWxFRffishTSsrJDrvyL4HLGdI7v0wujmWlRWTVb0Tdg+Fo VnOr27KUa1NT07FnecZgNX5GJKUL/llUoff+cGC0v1MQ4tbJ3QKOkUxR1covhzPGZ6IV 38+pQ/voWVn4IY/mgdQ5M1M8JTmxXMvKLrmsaRlM+V4jomt50rtwUyFe5LeU/2vkTn9T FeXw== X-Gm-Message-State: APjAAAUi8LUDA0KRDD1dO9/U0OJWGZ9BffEpvPD4rxXWq5BP4bdXltLw Hhv+46ts4Vg6OYFv6+Q+zrc9yUogilE= X-Google-Smtp-Source: APXvYqx1dj9TnMf4gtvalVf6i62kCeUQzc9pIkFws2lnk0yrgr7aRQVmgWZMlITzmje9Cq3rjRYIGw== X-Received: by 2002:a17:906:4a01:: with SMTP id w1mr29055931eju.291.1562084035338; Tue, 02 Jul 2019 09:13:55 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([84.203.93.8]) by smtp.gmail.com with ESMTPSA id j11sm2355791ejr.69.2019.07.02.09.13.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2019 09:13:54 -0700 (PDT) From: "Pete Batard" 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 Message-Id: <20190702161341.2652-2-pete@akeo.ie> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190702161341.2652-1-pete@akeo.ie> References: <20190702161341.2652-1-pete@akeo.ie> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- 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