From a298afce8a4ef930d9e63cf31acea89f50818572 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Thu, 15 Feb 2007 08:14:57 +0000 Subject: [PATCH] clean up msa files in EdkModulePkg, removed unnecessary library definitions and PCDs. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2398 6f19259b-4bc3-4df7-8a09-765794883524 --- EdkModulePkg/EdkModulePkg.fpd | 334 ++++++++---------- .../Capsule/RuntimeDxe/CapsuleRuntime.msa | 13 +- .../Universal/ConPlatform/Dxe/ConPlatform.msa | 10 +- .../EmuVariable/RuntimeDxe/EmuVariable.msa | 15 +- .../EmuVariable/RuntimeDxe/EmuVariableIpf.msa | 22 +- .../SetupBrowser/Dxe/SetupBrowser.msa | 7 +- .../Universal/Variable/Pei/Variable.msa | 22 +- .../Variable/RuntimeDxe/Variable.msa | 67 +--- .../Variable/RuntimeDxe/VariableIpf.msa | 76 +--- .../WatchdogTimer/Dxe/WatchDogTimer.msa | 14 +- 10 files changed, 182 insertions(+), 398 deletions(-) diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd index f3356420fd..c4ef7723ce 100644 --- a/EdkModulePkg/EdkModulePkg.fpd +++ b/EdkModulePkg/EdkModulePkg.fpd @@ -1490,8 +1490,9 @@ - + + @@ -1518,6 +1519,14 @@ 4 0x80000000 + + PcdReportStatusCodePropertyMask + 0x00000007 + gEfiMdePkgTokenSpaceGuid + UINT8 + 1 + 0x06 + PcdMaximumUnicodeStringLength 0x00000001 @@ -1550,14 +1559,6 @@ 4 10000000 - - PcdReportStatusCodePropertyMask - 0x00000007 - gEfiMdePkgTokenSpaceGuid - UINT8 - 1 - 0x06 - NULL @@ -7669,8 +7670,9 @@ - + + @@ -7697,6 +7699,14 @@ 4 0x80000000 + + PcdReportStatusCodePropertyMask + 0x00000007 + gEfiMdePkgTokenSpaceGuid + UINT8 + 1 + 0x06 + PcdMaximumUnicodeStringLength 0x00000001 @@ -7729,14 +7739,6 @@ 4 10000000 - - PcdReportStatusCodePropertyMask - 0x00000007 - gEfiMdePkgTokenSpaceGuid - UINT8 - 1 - 0x06 - NULL @@ -11872,14 +11874,6 @@ 1 0 - - PcdFSBClock - 0x0000000c - gEfiMdePkgTokenSpaceGuid - UINT32 - 4 - 200000000 - NULL @@ -20217,9 +20211,11 @@ - - + + + + @@ -20254,6 +20250,30 @@ 4 0x80000000 + + PcdComponentNameDisable + 0x0000000d + gEfiMdePkgTokenSpaceGuid + BOOLEAN + 1 + FALSE + + + PcdDriverDiagnosticsDisable + 0x0000000e + gEfiMdePkgTokenSpaceGuid + BOOLEAN + 1 + FALSE + + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + PcdMaximumUnicodeStringLength 0x00000001 @@ -20286,30 +20306,6 @@ 4 10000000 - - PcdComponentNameDisable - 0x0000000d - gEfiMdePkgTokenSpaceGuid - BOOLEAN - 1 - FALSE - - - PcdDriverDiagnosticsDisable - 0x0000000e - gEfiMdePkgTokenSpaceGuid - BOOLEAN - 1 - FALSE - - - PcdUefiLibMaxPrintBufferSize - 0x101 - gEfiMdePkgTokenSpaceGuid - UINT32 - 4 - 320 - NULL @@ -20327,9 +20323,11 @@ - - + + + + @@ -20364,6 +20362,30 @@ 4 0x80000000 + + PcdComponentNameDisable + 0x0000000d + gEfiMdePkgTokenSpaceGuid + BOOLEAN + 1 + FALSE + + + PcdDriverDiagnosticsDisable + 0x0000000e + gEfiMdePkgTokenSpaceGuid + BOOLEAN + 1 + FALSE + + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + PcdMaximumUnicodeStringLength 0x00000001 @@ -20396,30 +20418,6 @@ 4 10000000 - - PcdComponentNameDisable - 0x0000000d - gEfiMdePkgTokenSpaceGuid - BOOLEAN - 1 - FALSE - - - PcdDriverDiagnosticsDisable - 0x0000000e - gEfiMdePkgTokenSpaceGuid - BOOLEAN - 1 - FALSE - - - PcdUefiLibMaxPrintBufferSize - 0x101 - gEfiMdePkgTokenSpaceGuid - UINT32 - 4 - 320 - NULL @@ -20437,9 +20435,11 @@ - - + + + + @@ -20474,6 +20474,30 @@ 4 0x80000000 + + PcdComponentNameDisable + 0x0000000d + gEfiMdePkgTokenSpaceGuid + BOOLEAN + 1 + FALSE + + + PcdDriverDiagnosticsDisable + 0x0000000e + gEfiMdePkgTokenSpaceGuid + BOOLEAN + 1 + FALSE + + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + PcdMaximumUnicodeStringLength 0x00000001 @@ -20506,30 +20530,6 @@ 4 10000000 - - PcdComponentNameDisable - 0x0000000d - gEfiMdePkgTokenSpaceGuid - BOOLEAN - 1 - FALSE - - - PcdDriverDiagnosticsDisable - 0x0000000e - gEfiMdePkgTokenSpaceGuid - BOOLEAN - 1 - FALSE - - - PcdUefiLibMaxPrintBufferSize - 0x101 - gEfiMdePkgTokenSpaceGuid - UINT32 - 4 - 320 - NULL @@ -20547,9 +20547,11 @@ - - + + + + @@ -20584,6 +20586,30 @@ 4 0x80000000 + + PcdComponentNameDisable + 0x0000000d + gEfiMdePkgTokenSpaceGuid + BOOLEAN + 1 + FALSE + + + PcdDriverDiagnosticsDisable + 0x0000000e + gEfiMdePkgTokenSpaceGuid + BOOLEAN + 1 + FALSE + + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + PcdMaximumUnicodeStringLength 0x00000001 @@ -20616,30 +20642,6 @@ 4 10000000 - - PcdComponentNameDisable - 0x0000000d - gEfiMdePkgTokenSpaceGuid - BOOLEAN - 1 - FALSE - - - PcdDriverDiagnosticsDisable - 0x0000000e - gEfiMdePkgTokenSpaceGuid - BOOLEAN - 1 - FALSE - - - PcdUefiLibMaxPrintBufferSize - 0x101 - gEfiMdePkgTokenSpaceGuid - UINT32 - 4 - 320 - NULL @@ -20730,30 +20732,6 @@ 4 10000000 - - PcdDebugPropertyMask - 0x00000005 - gEfiMdePkgTokenSpaceGuid - UINT8 - 1 - 0x0f - - - PcdDebugClearMemoryValue - 0x00000008 - gEfiMdePkgTokenSpaceGuid - UINT8 - 1 - 0xAF - - - PcdDebugPrintErrorLevel - 0x00000006 - gEfiMdePkgTokenSpaceGuid - UINT32 - 4 - 0x80000000 - PcdUefiLibMaxPrintBufferSize 0x101 @@ -20769,8 +20747,6 @@ - - @@ -20791,8 +20767,18 @@ + + + + PcdUefiLibMaxPrintBufferSize + 0x101 + gEfiMdePkgTokenSpaceGuid + UINT32 + 4 + 320 + PcdMaximumUnicodeStringLength 0x00000001 @@ -20825,40 +20811,12 @@ 4 10000000 - - PcdDebugPropertyMask - 0x00000005 - gEfiMdePkgTokenSpaceGuid - UINT8 - 1 - 0x0f - - - PcdDebugClearMemoryValue - 0x00000008 - gEfiMdePkgTokenSpaceGuid - UINT8 - 1 - 0xAF - - - PcdDebugPrintErrorLevel - 0x00000006 - gEfiMdePkgTokenSpaceGuid - UINT32 - 4 - 0x80000000 - - - PcdUefiLibMaxPrintBufferSize - 0x101 - gEfiMdePkgTokenSpaceGuid - UINT32 - 4 - 320 - + + + + diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa index ed3af3f3a4..e4d527b084 100644 --- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa +++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa @@ -1,5 +1,5 @@ - + CapsuleRuntime DXE_RUNTIME_DRIVER @@ -7,7 +7,7 @@ 1.0 Component description file for Capsule module. CapsuleRuntime module provides capsule runtime services - Copyright (c) 2006, Intel Corporation + Copyright (c) 2006 - 2007, Intel Corporation All rights reserved. This program and the accompanying materials 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 @@ -22,12 +22,6 @@ CapsuleRuntime - - BaseLib - - - UefiLib - UefiDriverEntryPoint @@ -69,9 +63,6 @@ gEfiCapsuleVendorGuid - - gEfiCapsuleGuid - EFI_SPECIFICATION_VERSION 0x00020000 diff --git a/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.msa b/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.msa index 35e9f5807e..e6fe04f280 100644 --- a/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.msa +++ b/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.msa @@ -1,5 +1,5 @@ - + ConPlatform UEFI_DRIVER @@ -7,7 +7,7 @@ 1.0 Console Platfrom Driver Console Platfrom DXE Driver, install Console protocols - Copyright (c) 2006, Intel Corporation + Copyright (c) 2006 - 2007, Intel Corporation All rights reserved. This program and the accompanying materials 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 @@ -34,15 +34,9 @@ UefiLib - - BaseLib - BaseMemoryLib - - MemoryAllocationLib - UefiBootServicesTableLib diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa index 9c19e381e9..a4ae482a0e 100644 --- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa +++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa @@ -7,7 +7,7 @@ 1.0 Emulation Variable for EFI_RUNTIME_SERVICES. This module provides three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName - Copyright (c) 2006, Intel Corporation + Copyright (c) 2006 - 2007, Intel Corporation All rights reserved. This program and the accompanying materials 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 @@ -22,9 +22,6 @@ EmuVariable - - BaseLib - BaseMemoryLib @@ -55,16 +52,10 @@ - - gEfiVariableWriteArchProtocolGuid - - - gEfiVariableArchProtocolGuid - - + gEfiVariableWriteArchProtocolGuid - + gEfiVariableArchProtocolGuid diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa index df6496d0ad..770fa78d68 100644 --- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa +++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa @@ -7,7 +7,7 @@ 1.0 Emulation Variable for EFI_RUNTIME_SERVICES. This module provides three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName - Copyright (c) 2006, Intel Corporation + Copyright (c) 2006 - 2007, Intel Corporation All rights reserved. This program and the accompanying materials 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 @@ -22,9 +22,6 @@ EmuVariableIpf - - BaseLib - BaseMemoryLib @@ -40,7 +37,7 @@ UefiDriverEntryPoint - + EdkDxeSalLib @@ -58,24 +55,9 @@ - - gEfiVariableWriteArchProtocolGuid - - - gEfiVariableArchProtocolGuid - - - gEfiVariableWriteArchProtocolGuid - - - gEfiVariableArchProtocolGuid - gEfiExtendedSalVariableServicesProtocolGuid - - gEfiExtendedSalBootServiceProtocolGuid - EFI_SPECIFICATION_VERSION 0x00020000 diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa index b6b6fc6cc5..d3a0bd3229 100644 --- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa +++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa @@ -1,5 +1,5 @@ - + SetupBrowser DXE_DRIVER @@ -7,7 +7,7 @@ 1.0 Component description file for SetupBrowser module. This driver initializes Setup for the brower and installs FormBrowser protocol. - Copyright (c) 2006, Intel Corporation + Copyright (c) 2006 - 2007, Intel Corporation All rights reserved. This program and the accompanying materials 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 @@ -37,9 +37,6 @@ UefiDriverEntryPoint - - EdkIfrSupportLib - PrintLib diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.msa b/EdkModulePkg/Universal/Variable/Pei/Variable.msa index 98c7e9c35a..6bb518a1db 100644 --- a/EdkModulePkg/Universal/Variable/Pei/Variable.msa +++ b/EdkModulePkg/Universal/Variable/Pei/Variable.msa @@ -1,5 +1,5 @@  - + PeiVariable PEIM @@ -7,7 +7,7 @@ 1.0 Component description file for PeiVariable module. Framework PEIM to provide the Variable functionality. - Copyright (c) 2006, Intel Corporation + Copyright (c) 2006 - 2007, Intel Corporation All rights reserved. This program and the accompanying materials 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 @@ -31,15 +31,12 @@ PeimEntryPoint - - PeiServicesLib - HobLib PcdLib - + Variable.h @@ -55,9 +52,6 @@ - - gPeiFlashMapPpiGuid - gEfiPeiReadOnlyVariablePpiGuid @@ -73,10 +67,8 @@ PcdFlashNvStorageVariableBase gEfiGenericPlatformTokenSpaceGuid - - The driver gets the Variable store base address from this PCD. This base address point to - an EFI_FIRMWARE_VOLUMN_HEADER struct. - - - + The driver gets the Variable store base address from this PCD. This base address point to + an EFI_FIRMWARE_VOLUMN_HEADER struct. + + \ No newline at end of file diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa index 5bfc17faa9..50a53ed19e 100644 --- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa +++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa @@ -1,5 +1,5 @@ - + Variable DXE_RUNTIME_DRIVER @@ -7,7 +7,7 @@ 1.0 Component description file for Variable module. This module installs three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName. - Copyright (c) 2006, Intel Corporation + Copyright (c) 2006 - 2007, Intel Corporation All rights reserved. This program and the accompanying materials 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 @@ -24,12 +24,6 @@ PcdLib - - - BaseLib - - - UefiLib UefiDriverEntryPoint @@ -43,9 +37,6 @@ DebugLib - - HobLib - BaseMemoryLib @@ -69,24 +60,6 @@ - - gEfiVariableArchProtocolGuid - - - gEfiVariableWriteArchProtocolGuid - - - gEfiFaultTolerantWriteLiteProtocolGuid - - - gEfiCpuIoProtocolGuid - - - gEfiFvbExtensionProtocolGuid - - - gEfiFirmwareVolumeBlockProtocolGuid - gEfiVariableArchProtocolGuid @@ -96,30 +69,10 @@ gEfiFaultTolerantWriteLiteProtocolGuid - - gEfiCpuIoProtocolGuid - - - gEfiFvbExtensionProtocolGuid - gEfiFirmwareVolumeBlockProtocolGuid - - - gEfiFlashMapHobGuid - - - - - gEfiAlternateFvBlockGuid - - EFI_SPECIFICATION_VERSION 0x00020000 EDK_RELEASE_VERSION 0x00020000 @@ -134,17 +87,13 @@ PcdFlashNvStorageVariableBase gEfiGenericPlatformTokenSpaceGuid - - The driver gets the Variable store base address from this PCD. This base address point to - an EFI_FIRMWARE_VOLUMN_HEADER struct. - - + The driver gets the Variable store base address from this PCD. This base address point to + an EFI_FIRMWARE_VOLUMN_HEADER struct. + PcdFlashNvStorageVariableSize gEfiGenericPlatformTokenSpaceGuid - - The driver gets the NvStorage Variable Size from this PCD. - - - + The driver gets the NvStorage Variable Size from this PCD. + + \ No newline at end of file diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa index 37390d6038..68c51c07ce 100644 --- a/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa +++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa @@ -1,5 +1,5 @@ - + VariableIpf DXE_SAL_DRIVER @@ -7,7 +7,7 @@ 1.0 Component description file for Variable module. This module installs three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName. - Copyright (c) 2006, Intel Corporation + Copyright (c) 2006 - 2007, Intel Corporation All rights reserved. This program and the accompanying materials 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 @@ -24,12 +24,6 @@ PcdLib - - - BaseLib - - - UefiLib UefiDriverEntryPoint @@ -43,9 +37,6 @@ DebugLib - - HobLib - BaseMemoryLib @@ -72,63 +63,16 @@ - - gEfiVariableArchProtocolGuid - - - gEfiVariableWriteArchProtocolGuid - gEfiFaultTolerantWriteLiteProtocolGuid - - gEfiCpuIoProtocolGuid - - - gEfiFvbExtensionProtocolGuid - gEfiFirmwareVolumeBlockProtocolGuid - - gEfiVariableArchProtocolGuid - - - gEfiVariableWriteArchProtocolGuid - - - gEfiFaultTolerantWriteLiteProtocolGuid - - - gEfiCpuIoProtocolGuid - - - gEfiFvbExtensionProtocolGuid - - - gEfiFirmwareVolumeBlockProtocolGuid - - - gEfiExtendedSalBootServiceProtocolGuid - gEfiExtendedSalVariableServicesProtocolGuid - - - gEfiFlashMapHobGuid - - - - - gEfiAlternateFvBlockGuid - - EFI_SPECIFICATION_VERSION 0x00020000 EDK_RELEASE_VERSION 0x00020000 @@ -143,17 +87,13 @@ PcdFlashNvStorageVariableBase gEfiGenericPlatformTokenSpaceGuid - - The driver gets the Variable store base address from this PCD. This base address point to - an EFI_FIRMWARE_VOLUMN_HEADER struct. - - + The driver gets the Variable store base address from this PCD. This base address point to + an EFI_FIRMWARE_VOLUMN_HEADER struct. + PcdFlashNvStorageVariableSize gEfiGenericPlatformTokenSpaceGuid - - The driver gets the NvStorage Variable Size from this PCD. - - - + The driver gets the NvStorage Variable Size from this PCD. + + \ No newline at end of file diff --git a/EdkModulePkg/Universal/WatchdogTimer/Dxe/WatchDogTimer.msa b/EdkModulePkg/Universal/WatchdogTimer/Dxe/WatchDogTimer.msa index 03ea549839..9231ae543d 100644 --- a/EdkModulePkg/Universal/WatchdogTimer/Dxe/WatchDogTimer.msa +++ b/EdkModulePkg/Universal/WatchdogTimer/Dxe/WatchDogTimer.msa @@ -1,5 +1,5 @@ - + WatchDogTimer DXE_DRIVER @@ -7,7 +7,7 @@ 1.0 Component description file for WatchDogTimer module. Generic watchdog timer implemenetation using EFI APIs. - Copyright (c) 2006, Intel Corporation + Copyright (c) 2006 - 2007, Intel Corporation All rights reserved. This program and the accompanying materials 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 @@ -31,12 +31,6 @@ ReportStatusCodeLib - - UefiLib - - - BaseLib - UefiBootServicesTableLib @@ -51,12 +45,8 @@ - - - gEfiStatusCodeRuntimeProtocolGuid - gEfiWatchdogTimerArchProtocolGuid -- 2.39.2