Edk2 commit cc650a0378f8 ("ArmPlatformPkg: Retire NorFlashDxe driver",
2022-11-06) removed PcdNorFlashCheckBlockLocked from
"gArmPlatformTokenSpaceGuid"; edk2-platforms commit d7b286ae5f53
("Platform/ARM: clone NorFlashDxe from ArmPlatformPkg", 2022-10-19)
provided it in the *different* namespace "gPlatformArmTokenSpaceGuid"
(notice that "Arm" and "Platform" are in the opposite order).However, the dependency in "FlashFvbDxe.inf" was not updated. Found when trying to build: - Platform/Hisilicon/D03/D03.dsc - Platform/Hisilicon/D05/D05.dsc - Platform/Hisilicon/D06/D06.fdf Update the token space GUID reference. Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> Cc: Leif Lindholm <quic_llind...@quicinc.com> Cc: Wenyi Xie <xiewen...@huawei.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=4564 Signed-off-by: Laszlo Ersek <ler...@redhat.com> --- Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf index 1119361e7726..3600e101b600 100644 --- a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf +++ b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf @@ -24,7 +24,7 @@ [Sources.common] [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - ArmPlatformPkg/ArmPlatformPkg.dec + Platform/ARM/ARM.dec Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] @@ -56,7 +56,7 @@ [Pcd.common] gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize - gArmPlatformTokenSpaceGuid.PcdNorFlashCheckBlockLocked + gPlatformArmTokenSpaceGuid.PcdNorFlashCheckBlockLocked gHisiTokenSpaceGuid.PcdSFCMEM0BaseAddress [Depex] -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109542): https://edk2.groups.io/g/devel/message/109542 Mute This Topic: https://groups.io/mt/101914651/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
