From: Pierre Gondois <pierre.gondois@arm.com>

commit d7b286ae5f53 ("Platform/ARM: clone NorFlashDxe from
ArmPlatformPkg")
recently moved the NorFlashDxe.

Update the TokenSpace of the PcdNorFlashCheckBlockLocked accordingly
and include ARM.dec for the module.

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf
index 1119361e7726..93a8f7edc3dd 100644
--- a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf
+++ b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf
@@ -25,6 +25,7 @@ [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
+  Platform/ARM/ARM.dec
   Silicon/Hisilicon/HisiPkg.dec
 
 [LibraryClasses]
@@ -56,7 +57,7 @@ [Pcd.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
 
-  gArmPlatformTokenSpaceGuid.PcdNorFlashCheckBlockLocked
+  gPlatformArmTokenSpaceGuid.PcdNorFlashCheckBlockLocked
   gHisiTokenSpaceGuid.PcdSFCMEM0BaseAddress
 
 [Depex]
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#99011): https://edk2.groups.io/g/devel/message/99011
Mute This Topic: https://groups.io/mt/96518045/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Hi Pierre,

Thank you for this patch.

On Wed, Jan 25, 2023 at 02:28 AM, PierreGondois wrote:

> 
> --- a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf
> +++ b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf
> @@ -25,6 +25,7 @@ [Packages]
> MdePkg/MdePkg.dec
> MdeModulePkg/MdeModulePkg.dec
> ArmPlatformPkg/ArmPlatformPkg.dec

[SAMI] I believe the above line can be removed. Can you check, please?
With that addressed.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

> 
> + Platform/ARM/ARM.dec
> Silicon/Hisilicon/HisiPkg.dec
> =20


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#99073): https://edk2.groups.io/g/devel/message/99073
Mute This Topic: https://groups.io/mt/96518045/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-