From nobody Thu Apr 25 03:43:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+70020+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+70020+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1610086470; cv=none; d=zohomail.com; s=zohoarc; b=jLeLiReVNE6r+u48KKxe6raIZq8AscYZI7yBS8YQVsWCxQNu6gjUnknn4mA6B99RJ+vbP3lND/fUypkES/gIsztdv2nO3AAJ+EHp4ioeqOQjvpOlPvXvsHMgtpxPBmXPxsZ6xLffty+fDGxI4Z4J/iUdZLieFBOumdF7EMesojs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610086470; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=KqoMxBue8Byl+hWCe/m08BIsN0X9mv4VoAXOYV/4fIA=; b=cRG5qOKJzFr8va5faIYk8TT/OUXgIHxSr4YJZPXj1VBx2vOW+olbiPsM8ATAkGKo8mqgUPtkJ/majNMpAR+EUCdYlxzskxkNlWzbpLeNA8LnIclNXPc8AikC1euKCU7ZkqVgXp/pPZENIi5u7cpZIz0Mp+Z0aeBmS5ACRDrlgJw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+70020+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1610086470202589.3656421741091; Thu, 7 Jan 2021 22:14:30 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id XTIvYY1788612xeV0iZmQcj2; Thu, 07 Jan 2021 22:14:29 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.407.1610086464463031734 for ; Thu, 07 Jan 2021 22:14:24 -0800 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1F690D6E; Thu, 7 Jan 2021 22:14:24 -0800 (PST) X-Received: from mammon-tx2.austin.arm.com (mammon-tx2.austin.arm.com [10.118.28.62]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0F2FF3F66E; Thu, 7 Jan 2021 22:14:24 -0800 (PST) From: "Jeremy Linton" To: devel@edk2.groups.io Cc: ard.biesheuvel@arm.com, leif@nuviainc.com, pete@akeo.ie, samer.el-haj-mahmoud@arm.com, awarkentin@vmware.com, Jeremy Linton , Philippe Mathieu-Daude Subject: [edk2-devel] [PATCH v5 7/7] Platform/RaspberryPi: Correct device path removal. Date: Fri, 8 Jan 2021 00:14:11 -0600 Message-Id: <20210108061411.1721734-8-jeremy.linton@arm.com> In-Reply-To: <20210108061411.1721734-1-jeremy.linton@arm.com> References: <20210108061411.1721734-1-jeremy.linton@arm.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,jeremy.linton@arm.com X-Gm-Message-State: qKJHUKir05e6sj2CzjLqL9JXx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1610086469; bh=Bn9vCleWtwdAG4Xcw7j1cBVFBhC0ljkEajjG7jde9MY=; h=Cc:Date:From:Reply-To:Subject:To; b=kYOS8lzvV/X5UWaF8Kj9O4sxTmZGkrnz/kEpVvZms7eO266o9EQY9/77zsiCArZp9PJ TaYXHtG3boELIc06Hdqg85xfPgbzbou+cYxj+zdrKfgjW4deJPLRb7Owc/FWR7oYls7GO s5CZwwewbaQvS/6x7ACekG1B9RJTVhA/iN4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The Arasan driver now works with the eMMC2 device. This means that both the PcdSdIsArasan and the !PcdSdIsArasan result in valid SD controllers on the rpi4. Lets avoid removing the "stale" boot entry, in this case which also has the side effect of avoiding a boot assert when eMMC2 is selected. Signed-off-by: Jeremy Linton Reviewed-by: Andrei Warkentin Reviewed-by: Philippe Mathieu-Daude --- Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm= .c b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c index fa46be7917..c2fc40b8ea 100644 --- a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c +++ b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c @@ -431,7 +431,7 @@ RemoveStaleBootOptions ( EFI_DEVICE_PATH_PROTOCOL *DevicePath =3D BootOptions[Index].FilePath; =20 if (CompareMem (&mArasan, DevicePath, GetDevicePathSize (DevicePath)) = =3D=3D 0) { - if (PcdGet32 (PcdSdIsArasan)) { + if (PcdGet32 (PcdSdIsArasan) || RPI_MODEL =3D=3D 4) { continue; } } else if (CompareMem (&mSDHost, DevicePath, GetDevicePathSize (Device= Path)) =3D=3D 0) { --=20 2.13.7 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#70020): https://edk2.groups.io/g/devel/message/70020 Mute This Topic: https://groups.io/mt/79518689/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-