From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by mx.groups.io with SMTP id smtpd.web08.694.1666630912568812472 for ; Mon, 24 Oct 2022 10:01:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GpY1sYXt; spf=pass (domain: kernel.org, ip: 145.40.68.75, mailfrom: ardb@kernel.org) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1CD5BB815BE; Mon, 24 Oct 2022 17:01:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E2C6C433D7; Mon, 24 Oct 2022 17:01:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666630909; bh=p5Hfh/FPiUYrfk6gitITgjYne96BU+ELlxDkmjx/BHs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GpY1sYXtlM0X7fGdWyioPetPK5B4cqks0UDcMB3nKLoBPV4TrDr3mZ2VYUvLMUjA8 a9Yi46gYvuP4hdBtrRbMrBgb9rwJ0tVVoXSW8rLE3BdyA1Mr8wV0P4EjdpGbny6nWH Uq+RaZqCOEbhdkvH/fEcFWxMdE4FezyBtVV2SXlpJH6K+eWjHzxWZPccQbJBB7hEw7 ub2dVF+3VFSzqlTUBBAkHkLBMS03lZfjgJKhZbezuSik28/WmSRzuR9tueF4kzp8Ak EB1nv5x1/eRCOhybgk36feuYh4vj8kHhapSZNkjC3zVh+tgg7X2jeHaSB4KOBoTmXV mSMddHP8luNNg== From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Gerd Hoffmann , Sunil V L , Sami Mujawar , Leif Lindholm Subject: [PATCH 09/11] ArmVirtPkg/ArmVirtQemu: migrate to OVMF's VirtNorFlashDxe Date: Mon, 24 Oct 2022 19:01:20 +0200 Message-Id: <20221024170122.594577-10-ardb@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221024170122.594577-1-ardb@kernel.org> References: <20221024170122.594577-1-ardb@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Switch to the virt specific NorFlashDxe driver implementation that was added recently. Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtQemu.dsc | 4 ++-- ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 2 +- ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 ++-- ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c | 12 ++++++------ ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 9369a88858fd..a13297997434 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -67,7 +67,7 @@ [LibraryClasses.common] ArmPlatformLib|ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibN= ull.inf=0D =0D TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf=0D - NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.i= nf=0D + VirtNorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuL= ib.inf=0D =0D CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf= =0D BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf=0D @@ -397,7 +397,7 @@ [Components.common] =0D NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClie= ntLib.inf=0D }=0D - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf=0D + OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf=0D MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf=0D =0D #=0D diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuF= vMain.fdf.inc index d4df6dede0fe..771921dffd74 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -73,7 +73,7 @@ [FV.FvMain] =0D INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf=0D INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf=0D - INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf=0D + INF OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf=0D INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf=0D =0D #=0D diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKerne= l.dsc index 7f7d15d6eee3..5bf6c02a3141 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -65,7 +65,7 @@ [LibraryClasses.common] ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoL= ib.inf=0D =0D TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf=0D - NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.i= nf=0D + VirtNorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuL= ib.inf=0D =0D CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf= =0D BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf=0D @@ -331,7 +331,7 @@ [Components.common] =0D NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClie= ntLib.inf=0D }=0D - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf=0D + OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf=0D MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf=0D =0D #=0D diff --git a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c b/ArmVirt= Pkg/Library/NorFlashQemuLib/NorFlashQemuLib.c index 2b39f021d0ae..55bce88bc8dd 100644 --- a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c +++ b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c @@ -8,8 +8,8 @@ =0D #include =0D #include =0D -#include =0D #include =0D +#include =0D =0D #include =0D =0D @@ -18,19 +18,19 @@ #define MAX_FLASH_BANKS 4=0D =0D EFI_STATUS=0D -NorFlashPlatformInitialization (=0D +VirtNorFlashPlatformInitialization (=0D VOID=0D )=0D {=0D return EFI_SUCCESS;=0D }=0D =0D -NOR_FLASH_DESCRIPTION mNorFlashDevices[MAX_FLASH_BANKS];=0D +STATIC VIRT_NOR_FLASH_DESCRIPTION mNorFlashDevices[MAX_FLASH_BANKS];=0D =0D EFI_STATUS=0D -NorFlashPlatformGetDevices (=0D - OUT NOR_FLASH_DESCRIPTION **NorFlashDescriptions,=0D - OUT UINT32 *Count=0D +VirtNorFlashPlatformGetDevices (=0D + OUT VIRT_NOR_FLASH_DESCRIPTION **NorFlashDescriptions,=0D + OUT UINT32 *Count=0D )=0D {=0D FDT_CLIENT_PROTOCOL *FdtClient;=0D diff --git a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf b/ArmVi= rtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf index 4c3683bf5d0d..a6b5865be91c 100644 --- a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf +++ b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf @@ -14,17 +14,17 @@ [Defines] FILE_GUID =3D 339B7829-4C5F-4EFC-B2DD-5050E530DECE= =0D MODULE_TYPE =3D DXE_DRIVER=0D VERSION_STRING =3D 1.0=0D - LIBRARY_CLASS =3D NorFlashPlatformLib=0D + LIBRARY_CLASS =3D VirtNorFlashPlatformLib=0D =0D [Sources.common]=0D NorFlashQemuLib.c=0D =0D [Packages]=0D MdePkg/MdePkg.dec=0D - ArmPlatformPkg/ArmPlatformPkg.dec=0D ArmPkg/ArmPkg.dec=0D ArmVirtPkg/ArmVirtPkg.dec=0D EmbeddedPkg/EmbeddedPkg.dec=0D + OvmfPkg/OvmfPkg.dec=0D =0D [LibraryClasses]=0D BaseLib=0D --=20 2.35.1