From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com [40.107.92.60]) by mx.groups.io with SMTP id smtpd.web08.4640.1668513866144985342 for ; Tue, 15 Nov 2022 04:04:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amd.com header.s=selector1 header.b=ftWTlv9L; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.92.60, mailfrom: abdullateef.attar@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BQgZIQNOOtP0PTKvU7bY7scuRRXReVCGE4sBIT3izoyA2xFEhlYcoinHDt+WSMzpsX+8h/drIjKw3qcaJne9bL94mC2LzJrNltguM/ugHmwBAgRLeSsCrGccf3M6WA84ZfQcnZ4Lb+ucBdwGNzkECVkhwIpXgu3oYSiFtrjTlMrNkF7PlSYg7X7yOwnSWyDOjxi41NAYTAvKCVScqkHVwkC6K+SRzA0yzcD7u3EoA3p0/8f7zPhE8WI1rv2HSMzIujou8VNNY5hUyd5X4jpHCxV8raLonEqt0ohVuemh+9pPDd144NLOjADJq1DRmJuIPxM2P5fS5m0+isP6OvaqlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KivrSeQ1GzFwh08CgKfXZck3rDs5WwdfWtiTASqT+yo=; b=beItpMvsm87CpGP5fAIMzQtJ1GwgDF8xk+6ynNOKCOXiXVA1NdMqRNiMwPIj/9agHAFEMHOVzG4rnB13oEbdvEdmOprOPW9lOAtOVieUMYm/hsfuMStEmXVJuI7xN8TR3uum/Zd3llQd9wFF1Oj3PdJYzcJIZ5tWOgeXqHADAQwzaG/FZqRRW6wPtbKYoejopwYZVF/UbhJHVHZ5iwT0L0VnzaTE+c/aMGOFlhZd1ELBKYk9n3Pvs6Tv/x+0EHsCZFOPthd9M9ffG/Sf+ZIV5aeSSgYW3DfXcQ4PhAe0IrrC3vFhCfpskSHIv6SOIzlKJ4OR6gIucO5Wo5faFfEKcQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KivrSeQ1GzFwh08CgKfXZck3rDs5WwdfWtiTASqT+yo=; b=ftWTlv9LNkLeTmTN1zGHjfcTfiTOgjiFGxIWZue5J/7w7J454QFC4Kuy6OEalm/yZS4ZDzUamebOUticEfQ4LrbJXiq+oU3XQDNtKo2aUIWZZcGR+nQXMDVnS+/2e3gthaBisP9nylfECy7LF6MgaJrHqQzgH1Rd5oJyB1DvHTM= Received: from BL1PR13CA0165.namprd13.prod.outlook.com (2603:10b6:208:2bd::20) by SJ1PR12MB6100.namprd12.prod.outlook.com (2603:10b6:a03:45d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.17; Tue, 15 Nov 2022 12:04:24 +0000 Received: from BL02EPF0000C406.namprd05.prod.outlook.com (2603:10b6:208:2bd:cafe::b6) by BL1PR13CA0165.outlook.office365.com (2603:10b6:208:2bd::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.17 via Frontend Transport; Tue, 15 Nov 2022 12:04:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL02EPF0000C406.mail.protection.outlook.com (10.167.241.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5813.11 via Frontend Transport; Tue, 15 Nov 2022 12:04:23 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 15 Nov 2022 06:04:22 -0600 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 15 Nov 2022 04:04:22 -0800 Received: from BLR-PF2HH7H7.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Tue, 15 Nov 2022 06:04:21 -0600 From: Abdul Lateef Attar To: CC: Eric Dong , Liming Gao Subject: [PATCH 2/2] BoardModulePkg: Adds PCD to load UEFI Shell image Date: Tue, 15 Nov 2022 17:34:13 +0530 Message-ID: <63f0705278c15860ceb3873cf397ddaac0b5cf4f.1668512725.git.AbdulLateef.Attar@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Return-Path: AbdulLateef.Attar@amd.com X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0000C406:EE_|SJ1PR12MB6100:EE_ X-MS-Office365-Filtering-Correlation-Id: dca062b2-b967-4f53-7121-08dac7018908 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 74GfmSVKvvFSZ+LQorGpA2lm+UR4KGWzqYIEkB4hF4cbyRHSpuXFamHNSEAIz/7p5dqYRe8wnGOtM28kwnZzItT50Cc1syHezJbcYaD+5aIEG05OfXLSTiOE7lO4HMebo/P8Q40+KM/6rRlNuLXXcu9f9NnB4I02S+sDjp5xZeh1CTsXknZ5ROR3n6zDwUJl6EV5aBVTufAbCKhqff/c7ZAdAWmqEKWp7/SujGV2zo5+urW7wmmzSgTQif5H5GL2tVz6UbyPyslJtxQxY/dO+b4KLYKJNgFomyF57bGIQRAvcHPWjvMgGujxMb2k/9pU5g5Eb1CGRSKMIJlsRTcRPYg4M3m7c8Rd+0CTtlJpYHXdFO7mMpXiCWHWUTOnUSSJeJT4mguUQRTzKU8tdNQpmgxIO1kN6Rp7dBLPEMk2S7Ih4cpF3x9W3o67hS7CXTVwZtWIGoj88mR0T6MkzdR1lPHDcrCXk2uJukhzGLWyzR/Ih6KefTTItCea+gemkLH8cg7gvquYh+B65UJ3f4NoUvDeMbgTlRcUmEE75+AdYnamkTanfYjyqo4XBzpL/cou1uDK8yMjG81BMATKFfYd1vIULQnduELtxHNkqZduBt9NdVMYxDHXMJv34zrFF4bOXkRC8YkDdBSltD505z+Od7I3OO5Z5tH+6t/c1+ih5IXNokilECF5JK9WVFBKZmZ6/aTxbfEFSOEoSZmzwwYBJ8u5gH+U6lYkt+J7mNZrQr5iOskAlRjE8JGZmvSl+z9bQGrbQ4AgoZivQjb0I2xCQaRpq6WdP6e+yeM9RCMvpPU= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(376002)(136003)(39860400002)(396003)(346002)(451199015)(46966006)(36840700001)(40470700004)(82740400003)(82310400005)(8936002)(356005)(81166007)(86362001)(41300700001)(40480700001)(5660300002)(4326008)(6666004)(316002)(70206006)(70586007)(8676002)(6916009)(54906003)(426003)(47076005)(336012)(186003)(36860700001)(40460700003)(83380400001)(478600001)(2906002)(2616005)(26005)(7696005)(36756003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2022 12:04:23.3804 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dca062b2-b967-4f53-7121-08dac7018908 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0000C406.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6100 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain defines two PCDs, PcdShellFile and PcdShellFileDesc, which holds the GUID and description of the UEFI shell file to be loaded. A PCDs based solution gives flexibility to the user to load different images, by just overriding the DSC file. The user can load a diagnostic image or test image during PCDBootToShellOnly or later stages. Cc: Eric Dong Cc: Liming Gao Signed-off-by: Abdul Lateef Attar --- Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec | 5 +++++ .../Library/BoardBdsHookLib/BoardBdsHookLib.inf | 3 +++ .../Library/BoardBdsHookLib/BoardBootOption.c | 8 +++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec b/Platform/In= tel/MinPlatformPkg/MinPlatformPkg.dec index 2953e9527224..73cbd62be030 100644 --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec @@ -7,6 +7,7 @@ # for the build infrastructure.=0D #=0D # Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved.
=0D +# Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved.
= =0D #=0D # SPDX-License-Identifier: BSD-2-Clause-Patent=0D #=0D @@ -266,6 +267,10 @@ [PcdsFixedAtBuild, PcdsPatchableInModule] gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspUSize|0x00000000|UINT32|0x200= 0002B=0D gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspUOffset|0x00000000|UINT32|0x2= 000002C=0D =0D + # GUID of Shell file to be loaded, default value is gUefiShellFileGuid d= efine in ShellPkg.dec=0D + gMinPlatformPkgTokenSpaceGuid.PcdShellFile|{GUID({0x7c04a583, 0x9e3e, 0x= 4f1c, {0xad, 0x65, 0xe0, 0x52, 0x68, 0xd0, 0xb4, 0xd1}})}|VOID*|0x20000230= =0D + gMinPlatformPkgTokenSpaceGuid.PcdShellFileDesc|L"Internal UEFI Shell 2.0= "|VOID*|0x20000231=0D +=0D [PcdsDynamic, PcdsDynamicEx]=0D gMinPlatformPkgTokenSpaceGuid.PcdPcIoApicEnable|0x0|UINT32|0x90000019=0D gMinPlatformPkgTokenSpaceGuid.PcdAcpiSleepControlRegisterAddressSpaceId|= 0x00|UINT8|0x0001004B=0D diff --git a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBds= HookLib.inf b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBd= sHookLib.inf index 69f3fcb55222..e2ac73498b90 100644 --- a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib= .inf +++ b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib= .inf @@ -2,6 +2,7 @@ # Module Information file for the Bds Hook Library.=0D #=0D # Copyright (c) 2019, Intel Corporation. All rights reserved.
=0D +# Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved.
= =0D #=0D # SPDX-License-Identifier: BSD-2-Clause-Patent=0D #=0D @@ -59,6 +60,8 @@ [Pcd] gMinPlatformPkgTokenSpaceGuid.PcdTrustedConsoleInputDevicePath ## CON= SUMES=0D gMinPlatformPkgTokenSpaceGuid.PcdTrustedConsoleOutputDevicePath ## CON= SUMES=0D gMinPlatformPkgTokenSpaceGuid.PcdTrustedStorageDevicePath ## CON= SUMES=0D + gMinPlatformPkgTokenSpaceGuid.PcdShellFile ## CON= SUMES=0D + gMinPlatformPkgTokenSpaceGuid.PcdShellFileDesc ## CON= SUMES=0D =0D [Sources]=0D BoardBdsHook.h=0D diff --git a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBoo= tOption.c b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBoot= Option.c index dec3ce93ef71..de1676dad0c7 100644 --- a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption= .c +++ b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption= .c @@ -2,6 +2,8 @@ Driver for Platform Boot Options support.=0D =0D Copyright (c) 2019, Intel Corporation. All rights reserved.
=0D +Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved.
=0D +=0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D =0D **/=0D @@ -335,7 +337,6 @@ PlatformBootManagerWaitCallback ( =0D EFI_GUID gUefiShellFileGuid =3D { 0x7C04A583, 0x9E3E, 0x4f1c, { 0xAD, 0x65= , 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } };=0D =0D -#define INTERNAL_UEFI_SHELL_NAME L"Internal UEFI Shell 2.0"=0D #define UEFI_HARD_DRIVE_NAME L"UEFI Hard Drive"=0D =0D /**=0D @@ -352,7 +353,8 @@ RegisterDefaultBootOption ( =0D ShellData =3D NULL;=0D ShellDataSize =3D 0;=0D - RegisterFvBootOption (&gUefiShellFileGuid, INTERNAL_UEFI_SHELL_NA= ME, (UINTN) -1, LOAD_OPTION_ACTIVE, (UINT8 *)ShellData, ShellDataSize);=0D + CopyMem (&gUefiShellFileGuid, PcdGetPtr (PcdShellFile), sizeof (GUID))= ;=0D + RegisterFvBootOption (&gUefiShellFileGuid, (CHAR16 *) PcdGetPtr (PcdSh= ellFileDesc), (UINTN) -1, LOAD_OPTION_ACTIVE, (UINT8 *)ShellData, ShellData= Size);=0D =0D //=0D // Boot Menu=0D @@ -557,7 +559,7 @@ BootOptionPriority ( return 6;=0D =0D }=0D - if (StrCmp (BootOption->Description, INTERNAL_UEFI_SHELL_NAME) =3D=3D = 0) {=0D + if (StrCmp (BootOption->Description, (CHAR16 *) PcdGetPtr (PcdShellFil= eDesc)) =3D=3D 0) {=0D if (PcdGetBool (PcdBootToShellOnly)) {=0D return 0;=0D }=0D --=20 2.25.1