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=HRbtQpOk; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.208.67, mailfrom: pete@akeo.ie) Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by groups.io with SMTP; Thu, 04 Jul 2019 09:51:36 -0700 Received: by mail-ed1-f67.google.com with SMTP id e3so5931248edr.10 for ; Thu, 04 Jul 2019 09:51:36 -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=Ra9LwFllz/+qekNmH5JJLR7zVtHuAbSkIp2+B9lcMWY=; b=HRbtQpOkA6RyULqwU4SudKMAklBNJh8oVKopgusQCn5jOJku+p2kELja2KT50b4nVs O8CQvWnFxkb7Q9Gq9v6lFEWzf1WYNLz7g68FV5X0rxDcn9blZZinf0uSifEc9/8MbXB8 p7DO1X1yjZ72BdhYsTA2fqo5iTSE8epQlJw40qtPM3/zPXx72ZMDV7YUQeOR0i41ERhl Jdrhw9pbL9V7CTH0cEiH54X74hhGFdMRf6qTt2AAVOYm0PUhUKmvUm5/6ZOnWfygYilp jP2cRcdNlXzL6QQIy1FNAaUgTIiUmdeVdn8D7fQ3pZ5lHa2twVwbkKisEMY6mOKww1+I Pq7g== 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=Ra9LwFllz/+qekNmH5JJLR7zVtHuAbSkIp2+B9lcMWY=; b=gaBE1SjpWFaHsgwO12dMWlbhru8FL8tD0eEQK6140snhpngQF94QhPMn7tRdpH488I JnDICY/IPwQKpYZLi/yVoq24e0NBhY/rTAnv5xefti7rJGU8shKrRgYtspL6ExiJFS5K L70bU/YsY1UlELo34R/WMyMo4lpbQcM8gAa9WCVttAqP5bRa2HTkJ15mozQrUnKoOxl/ SDyZ1jwn7Yli6eWju7WgcWQmvLf3uzu1jPra9yupSoiNUTE8sFb8EvZ/JelmQNMheHZL RuN3RjuSfEv/YQKJeQ66AMQwSt8u0jZHG+f0zsuMf0makXNoPR3m1fsXu6l9Qr8e5yJt Nu6g== X-Gm-Message-State: APjAAAVuP0F/EKeEZqnRstxQnQi/+bOrPiBgnVIEsIb4kkAaqCmVgEuI FKogLJYQyg+o28aECseH4jP3302sc90= X-Google-Smtp-Source: APXvYqzzed6M7tX/1ObR6UGooBCdX97LFYzU3GQLA5BHoRwi2PElleCCN14ipwxDWhg4/mDBNC5KyA== X-Received: by 2002:a17:906:bb11:: with SMTP id jz17mr40655635ejb.185.1562259094448; Thu, 04 Jul 2019 09:51:34 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([84.203.93.8]) by smtp.gmail.com with ESMTPSA id i18sm1838063ede.65.2019.07.04.09.51.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jul 2019 09:51:33 -0700 (PDT) From: "Pete Batard" To: devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org, leif.lindholm@linaro.org Subject: [edk2-platforms: PATCH v2 1/2] Platform/RPi3: Set the boot option of UEFI Shell as non-active Date: Thu, 4 Jul 2019 17:51:19 +0100 Message-Id: <20190704165120.8800-2-pete@akeo.ie> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190704165120.8800-1-pete@akeo.ie> References: <20190704165120.8800-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 | 3 ++- Platform/RaspberryPi/RPi3/Readme.md | 6 +++--- 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 92f3b6146dd7..12c3829d28f5 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 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