mirror of
https://github.com/acidanthera/audk.git
synced 2025-07-21 12:44:50 +02:00
MdeModulePkg/Variable: Check if there is a NV Variable Storage header prior to use its attributes
The Variable PEI and RuntimeDxe drivers were using the attribute 'HeaderLength' of EFI_FIRMWARE_VOLUME_HEADER without checking if a Firmware Volume Header was existing at the base address. In case the Firmware Volume Header does not exist or is corrupted, the attribute 'HeaderLength' is a non valid value that can lead to a non valid physical address when accessing produces an access error. Signed-off-by: oliviermartin Reviewed-by: niruiyu git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12836 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
oliviermartin
parent
7f070be5c9
commit
d65502601e
@ -1,300 +1,300 @@
|
|||||||
#
|
#
|
||||||
# Copyright (c) 2011, ARM Limited. All rights reserved.
|
# Copyright (c) 2011, ARM Limited. All rights reserved.
|
||||||
#
|
#
|
||||||
# This program and the accompanying materials
|
# This program and the accompanying materials
|
||||||
# are licensed and made available under the terms and conditions of the BSD License
|
# are licensed and made available under the terms and conditions of the BSD License
|
||||||
# which accompanies this distribution. The full text of the license may be found at
|
# which accompanies this distribution. The full text of the license may be found at
|
||||||
# http://opensource.org/licenses/bsd-license.php
|
# http://opensource.org/licenses/bsd-license.php
|
||||||
#
|
#
|
||||||
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||||
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||||
#
|
#
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
#
|
||||||
# FD Section
|
# FD Section
|
||||||
# The [FD] Section is made up of the definition statements and a
|
# The [FD] Section is made up of the definition statements and a
|
||||||
# description of what goes into the Flash Device Image. Each FD section
|
# description of what goes into the Flash Device Image. Each FD section
|
||||||
# defines one flash "device" image. A flash device image may be one of
|
# defines one flash "device" image. A flash device image may be one of
|
||||||
# the following: Removable media bootable image (like a boot floppy
|
# the following: Removable media bootable image (like a boot floppy
|
||||||
# image,) an Option ROM image (that would be "flashed" into an add-in
|
# image,) an Option ROM image (that would be "flashed" into an add-in
|
||||||
# card,) a System "Flash" image (that would be burned into a system's
|
# card,) a System "Flash" image (that would be burned into a system's
|
||||||
# flash) or an Update ("Capsule") image that will be used to update and
|
# flash) or an Update ("Capsule") image that will be used to update and
|
||||||
# existing system flash.
|
# existing system flash.
|
||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
[FD.RTSM_VE_Cortex-A9_EFI]
|
[FD.RTSM_VE_Cortex-A9_EFI]
|
||||||
BaseAddress = 0x08000000|gArmTokenSpaceGuid.PcdFdBaseAddress # The base address of the Firmware in NOR Flash.
|
BaseAddress = 0x08000000|gArmTokenSpaceGuid.PcdFdBaseAddress # The base address of the Firmware in NOR Flash.
|
||||||
Size = 0x00280000|gArmTokenSpaceGuid.PcdFdSize # The size in bytes of the FLASH Device
|
Size = 0x00280000|gArmTokenSpaceGuid.PcdFdSize # The size in bytes of the FLASH Device
|
||||||
ErasePolarity = 1
|
ErasePolarity = 1
|
||||||
|
|
||||||
# This one is tricky, it must be: BlockSize * NumBlocks = Size
|
# This one is tricky, it must be: BlockSize * NumBlocks = Size
|
||||||
BlockSize = 0x00001000
|
BlockSize = 0x00001000
|
||||||
NumBlocks = 0x280
|
NumBlocks = 0x280
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
#
|
||||||
# Following are lists of FD Region layout which correspond to the locations of different
|
# Following are lists of FD Region layout which correspond to the locations of different
|
||||||
# images within the flash device.
|
# images within the flash device.
|
||||||
#
|
#
|
||||||
# Regions must be defined in ascending order and may not overlap.
|
# Regions must be defined in ascending order and may not overlap.
|
||||||
#
|
#
|
||||||
# A Layout Region start with a eight digit hex offset (leading "0x" required) followed by
|
# A Layout Region start with a eight digit hex offset (leading "0x" required) followed by
|
||||||
# the pipe "|" character, followed by the size of the region, also in hex with the leading
|
# the pipe "|" character, followed by the size of the region, also in hex with the leading
|
||||||
# "0x" characters. Like:
|
# "0x" characters. Like:
|
||||||
# Offset|Size
|
# Offset|Size
|
||||||
# PcdOffsetCName|PcdSizeCName
|
# PcdOffsetCName|PcdSizeCName
|
||||||
# RegionType <FV, DATA, or FILE>
|
# RegionType <FV, DATA, or FILE>
|
||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
0x00000000|0x00080000
|
0x00000000|0x00080000
|
||||||
gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvSize
|
gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvSize
|
||||||
FV = FVMAIN_SEC
|
FV = FVMAIN_SEC
|
||||||
|
|
||||||
0x00080000|0x00280000
|
0x00080000|0x00280000
|
||||||
gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
|
gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
|
||||||
FV = FVMAIN_COMPACT
|
FV = FVMAIN_COMPACT
|
||||||
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
#
|
||||||
# FV Section
|
# FV Section
|
||||||
#
|
#
|
||||||
# [FV] section is used to define what components or modules are placed within a flash
|
# [FV] section is used to define what components or modules are placed within a flash
|
||||||
# device file. This section also defines order the components and modules are positioned
|
# device file. This section also defines order the components and modules are positioned
|
||||||
# within the image. The [FV] section consists of define statements, set statements and
|
# within the image. The [FV] section consists of define statements, set statements and
|
||||||
# module statements.
|
# module statements.
|
||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
[FV.FVMAIN_SEC]
|
[FV.FVMAIN_SEC]
|
||||||
FvAlignment = 8
|
FvAlignment = 8
|
||||||
ERASE_POLARITY = 1
|
ERASE_POLARITY = 1
|
||||||
MEMORY_MAPPED = TRUE
|
MEMORY_MAPPED = TRUE
|
||||||
STICKY_WRITE = TRUE
|
STICKY_WRITE = TRUE
|
||||||
LOCK_CAP = TRUE
|
LOCK_CAP = TRUE
|
||||||
LOCK_STATUS = TRUE
|
LOCK_STATUS = TRUE
|
||||||
WRITE_DISABLED_CAP = TRUE
|
WRITE_DISABLED_CAP = TRUE
|
||||||
WRITE_ENABLED_CAP = TRUE
|
WRITE_ENABLED_CAP = TRUE
|
||||||
WRITE_STATUS = TRUE
|
WRITE_STATUS = TRUE
|
||||||
WRITE_LOCK_CAP = TRUE
|
WRITE_LOCK_CAP = TRUE
|
||||||
WRITE_LOCK_STATUS = TRUE
|
WRITE_LOCK_STATUS = TRUE
|
||||||
READ_DISABLED_CAP = TRUE
|
READ_DISABLED_CAP = TRUE
|
||||||
READ_ENABLED_CAP = TRUE
|
READ_ENABLED_CAP = TRUE
|
||||||
READ_STATUS = TRUE
|
READ_STATUS = TRUE
|
||||||
READ_LOCK_CAP = TRUE
|
READ_LOCK_CAP = TRUE
|
||||||
READ_LOCK_STATUS = TRUE
|
READ_LOCK_STATUS = TRUE
|
||||||
|
|
||||||
INF ArmPlatformPkg/Sec/Sec.inf
|
INF ArmPlatformPkg/Sec/Sec.inf
|
||||||
|
|
||||||
|
|
||||||
[FV.FvMain]
|
[FV.FvMain]
|
||||||
BlockSize = 0x40
|
BlockSize = 0x40
|
||||||
NumBlocks = 0 # This FV gets compressed so make it just big enough
|
NumBlocks = 0 # This FV gets compressed so make it just big enough
|
||||||
FvAlignment = 8 # FV alignment and FV attributes setting.
|
FvAlignment = 8 # FV alignment and FV attributes setting.
|
||||||
ERASE_POLARITY = 1
|
ERASE_POLARITY = 1
|
||||||
MEMORY_MAPPED = TRUE
|
MEMORY_MAPPED = TRUE
|
||||||
STICKY_WRITE = TRUE
|
STICKY_WRITE = TRUE
|
||||||
LOCK_CAP = TRUE
|
LOCK_CAP = TRUE
|
||||||
LOCK_STATUS = TRUE
|
LOCK_STATUS = TRUE
|
||||||
WRITE_DISABLED_CAP = TRUE
|
WRITE_DISABLED_CAP = TRUE
|
||||||
WRITE_ENABLED_CAP = TRUE
|
WRITE_ENABLED_CAP = TRUE
|
||||||
WRITE_STATUS = TRUE
|
WRITE_STATUS = TRUE
|
||||||
WRITE_LOCK_CAP = TRUE
|
WRITE_LOCK_CAP = TRUE
|
||||||
WRITE_LOCK_STATUS = TRUE
|
WRITE_LOCK_STATUS = TRUE
|
||||||
READ_DISABLED_CAP = TRUE
|
READ_DISABLED_CAP = TRUE
|
||||||
READ_ENABLED_CAP = TRUE
|
READ_ENABLED_CAP = TRUE
|
||||||
READ_STATUS = TRUE
|
READ_STATUS = TRUE
|
||||||
READ_LOCK_CAP = TRUE
|
READ_LOCK_CAP = TRUE
|
||||||
READ_LOCK_STATUS = TRUE
|
READ_LOCK_STATUS = TRUE
|
||||||
|
|
||||||
INF MdeModulePkg/Core/Dxe/DxeMain.inf
|
INF MdeModulePkg/Core/Dxe/DxeMain.inf
|
||||||
|
|
||||||
#
|
#
|
||||||
# PI DXE Drivers producing Architectural Protocols (EFI Services)
|
# PI DXE Drivers producing Architectural Protocols (EFI Services)
|
||||||
#
|
#
|
||||||
INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf
|
INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf
|
||||||
INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
|
INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
|
||||||
INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
|
INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
|
||||||
INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
|
INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
|
||||||
INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
|
INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
|
||||||
INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
|
INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
|
||||||
INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
|
INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
|
||||||
INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
|
INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
|
||||||
INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
|
INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
|
||||||
INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
|
INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
|
||||||
|
|
||||||
INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
|
INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
|
||||||
|
|
||||||
#
|
#
|
||||||
# Multiple Console IO support
|
# Multiple Console IO support
|
||||||
#
|
#
|
||||||
INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
|
INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
|
||||||
INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
|
INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
|
||||||
INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
|
INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
|
||||||
INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
|
INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
|
||||||
INF EmbeddedPkg/SerialDxe/SerialDxe.inf
|
INF EmbeddedPkg/SerialDxe/SerialDxe.inf
|
||||||
|
|
||||||
INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf
|
INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf
|
||||||
INF ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf
|
INF ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf
|
||||||
INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
|
INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
|
||||||
INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf
|
INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf
|
||||||
INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
|
INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
|
||||||
|
|
||||||
#
|
#
|
||||||
# Semi-hosting filesystem
|
# Semi-hosting filesystem
|
||||||
#
|
#
|
||||||
INF ArmPkg/Filesystem/SemihostFs/SemihostFs.inf
|
INF ArmPkg/Filesystem/SemihostFs/SemihostFs.inf
|
||||||
|
|
||||||
#
|
#
|
||||||
# FAT filesystem + GPT/MBR partitioning
|
# FAT filesystem + GPT/MBR partitioning
|
||||||
#
|
#
|
||||||
INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
|
INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
|
||||||
INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
|
INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
|
||||||
INF FatPkg/EnhancedFatDxe/Fat.inf
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||||||
INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
||||||
|
|
||||||
#
|
#
|
||||||
# UEFI application (Shell Embedded Boot Loader)
|
# UEFI application (Shell Embedded Boot Loader)
|
||||||
#
|
#
|
||||||
INF EmbeddedPkg/Ebl/Ebl.inf
|
INF EmbeddedPkg/Ebl/Ebl.inf
|
||||||
|
|
||||||
!if $(EDK2_ARMVE_UEFI2_SHELL) == 1
|
!if $(EDK2_ARMVE_UEFI2_SHELL) == 1
|
||||||
INF ShellPkg/Application/Shell/Shell.inf
|
INF ShellPkg/Application/Shell/Shell.inf
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
#
|
#
|
||||||
# Bds
|
# Bds
|
||||||
#
|
#
|
||||||
INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
|
INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
|
||||||
INF ArmPlatformPkg/Bds/Bds.inf
|
INF ArmPlatformPkg/Bds/Bds.inf
|
||||||
|
|
||||||
|
|
||||||
[FV.FVMAIN_COMPACT]
|
[FV.FVMAIN_COMPACT]
|
||||||
FvAlignment = 8
|
FvAlignment = 8
|
||||||
ERASE_POLARITY = 1
|
ERASE_POLARITY = 1
|
||||||
MEMORY_MAPPED = TRUE
|
MEMORY_MAPPED = TRUE
|
||||||
STICKY_WRITE = TRUE
|
STICKY_WRITE = TRUE
|
||||||
LOCK_CAP = TRUE
|
LOCK_CAP = TRUE
|
||||||
LOCK_STATUS = TRUE
|
LOCK_STATUS = TRUE
|
||||||
WRITE_DISABLED_CAP = TRUE
|
WRITE_DISABLED_CAP = TRUE
|
||||||
WRITE_ENABLED_CAP = TRUE
|
WRITE_ENABLED_CAP = TRUE
|
||||||
WRITE_STATUS = TRUE
|
WRITE_STATUS = TRUE
|
||||||
WRITE_LOCK_CAP = TRUE
|
WRITE_LOCK_CAP = TRUE
|
||||||
WRITE_LOCK_STATUS = TRUE
|
WRITE_LOCK_STATUS = TRUE
|
||||||
READ_DISABLED_CAP = TRUE
|
READ_DISABLED_CAP = TRUE
|
||||||
READ_ENABLED_CAP = TRUE
|
READ_ENABLED_CAP = TRUE
|
||||||
READ_STATUS = TRUE
|
READ_STATUS = TRUE
|
||||||
READ_LOCK_CAP = TRUE
|
READ_LOCK_CAP = TRUE
|
||||||
READ_LOCK_STATUS = TRUE
|
READ_LOCK_STATUS = TRUE
|
||||||
|
|
||||||
!if $(EDK2_SKIP_PEICORE) == 1
|
!if $(EDK2_SKIP_PEICORE) == 1
|
||||||
INF ArmPlatformPkg/PrePi/PeiMPCore.inf
|
INF ArmPlatformPkg/PrePi/PeiMPCore.inf
|
||||||
!else
|
!else
|
||||||
INF ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
|
INF ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
|
||||||
INF MdeModulePkg/Core/Pei/PeiMain.inf
|
INF MdeModulePkg/Core/Pei/PeiMain.inf
|
||||||
INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf
|
INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf
|
||||||
INF ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
|
INF ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
|
||||||
INF ArmPkg/Drivers/CpuPei/CpuPei.inf
|
INF ArmPkg/Drivers/CpuPei/CpuPei.inf
|
||||||
INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
|
INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
|
||||||
INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
|
INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
|
||||||
INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
|
INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
|
||||||
INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
|
INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
|
FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
|
||||||
SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {
|
SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {
|
||||||
SECTION FV_IMAGE = FVMAIN
|
SECTION FV_IMAGE = FVMAIN
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
#
|
||||||
# Rules are use with the [FV] section's module INF type to define
|
# Rules are use with the [FV] section's module INF type to define
|
||||||
# how an FFS file is created for a given INF file. The following Rule are the default
|
# how an FFS file is created for a given INF file. The following Rule are the default
|
||||||
# rules for the different module type. User can add the customized rules to define the
|
# rules for the different module type. User can add the customized rules to define the
|
||||||
# content of the FFS file.
|
# content of the FFS file.
|
||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
|
|
||||||
############################################################################
|
############################################################################
|
||||||
# Example of a DXE_DRIVER FFS file with a Checksum encapsulation section #
|
# Example of a DXE_DRIVER FFS file with a Checksum encapsulation section #
|
||||||
############################################################################
|
############################################################################
|
||||||
#
|
#
|
||||||
#[Rule.Common.DXE_DRIVER]
|
#[Rule.Common.DXE_DRIVER]
|
||||||
# FILE DRIVER = $(NAMED_GUID) {
|
# FILE DRIVER = $(NAMED_GUID) {
|
||||||
# DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
|
# DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
|
||||||
# COMPRESS PI_STD {
|
# COMPRESS PI_STD {
|
||||||
# GUIDED {
|
# GUIDED {
|
||||||
# PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
|
# PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
|
||||||
# UI STRING="$(MODULE_NAME)" Optional
|
# UI STRING="$(MODULE_NAME)" Optional
|
||||||
# VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
|
# VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
|
||||||
# }
|
# }
|
||||||
# }
|
# }
|
||||||
# }
|
# }
|
||||||
#
|
#
|
||||||
############################################################################
|
############################################################################
|
||||||
|
|
||||||
[Rule.Common.SEC]
|
[Rule.Common.SEC]
|
||||||
FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {
|
FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {
|
||||||
TE TE Align = 32 $(INF_OUTPUT)/$(MODULE_NAME).efi
|
TE TE Align = 32 $(INF_OUTPUT)/$(MODULE_NAME).efi
|
||||||
}
|
}
|
||||||
|
|
||||||
[Rule.Common.PEI_CORE]
|
[Rule.Common.PEI_CORE]
|
||||||
FILE PEI_CORE = $(NAMED_GUID) {
|
FILE PEI_CORE = $(NAMED_GUID) {
|
||||||
TE TE $(INF_OUTPUT)/$(MODULE_NAME).efi
|
TE TE $(INF_OUTPUT)/$(MODULE_NAME).efi
|
||||||
UI STRING ="$(MODULE_NAME)" Optional
|
UI STRING ="$(MODULE_NAME)" Optional
|
||||||
}
|
}
|
||||||
|
|
||||||
[Rule.Common.PEIM]
|
[Rule.Common.PEIM]
|
||||||
FILE PEIM = $(NAMED_GUID) {
|
FILE PEIM = $(NAMED_GUID) {
|
||||||
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
|
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
|
||||||
TE TE $(INF_OUTPUT)/$(MODULE_NAME).efi
|
TE TE $(INF_OUTPUT)/$(MODULE_NAME).efi
|
||||||
UI STRING="$(MODULE_NAME)" Optional
|
UI STRING="$(MODULE_NAME)" Optional
|
||||||
}
|
}
|
||||||
|
|
||||||
[Rule.Common.PEIM.TIANOCOMPRESSED]
|
[Rule.Common.PEIM.TIANOCOMPRESSED]
|
||||||
FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
|
FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
|
||||||
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
|
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
|
||||||
GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
|
GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
|
||||||
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
|
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
|
||||||
UI STRING="$(MODULE_NAME)" Optional
|
UI STRING="$(MODULE_NAME)" Optional
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[Rule.Common.DXE_CORE]
|
[Rule.Common.DXE_CORE]
|
||||||
FILE DXE_CORE = $(NAMED_GUID) {
|
FILE DXE_CORE = $(NAMED_GUID) {
|
||||||
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
|
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
|
||||||
UI STRING="$(MODULE_NAME)" Optional
|
UI STRING="$(MODULE_NAME)" Optional
|
||||||
}
|
}
|
||||||
|
|
||||||
[Rule.Common.UEFI_DRIVER]
|
[Rule.Common.UEFI_DRIVER]
|
||||||
FILE DRIVER = $(NAMED_GUID) {
|
FILE DRIVER = $(NAMED_GUID) {
|
||||||
DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
|
DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
|
||||||
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
|
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
|
||||||
UI STRING="$(MODULE_NAME)" Optional
|
UI STRING="$(MODULE_NAME)" Optional
|
||||||
}
|
}
|
||||||
|
|
||||||
[Rule.Common.DXE_DRIVER]
|
[Rule.Common.DXE_DRIVER]
|
||||||
FILE DRIVER = $(NAMED_GUID) {
|
FILE DRIVER = $(NAMED_GUID) {
|
||||||
DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
|
DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
|
||||||
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
|
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
|
||||||
UI STRING="$(MODULE_NAME)" Optional
|
UI STRING="$(MODULE_NAME)" Optional
|
||||||
}
|
}
|
||||||
|
|
||||||
[Rule.Common.DXE_RUNTIME_DRIVER]
|
[Rule.Common.DXE_RUNTIME_DRIVER]
|
||||||
FILE DRIVER = $(NAMED_GUID) {
|
FILE DRIVER = $(NAMED_GUID) {
|
||||||
DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
|
DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
|
||||||
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
|
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
|
||||||
UI STRING="$(MODULE_NAME)" Optional
|
UI STRING="$(MODULE_NAME)" Optional
|
||||||
}
|
}
|
||||||
|
|
||||||
[Rule.Common.UEFI_APPLICATION]
|
[Rule.Common.UEFI_APPLICATION]
|
||||||
FILE APPLICATION = $(NAMED_GUID) {
|
FILE APPLICATION = $(NAMED_GUID) {
|
||||||
UI STRING ="$(MODULE_NAME)" Optional
|
UI STRING ="$(MODULE_NAME)" Optional
|
||||||
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
|
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
|
||||||
}
|
}
|
||||||
|
|||||||
@ -361,6 +361,15 @@ GetVariableStore (
|
|||||||
PcdGet64 (PcdFlashNvStorageVariableBase64) :
|
PcdGet64 (PcdFlashNvStorageVariableBase64) :
|
||||||
PcdGet32 (PcdFlashNvStorageVariableBase)
|
PcdGet32 (PcdFlashNvStorageVariableBase)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
//
|
||||||
|
// Check if the Firmware Volume is not corrupted
|
||||||
|
//
|
||||||
|
if ((FvHeader->Signature != EFI_FVH_SIGNATURE) || (!CompareGuid (&gEfiSystemNvDataFvGuid, &FvHeader->FileSystemGuid))) {
|
||||||
|
DEBUG ((EFI_D_ERROR, "Firmware Volume for Variable Store is corrupted\n"));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
VariableStoreHeader = (VARIABLE_STORE_HEADER *) ((UINT8 *) FvHeader + FvHeader->HeaderLength);
|
VariableStoreHeader = (VARIABLE_STORE_HEADER *) ((UINT8 *) FvHeader + FvHeader->HeaderLength);
|
||||||
|
|
||||||
if (IndexTable != NULL) {
|
if (IndexTable != NULL) {
|
||||||
|
|||||||
@ -30,6 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||||||
|
|
||||||
#include <Guid/VariableFormat.h>
|
#include <Guid/VariableFormat.h>
|
||||||
#include <Guid/VariableIndexTable.h>
|
#include <Guid/VariableIndexTable.h>
|
||||||
|
#include <Guid/SystemNvDataGuid.h>
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
VariableStoreTypeHob,
|
VariableStoreTypeHob,
|
||||||
|
|||||||
@ -48,6 +48,7 @@
|
|||||||
[Guids]
|
[Guids]
|
||||||
gEfiVariableGuid
|
gEfiVariableGuid
|
||||||
gEfiVariableIndexTableGuid
|
gEfiVariableIndexTableGuid
|
||||||
|
gEfiSystemNvDataFvGuid
|
||||||
|
|
||||||
[Ppis]
|
[Ppis]
|
||||||
gEfiPeiReadOnlyVariable2PpiGuid ## SOMETIMES_PRODUCES (Not for boot mode RECOVERY)
|
gEfiPeiReadOnlyVariable2PpiGuid ## SOMETIMES_PRODUCES (Not for boot mode RECOVERY)
|
||||||
|
|||||||
@ -1153,7 +1153,7 @@ VariableGetBestLanguage (
|
|||||||
|
|
||||||
**/
|
**/
|
||||||
VOID
|
VOID
|
||||||
AutoUpdateLangVariable(
|
AutoUpdateLangVariable (
|
||||||
IN CHAR16 *VariableName,
|
IN CHAR16 *VariableName,
|
||||||
IN VOID *Data,
|
IN VOID *Data,
|
||||||
IN UINTN DataSize
|
IN UINTN DataSize
|
||||||
@ -2463,6 +2463,17 @@ VariableCommonInitialize (
|
|||||||
if (TempVariableStoreHeader == 0) {
|
if (TempVariableStoreHeader == 0) {
|
||||||
TempVariableStoreHeader = (EFI_PHYSICAL_ADDRESS) PcdGet32 (PcdFlashNvStorageVariableBase);
|
TempVariableStoreHeader = (EFI_PHYSICAL_ADDRESS) PcdGet32 (PcdFlashNvStorageVariableBase);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// Check if the Firmware Volume is not corrupted
|
||||||
|
//
|
||||||
|
if ((((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)(TempVariableStoreHeader))->Signature != EFI_FVH_SIGNATURE) ||
|
||||||
|
(!CompareGuid (&gEfiSystemNvDataFvGuid, &((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)(TempVariableStoreHeader))->FileSystemGuid))) {
|
||||||
|
Status = EFI_VOLUME_CORRUPTED;
|
||||||
|
DEBUG ((EFI_D_ERROR, "Firmware Volume for Variable Store is corrupted\n"));
|
||||||
|
goto Done;
|
||||||
|
}
|
||||||
|
|
||||||
VariableStoreBase = TempVariableStoreHeader + \
|
VariableStoreBase = TempVariableStoreHeader + \
|
||||||
(((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)(TempVariableStoreHeader)) -> HeaderLength);
|
(((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)(TempVariableStoreHeader)) -> HeaderLength);
|
||||||
VariableStoreLength = (UINT64) PcdGet32 (PcdFlashNvStorageVariableSize) - \
|
VariableStoreLength = (UINT64) PcdGet32 (PcdFlashNvStorageVariableSize) - \
|
||||||
|
|||||||
@ -37,6 +37,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||||||
#include <Guid/GlobalVariable.h>
|
#include <Guid/GlobalVariable.h>
|
||||||
#include <Guid/EventGroup.h>
|
#include <Guid/EventGroup.h>
|
||||||
#include <Guid/VariableFormat.h>
|
#include <Guid/VariableFormat.h>
|
||||||
|
#include <Guid/SystemNvDataGuid.h>
|
||||||
|
|
||||||
#define VARIABLE_RECLAIM_THRESHOLD (1024)
|
#define VARIABLE_RECLAIM_THRESHOLD (1024)
|
||||||
|
|
||||||
|
|||||||
@ -64,6 +64,7 @@
|
|||||||
gEfiVariableGuid ## PRODUCES ## Configuration Table Guid
|
gEfiVariableGuid ## PRODUCES ## Configuration Table Guid
|
||||||
gEfiGlobalVariableGuid ## PRODUCES ## Variable Guid
|
gEfiGlobalVariableGuid ## PRODUCES ## Variable Guid
|
||||||
gEfiEventVirtualAddressChangeGuid ## PRODUCES ## Event
|
gEfiEventVirtualAddressChangeGuid ## PRODUCES ## Event
|
||||||
|
gEfiSystemNvDataFvGuid ## CONSUMES
|
||||||
|
|
||||||
[Pcd]
|
[Pcd]
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user