From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id D42CD7803CD for ; Tue, 28 May 2024 03:28:22 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=YJSu05MfiuiU3TVWFfmm+gxkMNRL+RGF+PQN2KDe4og=; c=relaxed/simple; d=groups.io; h=Received-SPF:From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Received-SPF:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20240206; t=1716866902; v=1; b=Y6VX2ZEtlgfXRE1M7U0d5mOI6Ay9o27vISUv+UEhF01GjO92Xu0Ce8TB5pYIwPxhacD6qKbY 5NfEcPzsK8QGsp8+c1djIw4nxe5DP2QoZJ3bB1X0cnhabRfM7BghFZzveg/WrYnfHYUSN+JZ9PW Gx4lJexCeK4NUllJ3tgJg74q5DK8Oldzm2i4+dPTtoD6rYDoviA6GphmOFQPw+jvG6VyUaJxI/n NKjAeww+BXdL0It04q3+q2g2HkXponY4DTHEHzz0DolSyEOm6UNq1/13ozCsDStGUE2u6EqBOOu xEG9e0MfDBikmOpC5A6kdhM9ghn78nyneVnO9RavTPYJQ== X-Received: by 127.0.0.2 with SMTP id PPJCYY7687511xDakNVDIvVQ; Mon, 27 May 2024 20:28:21 -0700 X-Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.56]) by mx.groups.io with SMTP id smtpd.web10.14010.1716866900719102805 for ; Mon, 27 May 2024 20:28:20 -0700 X-Received: from DM6PR10CA0016.namprd10.prod.outlook.com (2603:10b6:5:60::29) by DS0PR12MB8528.namprd12.prod.outlook.com (2603:10b6:8:160::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.29; Tue, 28 May 2024 03:28:18 +0000 X-Received: from CH2PEPF00000140.namprd02.prod.outlook.com (2603:10b6:5:60:cafe::65) by DM6PR10CA0016.outlook.office365.com (2603:10b6:5:60::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.30 via Frontend Transport; Tue, 28 May 2024 03:28:18 +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=SATLEXMB03.amd.com; pr=C X-Received: from SATLEXMB03.amd.com (165.204.84.17) by CH2PEPF00000140.mail.protection.outlook.com (10.167.244.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7633.15 via Frontend Transport; Tue, 28 May 2024 03:28:18 +0000 X-Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 27 May 2024 22:28:16 -0500 X-Received: from BLR-LAB-SFW01.amd.com (10.180.168.240) 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.2507.35 via Frontend Transport; Mon, 27 May 2024 22:28:15 -0500 From: "Abdul Lateef Attar via groups.io" To: CC: Abdul Lateef Attar , Paul Grimes , Abner Chang Subject: [edk2-devel] [edk2-platform 1/2] AmdPlatformPkg: Corrects file path of LogoDxe driver Date: Tue, 28 May 2024 08:58:01 +0530 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Received-SPF: None (SATLEXMB03.amd.com: AbdulLateef.Attar@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF00000140:EE_|DS0PR12MB8528:EE_ X-MS-Office365-Filtering-Correlation-Id: 2c404d67-85be-407f-b89b-08dc7ec63796 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?5+C9hlN0lBVlMNyMAbTSYVEfnpjVs79Mj5AY3S9Htjk39B5GiO1cqeZUj8Dy?= =?us-ascii?Q?vKd1+AfU8zTKN8FZbFumj6RrZJ4xQfAUbmHcL5dkOOrOwcHS/xDedT7uGgrN?= =?us-ascii?Q?uQ4q7fpYNn5pmeYXlmpmW05mSKlTUW0UQDSerHzMMWMVSIQ6DQ4OPPV+DL/g?= =?us-ascii?Q?aBQG2nL+NnRPUwrBdccZdAa05gK9NJvaVqeV79P5CwsrO+Ztp04Yls7EK8av?= =?us-ascii?Q?MvM+DeRPLVNm0NpyvWUPil5+J0UQEASRF9M04FoW5ZOiRXdEG5rHrbMaMrTA?= =?us-ascii?Q?Z/bjfiOUVd8qeQU1m8McB0tGGb5POfitzP+Ee1qHpHZBCHOzn+v72wJyC02x?= =?us-ascii?Q?kJxkdeHgRzz+tdlatn+Z8m1GhgxcgtpXpwqviiVq7VC9VZO7KocIv5I+fOZZ?= =?us-ascii?Q?I/hxBujJO4xeOdBRF0s+T2vuSshL8OdcBJMwyAXEO4UMSzcCnTRxArnV+Rdd?= =?us-ascii?Q?PdE7vzK+SKdutf82Z0RtO59nh4hAStE04lR0feip/W60k1/zw8jYe/o5Z2Fu?= =?us-ascii?Q?KA5HSflRZrN/ea9vxgTNL9W2ZOr0+cka19vyW00MrQ3g6RfFGBhjnV7maapq?= =?us-ascii?Q?xfDSltWaxM3UfKAvdLsJbUK7FLAwiHMChUUfkg+0ivOBhV1TZU3qqRb12UL1?= =?us-ascii?Q?Xv8BNfEPiFYhyWWUJvSoDJNncmCyVyx9yslB9rZaJrcBvzzVy2vhcY20cSE6?= =?us-ascii?Q?nOtMgDSoF+S0sC8OP0cUDpWkO4HxTrnDo0ocAvn0c/43yKLhYFpRuzh4xxO2?= =?us-ascii?Q?mEtTxGcW3JA3HFdpOcrkASLN9FxT/HSOVuRJOMXPbgSVTP9+qx7fWBmALYa1?= =?us-ascii?Q?OnbI3lXXmRL7AXmCtUrwiGEwj8wiIPd8ztbhJmDrZoBstO/+iNu1+bYDowp/?= =?us-ascii?Q?tb2vPyeAExv39gKCuvwC2eJM7aZuxuRzoL7QjUel8KoWCCXdhF6/RHbOVjDC?= =?us-ascii?Q?XyeZ/Vvl7ogXF7QKaZK/wBnToXJxdzI7YouUnzK6g7j1bwbGHKVFqHzOq4k0?= =?us-ascii?Q?7jdxSqVEsQnfC7/sJ0/NNLCbKEJQC0wjWCnmTXEpu+TjP2VoM0p+FrsfSllf?= =?us-ascii?Q?B3vbfSs6o2GpHYCtIkBzv12RXKyl6wMPA9Gw1xhM1C6LvbCBr6yB2ZE1OjHm?= =?us-ascii?Q?RXW4SwsB1q3c/S9AV+NYjRvtZ0p5liX77Tv6mXxKNs5lbeXMWUyz6L3Fhgy4?= =?us-ascii?Q?8eZ3Q0Ik5mdMlnL6gYEejxpCMh3L2+wLitbcnoer90607Ik33GbvVBgBtyMN?= =?us-ascii?Q?V+VgyZh49kPuinWjwxDzwp7TE+s0QwKn9Npx8Yagy1OT5RYvFowwnBFORPkV?= =?us-ascii?Q?o0tgb4+Li6jGGM7v1+5duoeXv7/qxd1PCZlMn5PAOIg7Ww7Mfxo6WL3hz4ad?= =?us-ascii?Q?fXI0olfi+X4HjkUWlfP6eiZDyzV8?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 03:28:18.0391 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2c404d67-85be-407f-b89b-08dc7ec63796 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=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH2PEPF00000140.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8528 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Mon, 27 May 2024 20:28:20 -0700 Resent-From: AbdulLateef.Attar@amd.com Reply-To: devel@edk2.groups.io,AbdulLateef.Attar@amd.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: EsWZunUf22fmYvSoo9Z6ViwDx7686176AA= Content-Transfer-Encoding: quoted-printable Content-Type: text/plain X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=Y6VX2ZEt; dmarc=pass (policy=none) header.from=groups.io; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io Removes extra directory. Cc: Paul Grimes Cc: Abner Chang Signed-off-by: Abdul Lateef Attar --- .../LogoDxe/{LogoDxe =3D> }/JpegLogo.idf | 0 .../LogoDxe/{LogoDxe =3D> }/JpegLogoDxe.inf | 0 .../Universal/LogoDxe/{LogoDxe =3D> }/Logo.bmp | Bin .../AmdPlatformPkg/Universal/LogoDxe/Logo.c | 392 +++++++++--------- .../Universal/LogoDxe/{LogoDxe =3D> }/Logo.h | 0 .../Universal/LogoDxe/{LogoDxe =3D> }/Logo.idf | 0 .../Universal/LogoDxe/{LogoDxe =3D> }/Logo.jpg | Bin .../LogoDxe/{LogoDxe =3D> }/LogoDxe.inf | 0 .../Universal/LogoDxe/LogoDxe/Logo.c | 194 --------- .../Universal/LogoDxe/LogoDxe/S3Logo.bmp | Bin 964114 -> 0 bytes .../Universal/LogoDxe/LogoDxe/S3Logo.idf | 10 - .../Universal/LogoDxe/LogoDxe/S3LogoDxe.inf | 57 --- .../Universal/LogoDxe/S3Logo.idf | 19 +- .../Universal/LogoDxe/S3LogoDxe.inf | 112 ++--- 14 files changed, 261 insertions(+), 523 deletions(-) rename Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/{LogoDxe =3D> }/JpegL= ogo.idf (100%) rename Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/{LogoDxe =3D> }/JpegL= ogoDxe.inf (100%) rename Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/{LogoDxe =3D> }/Logo.= bmp (100%) rename Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/{LogoDxe =3D> }/Logo.= h (100%) rename Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/{LogoDxe =3D> }/Logo.= idf (100%) rename Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/{LogoDxe =3D> }/Logo.= jpg (100%) rename Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/{LogoDxe =3D> }/LogoD= xe.inf (100%) delete mode 100644 Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/L= ogo.c delete mode 100644 Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/S= 3Logo.bmp delete mode 100644 Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/S= 3Logo.idf delete mode 100644 Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/S= 3LogoDxe.inf diff --git a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/JpegLogo= .idf b/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/JpegLogo.idf similarity index 100% rename from Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/JpegLogo.= idf rename to Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/JpegLogo.idf diff --git a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/JpegLogo= Dxe.inf b/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/JpegLogoDxe.inf similarity index 100% rename from Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/JpegLogoD= xe.inf rename to Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/JpegLogoDxe.inf diff --git a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/Logo.bmp= b/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/Logo.bmp similarity index 100% rename from Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/Logo.bmp rename to Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/Logo.bmp diff --git a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/Logo.c b/Platfor= m/AMD/AmdPlatformPkg/Universal/LogoDxe/Logo.c index 4463ba58eb..69fa1dc0e5 100644 --- a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/Logo.c +++ b/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/Logo.c @@ -1,198 +1,194 @@ -/** - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved. -**/ - -/** @file - Logo DXE Driver, install Edk2 Platform Logo protocol. - - Copyright (c) 2016 - 2020, Intel Corporation. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "Logo.h" - -EFI_HII_IMAGE_EX_PROTOCOL *mHiiImageEx; -EFI_HII_HANDLE mHiiHandle; -LOGO_ENTRY mLogos[] =3D { - { - IMAGE_TOKEN (IMG_LOGO), - EdkiiPlatformLogoDisplayAttributeCenter, - 0, - 0 - } -}; - -/** - Load a platform logo image and return its data and attributes. - - @param[in] This The pointer to this protocol instance. - @param[in, out] Instance The visible image instance is found. - @param[out] Image Points to the image. - @param[out] Attribute The display attributes of the image re= turned. - @param[out] OffsetX The X offset of the image regarding th= e Attribute. - @param[out] OffsetY The Y offset of the image regarding th= e Attribute. - - @retval EFI_SUCCESS The image was fetched successfully. - @retval EFI_NOT_FOUND The specified image could not be found. - @retval EFI_INVALID_PARAMETER One of the given input parameters are inc= orrect -**/ -EFI_STATUS -EFIAPI -GetImage ( - IN EDKII_PLATFORM_LOGO_PROTOCOL *This, - IN OUT UINT32 *Instance, - OUT EFI_IMAGE_INPUT *Image, - OUT EDKII_PLATFORM_LOGO_DISPLAY_ATTRIBUTE *Attribute, - OUT INTN *OffsetX, - OUT INTN *OffsetY - ) -{ - UINT32 Current; - - if ((Instance =3D=3D NULL) || (Image =3D=3D NULL) || - (Attribute =3D=3D NULL) || (OffsetX =3D=3D NULL) || (OffsetY =3D=3D = NULL)) - { - return EFI_INVALID_PARAMETER; - } - - Current =3D *Instance; - if (Current >=3D ARRAY_SIZE (mLogos)) { - return EFI_NOT_FOUND; - } - - (*Instance)++; // Advance to next logo. - *Attribute =3D mLogos[Current].Attribute; - *OffsetX =3D mLogos[Current].OffsetX; - *OffsetY =3D mLogos[Current].OffsetY; - return mHiiImageEx->GetImageEx (mHiiImageEx, mHiiHandle, mLogos[Current]= .ImageId, Image); -} - -EDKII_PLATFORM_LOGO_PROTOCOL mPlatformLogo =3D { - GetImage -}; - -// AMD_EDKII_OVERRIDE START - -/** - After console ready before boot option event callback - - @param[in] Event The Event this notify function registered to. - @param[in] Context Pointer to the context data registered to the Even= t. -**/ -VOID -EFIAPI -LogoDxeDisplayEventCallback ( - IN EFI_EVENT Event, - IN VOID *Context - ) -{ - DEBUG ((DEBUG_INFO, "AMD logo is displaying.\n")); - - BootLogoEnableLogo (); - gBS->CloseEvent (Event); -} - -/** - Entrypoint of this module. - - This function is the entrypoint of this module. It installs the Edkii - Platform Logo protocol. - - @param ImageHandle The firmware allocated handle for the EFI imag= e. - @param SystemTable A pointer to the EFI System Table. - - @retval EFI_SUCCESS The entry point is executed successfully. - -**/ -EFI_STATUS -EFIAPI -InitializeLogo ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - EFI_HII_PACKAGE_LIST_HEADER *PackageList; - EFI_HII_DATABASE_PROTOCOL *HiiDatabase; - EFI_HANDLE Handle; - EFI_EVENT AfterConsoleReadyBeforeBootOptionEvent; - - Status =3D gBS->LocateProtocol ( - &gEfiHiiDatabaseProtocolGuid, - NULL, - (VOID **)&HiiDatabase - ); - ASSERT_EFI_ERROR (Status); - - Status =3D gBS->LocateProtocol ( - &gEfiHiiImageExProtocolGuid, - NULL, - (VOID **)&mHiiImageEx - ); - ASSERT_EFI_ERROR (Status); - - // - // Retrieve HII package list from ImageHandle - // - Status =3D gBS->OpenProtocol ( - ImageHandle, - &gEfiHiiPackageListProtocolGuid, - (VOID **)&PackageList, - ImageHandle, - NULL, - EFI_OPEN_PROTOCOL_GET_PROTOCOL - ); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "HII Image Package with logo not found in PE/COFF= resource section\n")); - return Status; - } - - // - // Publish HII package list to HII Database. - // - Status =3D HiiDatabase->NewPackageList ( - HiiDatabase, - PackageList, - NULL, - &mHiiHandle - ); - if (!EFI_ERROR (Status)) { - Handle =3D NULL; - Status =3D gBS->InstallMultipleProtocolInterfaces ( - &Handle, - &gEdkiiPlatformLogoProtocolGuid, - &mPlatformLogo, - NULL - ); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "Install protocol failed.\n")); - return Status; - } - } - - // - // Create AfterConsoleReadyBeforeBootOption event callback - // - Status =3D gBS->CreateEventEx ( - EVT_NOTIFY_SIGNAL, - TPL_CALLBACK, - LogoDxeDisplayEventCallback, - NULL, - (EFI_GUID *)PcdGetPtr (PcdAmdDisplayLogoEventGuid), - &AfterConsoleReadyBeforeBootOptionEvent - ); - ASSERT_EFI_ERROR (Status); - return Status; -} +/** @file + Logo DXE Driver, install Edk2 Platform Logo protocol. + + Copyright (c) 2016 - 2020, Intel Corporation. All rights reserved.
+ Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved. + + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "Logo.h" + +EFI_HII_IMAGE_EX_PROTOCOL *mHiiImageEx; +EFI_HII_HANDLE mHiiHandle; +LOGO_ENTRY mLogos[] =3D { + { + IMAGE_TOKEN (IMG_LOGO), + EdkiiPlatformLogoDisplayAttributeCenter, + 0, + 0 + } +}; + +/** + Load a platform logo image and return its data and attributes. + + @param[in] This The pointer to this protocol instance. + @param[in, out] Instance The visible image instance is found. + @param[out] Image Points to the image. + @param[out] Attribute The display attributes of the image re= turned. + @param[out] OffsetX The X offset of the image regarding th= e Attribute. + @param[out] OffsetY The Y offset of the image regarding th= e Attribute. + + @retval EFI_SUCCESS The image was fetched successfully. + @retval EFI_NOT_FOUND The specified image could not be found. + @retval EFI_INVALID_PARAMETER One of the given input parameters are inc= orrect +**/ +EFI_STATUS +EFIAPI +GetImage ( + IN EDKII_PLATFORM_LOGO_PROTOCOL *This, + IN OUT UINT32 *Instance, + OUT EFI_IMAGE_INPUT *Image, + OUT EDKII_PLATFORM_LOGO_DISPLAY_ATTRIBUTE *Attribute, + OUT INTN *OffsetX, + OUT INTN *OffsetY + ) +{ + UINT32 Current; + + if ((Instance =3D=3D NULL) || (Image =3D=3D NULL) || + (Attribute =3D=3D NULL) || (OffsetX =3D=3D NULL) || (OffsetY =3D=3D = NULL)) + { + return EFI_INVALID_PARAMETER; + } + + Current =3D *Instance; + if (Current >=3D ARRAY_SIZE (mLogos)) { + return EFI_NOT_FOUND; + } + + (*Instance)++; // Advance to next logo. + *Attribute =3D mLogos[Current].Attribute; + *OffsetX =3D mLogos[Current].OffsetX; + *OffsetY =3D mLogos[Current].OffsetY; + return mHiiImageEx->GetImageEx (mHiiImageEx, mHiiHandle, mLogos[Current]= .ImageId, Image); +} + +EDKII_PLATFORM_LOGO_PROTOCOL mPlatformLogo =3D { + GetImage +}; + +// AMD_EDKII_OVERRIDE START + +/** + After console ready before boot option event callback + + @param[in] Event The Event this notify function registered to. + @param[in] Context Pointer to the context data registered to the Even= t. +**/ +VOID +EFIAPI +LogoDxeDisplayEventCallback ( + IN EFI_EVENT Event, + IN VOID *Context + ) +{ + DEBUG ((DEBUG_INFO, "AMD logo is displaying.\n")); + + BootLogoEnableLogo (); + gBS->CloseEvent (Event); +} + +/** + Entrypoint of this module. + + This function is the entrypoint of this module. It installs the Edkii + Platform Logo protocol. + + @param ImageHandle The firmware allocated handle for the EFI imag= e. + @param SystemTable A pointer to the EFI System Table. + + @retval EFI_SUCCESS The entry point is executed successfully. + +**/ +EFI_STATUS +EFIAPI +InitializeLogo ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + EFI_HII_PACKAGE_LIST_HEADER *PackageList; + EFI_HII_DATABASE_PROTOCOL *HiiDatabase; + EFI_HANDLE Handle; + EFI_EVENT AfterConsoleReadyBeforeBootOptionEvent; + + Status =3D gBS->LocateProtocol ( + &gEfiHiiDatabaseProtocolGuid, + NULL, + (VOID **)&HiiDatabase + ); + ASSERT_EFI_ERROR (Status); + + Status =3D gBS->LocateProtocol ( + &gEfiHiiImageExProtocolGuid, + NULL, + (VOID **)&mHiiImageEx + ); + ASSERT_EFI_ERROR (Status); + + // + // Retrieve HII package list from ImageHandle + // + Status =3D gBS->OpenProtocol ( + ImageHandle, + &gEfiHiiPackageListProtocolGuid, + (VOID **)&PackageList, + ImageHandle, + NULL, + EFI_OPEN_PROTOCOL_GET_PROTOCOL + ); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "HII Image Package with logo not found in PE/COFF= resource section\n")); + return Status; + } + + // + // Publish HII package list to HII Database. + // + Status =3D HiiDatabase->NewPackageList ( + HiiDatabase, + PackageList, + NULL, + &mHiiHandle + ); + if (!EFI_ERROR (Status)) { + Handle =3D NULL; + Status =3D gBS->InstallMultipleProtocolInterfaces ( + &Handle, + &gEdkiiPlatformLogoProtocolGuid, + &mPlatformLogo, + NULL + ); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "Install protocol failed.\n")); + return Status; + } + } + + // + // Create AfterConsoleReadyBeforeBootOption event callback + // + Status =3D gBS->CreateEventEx ( + EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, + LogoDxeDisplayEventCallback, + NULL, + (EFI_GUID *)PcdGetPtr (PcdAmdDisplayLogoEventGuid), + &AfterConsoleReadyBeforeBootOptionEvent + ); + ASSERT_EFI_ERROR (Status); + return Status; +} diff --git a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/Logo.h b= /Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/Logo.h similarity index 100% rename from Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/Logo.h rename to Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/Logo.h diff --git a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/Logo.idf= b/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/Logo.idf similarity index 100% rename from Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/Logo.idf rename to Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/Logo.idf diff --git a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/Logo.jpg= b/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/Logo.jpg similarity index 100% rename from Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/Logo.jpg rename to Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/Logo.jpg diff --git a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/LogoDxe.= inf b/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe.inf similarity index 100% rename from Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/LogoDxe.i= nf rename to Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe.inf diff --git a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/Logo.c b= /Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/Logo.c deleted file mode 100644 index 69fa1dc0e5..0000000000 --- a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/Logo.c +++ /dev/null @@ -1,194 +0,0 @@ -/** @file - Logo DXE Driver, install Edk2 Platform Logo protocol. - - Copyright (c) 2016 - 2020, Intel Corporation. All rights reserved.
- Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved. - - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "Logo.h" - -EFI_HII_IMAGE_EX_PROTOCOL *mHiiImageEx; -EFI_HII_HANDLE mHiiHandle; -LOGO_ENTRY mLogos[] =3D { - { - IMAGE_TOKEN (IMG_LOGO), - EdkiiPlatformLogoDisplayAttributeCenter, - 0, - 0 - } -}; - -/** - Load a platform logo image and return its data and attributes. - - @param[in] This The pointer to this protocol instance. - @param[in, out] Instance The visible image instance is found. - @param[out] Image Points to the image. - @param[out] Attribute The display attributes of the image re= turned. - @param[out] OffsetX The X offset of the image regarding th= e Attribute. - @param[out] OffsetY The Y offset of the image regarding th= e Attribute. - - @retval EFI_SUCCESS The image was fetched successfully. - @retval EFI_NOT_FOUND The specified image could not be found. - @retval EFI_INVALID_PARAMETER One of the given input parameters are inc= orrect -**/ -EFI_STATUS -EFIAPI -GetImage ( - IN EDKII_PLATFORM_LOGO_PROTOCOL *This, - IN OUT UINT32 *Instance, - OUT EFI_IMAGE_INPUT *Image, - OUT EDKII_PLATFORM_LOGO_DISPLAY_ATTRIBUTE *Attribute, - OUT INTN *OffsetX, - OUT INTN *OffsetY - ) -{ - UINT32 Current; - - if ((Instance =3D=3D NULL) || (Image =3D=3D NULL) || - (Attribute =3D=3D NULL) || (OffsetX =3D=3D NULL) || (OffsetY =3D=3D = NULL)) - { - return EFI_INVALID_PARAMETER; - } - - Current =3D *Instance; - if (Current >=3D ARRAY_SIZE (mLogos)) { - return EFI_NOT_FOUND; - } - - (*Instance)++; // Advance to next logo. - *Attribute =3D mLogos[Current].Attribute; - *OffsetX =3D mLogos[Current].OffsetX; - *OffsetY =3D mLogos[Current].OffsetY; - return mHiiImageEx->GetImageEx (mHiiImageEx, mHiiHandle, mLogos[Current]= .ImageId, Image); -} - -EDKII_PLATFORM_LOGO_PROTOCOL mPlatformLogo =3D { - GetImage -}; - -// AMD_EDKII_OVERRIDE START - -/** - After console ready before boot option event callback - - @param[in] Event The Event this notify function registered to. - @param[in] Context Pointer to the context data registered to the Even= t. -**/ -VOID -EFIAPI -LogoDxeDisplayEventCallback ( - IN EFI_EVENT Event, - IN VOID *Context - ) -{ - DEBUG ((DEBUG_INFO, "AMD logo is displaying.\n")); - - BootLogoEnableLogo (); - gBS->CloseEvent (Event); -} - -/** - Entrypoint of this module. - - This function is the entrypoint of this module. It installs the Edkii - Platform Logo protocol. - - @param ImageHandle The firmware allocated handle for the EFI imag= e. - @param SystemTable A pointer to the EFI System Table. - - @retval EFI_SUCCESS The entry point is executed successfully. - -**/ -EFI_STATUS -EFIAPI -InitializeLogo ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - EFI_HII_PACKAGE_LIST_HEADER *PackageList; - EFI_HII_DATABASE_PROTOCOL *HiiDatabase; - EFI_HANDLE Handle; - EFI_EVENT AfterConsoleReadyBeforeBootOptionEvent; - - Status =3D gBS->LocateProtocol ( - &gEfiHiiDatabaseProtocolGuid, - NULL, - (VOID **)&HiiDatabase - ); - ASSERT_EFI_ERROR (Status); - - Status =3D gBS->LocateProtocol ( - &gEfiHiiImageExProtocolGuid, - NULL, - (VOID **)&mHiiImageEx - ); - ASSERT_EFI_ERROR (Status); - - // - // Retrieve HII package list from ImageHandle - // - Status =3D gBS->OpenProtocol ( - ImageHandle, - &gEfiHiiPackageListProtocolGuid, - (VOID **)&PackageList, - ImageHandle, - NULL, - EFI_OPEN_PROTOCOL_GET_PROTOCOL - ); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "HII Image Package with logo not found in PE/COFF= resource section\n")); - return Status; - } - - // - // Publish HII package list to HII Database. - // - Status =3D HiiDatabase->NewPackageList ( - HiiDatabase, - PackageList, - NULL, - &mHiiHandle - ); - if (!EFI_ERROR (Status)) { - Handle =3D NULL; - Status =3D gBS->InstallMultipleProtocolInterfaces ( - &Handle, - &gEdkiiPlatformLogoProtocolGuid, - &mPlatformLogo, - NULL - ); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "Install protocol failed.\n")); - return Status; - } - } - - // - // Create AfterConsoleReadyBeforeBootOption event callback - // - Status =3D gBS->CreateEventEx ( - EVT_NOTIFY_SIGNAL, - TPL_CALLBACK, - LogoDxeDisplayEventCallback, - NULL, - (EFI_GUID *)PcdGetPtr (PcdAmdDisplayLogoEventGuid), - &AfterConsoleReadyBeforeBootOptionEvent - ); - ASSERT_EFI_ERROR (Status); - return Status; -} diff --git a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/S3Logo.b= mp b/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/S3Logo.bmp deleted file mode 100644 index 137f4dcebe4ebd77d50f35ed3b31bf76c0f5f55d..000000000000000000000000000= 0000000000000 GIT binary patch literal 0 HcmV?d00001 literal 964114 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 z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY** z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0 z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{ z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL zKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~ z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY** z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0 z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{ z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL zKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~ z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY** z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0 z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{ z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL zKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~ z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILC>Quo DNG4Z* diff --git a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/S3Logo.i= df b/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/S3Logo.idf deleted file mode 100644 index 3735ad0b66..0000000000 --- a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/S3Logo.idf +++ /dev/null @@ -1,10 +0,0 @@ -// /** @file -// Platform Logo image definition file. -// -// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved. -// -// SPDX-License-Identifier: BSD-2-Clause-Patent -// -// **/ - -#image IMG_LOGO S3Logo.bmp diff --git a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/S3LogoDx= e.inf b/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/S3LogoDxe.inf deleted file mode 100644 index be4c5ad59d..0000000000 --- a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/LogoDxe/S3LogoDxe.inf +++ /dev/null @@ -1,57 +0,0 @@ -## @file -# The default logo bitmap picture shown on setup screen. -# -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved. -# -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -## - -[Defines] - INF_VERSION =3D 0x00010005 - BASE_NAME =3D S3LogoDxe - FILE_GUID =3D A3193794-FCBC-E9A4-1AE0-DAEA9A499808 - MODULE_TYPE =3D DXE_DRIVER - VERSION_STRING =3D 1.0 - - ENTRY_POINT =3D InitializeLogo -# -# This flag specifies whether HII resource section is generated into PE i= mage. -# - UEFI_HII_RESOURCE_SECTION =3D TRUE - -# -# The following information is for reference only and not required by the = build tools. -# -# VALID_ARCHITECTURES =3D IA32 X64 -# - -[Sources] - Logo.c - S3Logo.bmp - S3Logo.idf - -[Packages] - AmdPlatformPkg/AmdPlatformPkg.dec - MdeModulePkg/MdeModulePkg.dec - MdePkg/MdePkg.dec - -[LibraryClasses] - BootLogoLib - DebugLib - PcdLib - UefiBootServicesTableLib - UefiDriverEntryPoint - -[Protocols] - gEdkiiPlatformLogoProtocolGuid ## PRODUCES - gEfiHiiDatabaseProtocolGuid ## CONSUMES - gEfiHiiImageExProtocolGuid ## CONSUMES - gEfiHiiPackageListProtocolGuid ## PRODUCES CONSUMES - -[Pcd] - gAmdPlatformPkgTokenSpaceGuid.PcdAmdDisplayLogoEventGuid - -[Depex] - gEfiHiiDatabaseProtocolGuid AND - gEfiHiiImageExProtocolGuid diff --git a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/S3Logo.idf b/Pla= tform/AMD/AmdPlatformPkg/Universal/LogoDxe/S3Logo.idf index b5eacfc5eb..3735ad0b66 100644 --- a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/S3Logo.idf +++ b/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/S3Logo.idf @@ -1,9 +1,10 @@ -// /** @file -// Platform Logo image definition file. -// -// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved. -// -// -// **/ - -#image IMG_LOGO S3Logo.bmp +// /** @file +// Platform Logo image definition file. +// +// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved. +// +// SPDX-License-Identifier: BSD-2-Clause-Patent +// +// **/ + +#image IMG_LOGO S3Logo.bmp diff --git a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/S3LogoDxe.inf b/= Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/S3LogoDxe.inf index 25b46e4bff..be4c5ad59d 100644 --- a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/S3LogoDxe.inf +++ b/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/S3LogoDxe.inf @@ -1,55 +1,57 @@ -## @file -# The default logo bitmap picture shown on setup screen. -# -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved. -# -## - -[Defines] - INF_VERSION =3D 0x00010005 - BASE_NAME =3D S3LogoDxe - FILE_GUID =3D A3193794-FCBC-E9A4-1AE0-DAEA9A499808 - MODULE_TYPE =3D DXE_DRIVER - VERSION_STRING =3D 1.0 - - ENTRY_POINT =3D InitializeLogo -# -# This flag specifies whether HII resource section is generated into PE i= mage. -# - UEFI_HII_RESOURCE_SECTION =3D TRUE - -# -# The following information is for reference only and not required by the = build tools. -# -# VALID_ARCHITECTURES =3D IA32 X64 -# - -[Sources] - S3Logo.bmp - Logo.c - S3Logo.idf - -[Packages] - AmdPlatformPkg/AmdPlatformPkg.dec - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - -[LibraryClasses] - BootLogoLib - DebugLib - PcdLib - UefiBootServicesTableLib - UefiDriverEntryPoint - -[Protocols] - gEfiHiiDatabaseProtocolGuid ## CONSUMES - gEfiHiiImageExProtocolGuid ## CONSUMES - gEfiHiiPackageListProtocolGuid ## PRODUCES CONSUMES - gEdkiiPlatformLogoProtocolGuid ## PRODUCES - -[Pcd] - gAmdPlatformPkgTokenSpaceGuid.PcdAmdDisplayLogoEventGuid - -[Depex] - gEfiHiiDatabaseProtocolGuid AND - gEfiHiiImageExProtocolGuid +## @file +# The default logo bitmap picture shown on setup screen. +# +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved. +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[Defines] + INF_VERSION =3D 0x00010005 + BASE_NAME =3D S3LogoDxe + FILE_GUID =3D A3193794-FCBC-E9A4-1AE0-DAEA9A499808 + MODULE_TYPE =3D DXE_DRIVER + VERSION_STRING =3D 1.0 + + ENTRY_POINT =3D InitializeLogo +# +# This flag specifies whether HII resource section is generated into PE i= mage. +# + UEFI_HII_RESOURCE_SECTION =3D TRUE + +# +# The following information is for reference only and not required by the = build tools. +# +# VALID_ARCHITECTURES =3D IA32 X64 +# + +[Sources] + Logo.c + S3Logo.bmp + S3Logo.idf + +[Packages] + AmdPlatformPkg/AmdPlatformPkg.dec + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec + +[LibraryClasses] + BootLogoLib + DebugLib + PcdLib + UefiBootServicesTableLib + UefiDriverEntryPoint + +[Protocols] + gEdkiiPlatformLogoProtocolGuid ## PRODUCES + gEfiHiiDatabaseProtocolGuid ## CONSUMES + gEfiHiiImageExProtocolGuid ## CONSUMES + gEfiHiiPackageListProtocolGuid ## PRODUCES CONSUMES + +[Pcd] + gAmdPlatformPkgTokenSpaceGuid.PcdAmdDisplayLogoEventGuid + +[Depex] + gEfiHiiDatabaseProtocolGuid AND + gEfiHiiImageExProtocolGuid --=20 2.34.1 -=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 (#119288): https://edk2.groups.io/g/devel/message/119288 Mute This Topic: https://groups.io/mt/106342981/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-