From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by mx.groups.io with SMTP id smtpd.web11.6244.1666175774780496557 for ; Wed, 19 Oct 2022 03:36:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qXGY+HJj; spf=pass (domain: kernel.org, ip: 139.178.84.217, 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 dfw.source.kernel.org (Postfix) with ESMTPS id 4DEBE617E3; Wed, 19 Oct 2022 10:36:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8AFDEC433C1; Wed, 19 Oct 2022 10:36:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666175773; bh=94AWO3I5CNwW4IQ/Pqz+x+IARgoD7KMMl9kf1yUUexg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qXGY+HJjNBeMq9DL1b9mqvYMyey4XdtPRdV1UFbRyIfujg22E2uHwc27aunuJSw7+ OpGElPRtFjkgRH89rEd6It3P7PeyEd9r9qPw+6twE6CXNaa7VBjYsKgH9F09yfpTKg R+SDiNnSmAwsIbxR/Gmrcbfv4/pbec3U7sdeLgHJmqGuAVBni8Vteob73DVUh9JR2X jNO9M2R//1/GeFO3/pqrPVs/oeWkE+e8oB03s+wugKsrI2ILJGkbofkG1qiYDfHzZc NZBIqClWIi87aCisds7jXMvdGUbnUkpDBhzsh/su+NJVF+pPh7GfSauh+rVZtk75IC 6XSTyGBVXfmfQ== From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Thomas Abraham , Sami Mujawar Subject: [PATCH edk2-platforms 4/4] Platform/ARM: switch to local version of NorFlashDxe drivers Date: Wed, 19 Oct 2022 12:35:55 +0200 Message-Id: <20221019103555.493477-5-ardb@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221019103555.493477-1-ardb@kernel.org> References: <20221019103555.493477-1-ardb@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Drop the dependency on the ArmPlatformPkg version of NorFlashDxe and NorFlashStandaloneMm, which will be going away soon. Instead, depend on the local version under Platform/ARM. Signed-off-by: Ard Biesheuvel --- Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 2 +- Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc | 2 +- Platform/ARM/JunoPkg/ArmJuno.dsc | 2 +- Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 2 +- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 2 +- Platform/ARM/JunoPkg/ArmJuno.fdf | 2 +- Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf | 2 +- Platform/ARM/SgiPkg/SgiPlatform.fdf | 2 +- Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf | 2 +- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/= SgiPlatform.dsc.inc index 2f5dadfaefc6..81764368a0b7 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc @@ -256,7 +256,7 @@ [Components.common] !if $(ENABLE_GOP) =3D=3D TRUE=0D ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf=0D !endif=0D - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf=0D + Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf=0D EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf=0D EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf=0D MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf=0D diff --git a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc b/Platform/ARM/SgiPk= g/SgiPlatformMm.dsc.inc index 68fc3ad93a5f..ae0ff7247a6a 100644 --- a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc +++ b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc @@ -122,7 +122,7 @@ [Components.common] [Components.AARCH64]=0D StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf=0D !if $(SECURE_STORAGE_ENABLE) =3D=3D TRUE=0D - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashStandaloneMm.inf=0D + Platform/ARM/Drivers/NorFlashDxe/NorFlashStandaloneMm.inf=0D MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandalon= eMm.inf=0D MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf {=0D =0D diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJun= o.dsc index f7ce397633f6..a00b866c5e9a 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dsc +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc @@ -277,7 +277,7 @@ [Components.common] MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf=0D =0D ArmPkg/Drivers/ArmGic/ArmGicDxe.inf=0D - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf=0D + Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf=0D ArmPkg/Drivers/TimerDxe/TimerDxe.inf=0D ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.inf=0D =0D diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/A= RM/VExpressPkg/ArmVExpress-CTA15-A7.dsc index cb9d2d4287e3..9c5e78d6275d 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -229,7 +229,7 @@ [Components.common] MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf=0D =0D ArmPkg/Drivers/ArmGic/ArmGicDxe.inf=0D - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf=0D + Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf=0D ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf=0D ArmPkg/Drivers/TimerDxe/TimerDxe.inf=0D ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf=0D diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platfor= m/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc index 8561c21fab5a..dc081794cf98 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -289,7 +289,7 @@ [Components.common] }=0D =0D ArmPkg/Drivers/ArmGic/ArmGicDxe.inf=0D - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf=0D + Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf=0D ArmPkg/Drivers/TimerDxe/TimerDxe.inf=0D !ifdef EDK2_ENABLE_PL111=0D ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf=0D diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJun= o.fdf index c9d51c65ffdb..fca5a78cee6c 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.fdf +++ b/Platform/ARM/JunoPkg/ArmJuno.fdf @@ -136,7 +136,7 @@ [FV.FvMain] INF ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.inf=0D =0D # NOR Flash driver=0D - INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf=0D + INF Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf=0D =0D # Versatile Express FileSystem=0D INF Platform/ARM/Drivers/BootMonFs/BootMonFs.inf=0D diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf b/Platform/ARM/Sg= iPkg/PlatformStandaloneMm.fdf index c1c24b747fa5..653aae8285a6 100644 --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf +++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf @@ -50,7 +50,7 @@ [FV.FVMAIN_COMPACT] =0D INF StandaloneMmPkg/Core/StandaloneMmCore.inf=0D !if $(SECURE_STORAGE_ENABLE) =3D=3D TRUE=0D - INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashStandaloneMm.inf=0D + INF Platform/ARM/Drivers/NorFlashDxe/NorFlashStandaloneMm.inf=0D INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStand= aloneMm.inf=0D INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf= =0D !endif=0D diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiP= latform.fdf index 4018480b424c..7e55214c2001 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.fdf +++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf @@ -149,7 +149,7 @@ [FV.FvMain] INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf=0D =0D # NOR Flash driver=0D - INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf=0D + INF Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf=0D INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf=0D =0D # Graphics Output Protocol=0D diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf b/Platform/A= RM/VExpressPkg/ArmVExpress-CTA15-A7.fdf index 8ca70a248d09..73c4ddb0995b 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf @@ -90,7 +90,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 Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf=0D INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf= =0D INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf=0D =0D diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf b/Platfor= m/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf index a7d048273b37..e836691ddf6f 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf @@ -112,7 +112,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 Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf=0D !ifdef EDK2_ENABLE_PL111=0D INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf= =0D !endif=0D --=20 2.35.1