4f214830ce
Commit 8015f3f6d4 ("ArmPlatformPkg: Enable support for flash in
64-bit address space") updated the NorFlash DXE and StMM drivers to
take alternate PCDs into account when discovering the base of the
NOR flash regions.
This introduced a disparity between the declarations of the PCD references
in the .INF files, which permits the use of dynamic PCDs, and the code
itself, which now uses FixedPcdGet() accessors. On platforms that actually
use dynamic PCDs, this results in a build error.
So let's clean this up:
- for the DXE version, use the generic PcdGet() accessors, so dynamic PCDs
are permitted
- for the standalone MM version, redeclare the PCDs as [FixedPcd] in the
.INF description, and switch to the FixedPcdGet() accessors.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Vijayenthiran Subramaniam <vijayenthiran.subramaniam@arm.com>
68 lines
1.9 KiB
INI
68 lines
1.9 KiB
INI
#/** @file
|
|
#
|
|
# Component description file for NorFlashStandaloneMm module
|
|
#
|
|
# Copyright (c) 2011 - 2021, Arm Limited. All rights reserved.<BR>
|
|
# Copyright (c) 2020, Linaro, Ltd. All rights reserved.<BR>
|
|
#
|
|
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
#
|
|
#**/
|
|
|
|
[Defines]
|
|
INF_VERSION = 0x00010005
|
|
BASE_NAME = ArmVeNorFlashStandaloneMm
|
|
FILE_GUID = e67d82ad-cd56-4071-9151-95ee44990bb0
|
|
MODULE_TYPE = MM_STANDALONE
|
|
VERSION_STRING = 1.0
|
|
PI_SPECIFICATION_VERSION = 0x00010032
|
|
ENTRY_POINT = NorFlashInitialise
|
|
|
|
[Sources.common]
|
|
NorFlash.h
|
|
NorFlash.c
|
|
NorFlashStandaloneMm.c
|
|
NorFlashFvb.c
|
|
|
|
[Packages]
|
|
MdePkg/MdePkg.dec
|
|
MdeModulePkg/MdeModulePkg.dec
|
|
ArmPlatformPkg/ArmPlatformPkg.dec
|
|
EmbeddedPkg/EmbeddedPkg.dec
|
|
StandaloneMmPkg/StandaloneMmPkg.dec
|
|
|
|
[LibraryClasses]
|
|
BaseLib
|
|
BaseMemoryLib
|
|
DebugLib
|
|
IoLib
|
|
MemoryAllocationLib
|
|
MmServicesTableLib
|
|
NorFlashPlatformLib
|
|
StandaloneMmDriverEntryPoint
|
|
|
|
[Guids]
|
|
gEfiSystemNvDataFvGuid
|
|
gEfiVariableGuid
|
|
gEfiAuthenticatedVariableGuid
|
|
|
|
[Protocols]
|
|
gEfiSmmFirmwareVolumeBlockProtocolGuid
|
|
|
|
[FixedPcd]
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
|
|
|
|
[FeaturePcd]
|
|
gArmPlatformTokenSpaceGuid.PcdNorFlashCheckBlockLocked
|
|
|
|
[Depex]
|
|
TRUE
|