summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Nt32Pkg/BootModePei/BootModePei.inf8
-rw-r--r--Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf8
-rw-r--r--Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf4
-rw-r--r--Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf8
-rw-r--r--Nt32Pkg/Library/DxeNt32PeCoffExtraActionLib/DxeNt32PeCoffExtraActionLib.inf8
-rw-r--r--Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf8
-rw-r--r--Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf10
-rw-r--r--Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf8
-rw-r--r--Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf8
-rw-r--r--Nt32Pkg/Library/PeiNt32PeCoffExtraActionLib/PeiNt32PeCoffExtraActionLib.inf8
-rw-r--r--Nt32Pkg/MetronomeDxe/MetronomeDxe.inf8
-rw-r--r--Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf4
-rw-r--r--Nt32Pkg/Nt32Pkg.dec18
-rw-r--r--Nt32Pkg/Nt32Pkg.dsc8
-rw-r--r--Nt32Pkg/Nt32Pkg.fdf3
-rw-r--r--Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf8
-rw-r--r--Nt32Pkg/ResetRuntimeDxe/ResetRuntimeDxe.inf8
-rw-r--r--Nt32Pkg/Sec/SecMain.inf6
-rw-r--r--Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf8
-rw-r--r--Nt32Pkg/StallPei/StallPei.inf8
-rw-r--r--Nt32Pkg/TimerDxe/TimerDxe.inf8
-rw-r--r--Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf8
-rw-r--r--Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIoDxe.inf8
-rw-r--r--Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf10
-rw-r--r--Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf4
-rw-r--r--Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf10
-rw-r--r--Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf8
-rw-r--r--Nt32Pkg/WinNtOemHookStatusCodeHandlerDxe/WinNtOemHookStatusCodeHandlerDxe.inf8
-rw-r--r--Nt32Pkg/WinNtOemHookStatusCodeHandlerPei/WinNtOemHookStatusCodeHandlerPei.inf8
-rw-r--r--Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf4
-rw-r--r--Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf8
-rw-r--r--Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf8
-rw-r--r--Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocolPei.inf8
-rw-r--r--OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf8
-rw-r--r--OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf10
-rw-r--r--OptionRomPkg/OptionRomPkg.dec14
-rw-r--r--OptionRomPkg/OptionRomPkg.dsc14
-rw-r--r--OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf8
-rwxr-xr-xOvmfPkg/AcpiTables/AcpiTables.inf8
-rw-r--r--OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf4
-rwxr-xr-xOvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.inf8
-rw-r--r--OvmfPkg/Library/EmuVariableFvbLib/EmuVariableFvbLib.inf8
-rw-r--r--OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf8
-rw-r--r--OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf8
-rw-r--r--OvmfPkg/Library/PlatformFvbLibNull/PlatformFvbLibNull.inf8
-rw-r--r--OvmfPkg/Library/SecExtractGuidedSectionLib/SecExtractGuidedSectionLib.inf10
-rw-r--r--OvmfPkg/OvmfPkg.dec8
-rw-r--r--OvmfPkg/OvmfPkg.fdf4
-rw-r--r--OvmfPkg/OvmfPkgIa32.dsc18
-rw-r--r--OvmfPkg/OvmfPkgIa32X64.dsc16
-rw-r--r--OvmfPkg/OvmfPkgIa32X64.fdf4
-rw-r--r--OvmfPkg/OvmfPkgX64.dsc18
-rw-r--r--OvmfPkg/PlatformPei/PlatformPei.inf4
-rw-r--r--OvmfPkg/Sec/SecMain.inf6
-rw-r--r--PcAtChipsetPkg/8254TimerDxe/8254Timer.inf8
-rw-r--r--PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf4
-rwxr-xr-xPcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf8
-rw-r--r--PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf6
-rw-r--r--PcAtChipsetPkg/KbcResetDxe/Reset.inf4
-rw-r--r--PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf8
-rw-r--r--PcAtChipsetPkg/PcAtChipsetPkg.dec10
-rw-r--r--PcAtChipsetPkg/PcAtChipsetPkg.dsc10
-rw-r--r--PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf6
-rwxr-xr-xPcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf6
-rw-r--r--ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf6
-rw-r--r--ShellPkg/Application/ShellExecTestApp/SA.inf6
-rw-r--r--ShellPkg/Application/ShellLibTestApp/SA3.inf6
-rw-r--r--ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf6
-rw-r--r--ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf8
-rw-r--r--ShellPkg/Library/BaseSortLib/BaseSortLib.inf10
-rw-r--r--ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf8
-rw-r--r--ShellPkg/Library/UefiShellLib/UefiShellLib.inf8
-rw-r--r--ShellPkg/Library/UefiSortLib/UefiSortLib.inf10
-rw-r--r--ShellPkg/ShellPkg.dec10
-rw-r--r--ShellPkg/ShellPkg.dsc12
-rw-r--r--UefiCpuPkg/CpuDxe/CpuDxe.inf6
-rw-r--r--UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf4
-rw-r--r--UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf4
-rw-r--r--UefiCpuPkg/CpuIoPei/CpuIoPei.inf4
-rw-r--r--UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf6
-rw-r--r--UefiCpuPkg/Library/MtrrLib/MtrrLib.inf4
-rw-r--r--UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf6
-rw-r--r--UefiCpuPkg/UefiCpuPkg.dsc8
-rw-r--r--UnixPkg/BootModePei/BootModePei.inf8
-rw-r--r--UnixPkg/CpuRuntimeDxe/Cpu.inf8
-rw-r--r--UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf4
-rw-r--r--UnixPkg/Library/DxeUnixLib/DxeUnixLib.inf8
-rw-r--r--UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf8
-rw-r--r--UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.inf8
-rw-r--r--UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/EdkUnixPeiPeCoffGetEntryPointLib.inf8
-rw-r--r--UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf8
-rw-r--r--UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.inf8
-rw-r--r--UnixPkg/Library/UnixBdsLib/PlatformBds.inf10
-rw-r--r--UnixPkg/Library/UnixPeCoffLoaderLib/UnixPeCoffLoaderLib.inf8
-rw-r--r--UnixPkg/MetronomeDxe/Metronome.inf8
-rw-r--r--UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf4
-rw-r--r--UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf8
-rw-r--r--UnixPkg/ResetRuntimeDxe/Reset.inf8
-rw-r--r--UnixPkg/Sec/SecMain.inf12
-rw-r--r--UnixPkg/TimerDxe/Timer.inf8
-rw-r--r--UnixPkg/UnixAutoScanPei/UnixAutoScan.inf8
-rw-r--r--UnixPkg/UnixBlockIoDxe/UnixBlockIo.inf8
-rw-r--r--UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf10
-rw-r--r--UnixPkg/UnixConsoleDxe/UnixConsole.inf8
-rw-r--r--UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf4
-rw-r--r--UnixPkg/UnixFlashMapPei/FlashMap.inf10
-rw-r--r--UnixPkg/UnixPkg.dec22
-rw-r--r--UnixPkg/UnixPkg.dsc10
-rw-r--r--UnixPkg/UnixPkg.fdf3
-rw-r--r--UnixPkg/UnixSerialIoDxe/UnixSerialIo.inf8
-rw-r--r--UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.inf8
-rw-r--r--UnixPkg/UnixThunkDxe/UnixThunk.inf8
-rw-r--r--UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.inf8
-rw-r--r--UnixPkg/UnixUgaDxe/UnixUga.inf8
114 files changed, 456 insertions, 454 deletions
diff --git a/Nt32Pkg/BootModePei/BootModePei.inf b/Nt32Pkg/BootModePei/BootModePei.inf
index 074e7e75fe..9a7dfbd173 100644
--- a/Nt32Pkg/BootModePei/BootModePei.inf
+++ b/Nt32Pkg/BootModePei/BootModePei.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Component description file for BootMode module
#
# This module provides platform specific function to detect boot mode.
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
BootModePei.c
diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
index 2d8333bafa..dbab07ecaf 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Component description file for Cpu module.
#
# This CPU module abstracts the interrupt subsystem of a platform and the CPU-specific setjump-long pair.
-# Copyright (c) 2006 - 2009, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
CpuIo.c
Cpu.c
CpuDriver.h
diff --git a/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf b/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
index 5533434a9a..0aaad1781f 100644
--- a/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
+++ b/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Component description file for Nt32 Fimware Volume Block DXE driver module.
#
# This DXE runtime driver implements and produces the Fimware Volue Block Protocol on
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf
index 915307b787..fc3d4ed1df 100644
--- a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf
+++ b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
# Memory Status Code Library for UEFI drivers
#
# Lib to provide memory journal status code reporting Routines
#
-# Copyright (c) 2007, Intel Corporation
+# Copyright (c) 2007 - 2010, 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
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -34,7 +34,7 @@
# HOB Guid C Name: gEfiWinNtThunkProtocolGuid Hob Type: GUID_EXTENSION
#
-[Sources.common]
+[Sources]
Nt32OemHookStatusCodeLib.c
diff --git a/Nt32Pkg/Library/DxeNt32PeCoffExtraActionLib/DxeNt32PeCoffExtraActionLib.inf b/Nt32Pkg/Library/DxeNt32PeCoffExtraActionLib/DxeNt32PeCoffExtraActionLib.inf
index cd0d8b32bf..5d421f4374 100644
--- a/Nt32Pkg/Library/DxeNt32PeCoffExtraActionLib/DxeNt32PeCoffExtraActionLib.inf
+++ b/Nt32Pkg/Library/DxeNt32PeCoffExtraActionLib/DxeNt32PeCoffExtraActionLib.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# PeCoff extra action libary for DXE phase that run NT32 emulator.
#
# Lib to provide memory journal status code reporting Routines
-# Copyright (c) 2007, Intel Corporation
+# Copyright (c) 2007 - 2010, 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
@@ -13,7 +13,7 @@
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -33,7 +33,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
DxeNt32PeCoffExtraActionLib.c
[Packages]
diff --git a/Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf b/Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf
index 1e487349b9..b9e8b5c9be 100644
--- a/Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf
+++ b/Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# A library to produce the global variable 'gWinNt'
#
# This library contains a single global variable 'gWinNt' along with a constructor to initialize that global.
-# Copyright (c) 2006 - 2007, Intel Corporation.
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
BASE_NAME = DxeWinNtLib
@@ -33,7 +33,7 @@
# HOB Guid C Name: gEfiWinNtThunkProtocolGuid Hob Type: GUID_EXTENSION
#
-[Sources.common]
+[Sources]
WinNtLib.c
[Packages]
diff --git a/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf b/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf
index 3708d679cb..7b2c7e2991 100644
--- a/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf
+++ b/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Component name for module GenericBdsLib
#
# FIX ME!
-# Copyright (c) 2007, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
#
# All rights reserved. This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -32,7 +32,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
BdsPlatform.c
PlatformData.c
BdsPlatform.h
@@ -56,7 +56,7 @@
[Guids]
gEfiWinNtSystemConfigGuid
-[Pcd.common]
+[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
diff --git a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf b/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf
index 8ca534fd1f..4095c741b0 100644
--- a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf
+++ b/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Component description file for the EdkNt32PeiPeCoffGetEntryPointLib library.
#
# PeCoffGetEntryPointLib library class for NT32 instance implemented by use NTPeiLoadFile PPI.
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
PeCoffGetEntryPoint.c
[Packages]
diff --git a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf
index 984888317c..ee305050d5 100644
--- a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf
+++ b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Memory Status Code Library for UEFI drivers
#
# Lib to provide memory journal status code reporting Routines
-# Copyright (c) 2007, Intel Corporation
+# Copyright (c) 2007 - 2010, 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
@@ -13,7 +13,7 @@
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -32,7 +32,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
Nt32OemHookStatusCodeLib.c
diff --git a/Nt32Pkg/Library/PeiNt32PeCoffExtraActionLib/PeiNt32PeCoffExtraActionLib.inf b/Nt32Pkg/Library/PeiNt32PeCoffExtraActionLib/PeiNt32PeCoffExtraActionLib.inf
index 8764ee803b..762401c300 100644
--- a/Nt32Pkg/Library/PeiNt32PeCoffExtraActionLib/PeiNt32PeCoffExtraActionLib.inf
+++ b/Nt32Pkg/Library/PeiNt32PeCoffExtraActionLib/PeiNt32PeCoffExtraActionLib.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# PeCoff extra action libary for Pei phase that run NT32 emulator.
#
# Lib to provide memory journal status code reporting Routines
-# Copyright (c) 2007, Intel Corporation
+# Copyright (c) 2007 - 2010, 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
@@ -13,7 +13,7 @@
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
PeiNt32PeCoffExtraActionLib.c
[Packages]
diff --git a/Nt32Pkg/MetronomeDxe/MetronomeDxe.inf b/Nt32Pkg/MetronomeDxe/MetronomeDxe.inf
index 3bd02dd4df..9dafe5549b 100644
--- a/Nt32Pkg/MetronomeDxe/MetronomeDxe.inf
+++ b/Nt32Pkg/MetronomeDxe/MetronomeDxe.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# NT Emulation Metronome Architectural Protocol Driver as defined in DXE CIS
#
# This metronome module simulates metronome by Sleep WinAPI.
-# Copyright (c) 2006 - 2009, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
Metronome.h
Metronome.c
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
index f5772724e6..d29dc86924 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Misc Sub class driver
#
# Parses the MiscSubclassDataTable and reports any generated data to the DataHub.
@@ -15,7 +15,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/Nt32Pkg/Nt32Pkg.dec b/Nt32Pkg/Nt32Pkg.dec
index 8ead639695..a13e51e054 100644
--- a/Nt32Pkg/Nt32Pkg.dec
+++ b/Nt32Pkg/Nt32Pkg.dec
@@ -12,7 +12,7 @@
# |- Include : Include files for Nt32Pkg
#
#
-# Copyright (c) 2007, Intel Corporation. <BR>
+# Copyright (c) 2007 - 2010, Intel Corporation. <BR>
#
# All rights reserved. This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -36,13 +36,13 @@
##
# Include Paths that are provided by this package.
#
-[Includes.common]
+[Includes]
Include # Root include for the package
##
# LibraryClasses provided by Nt32Pkg for all architecture.
#
-[LibraryClasses.common]
+[LibraryClasses]
##
# Expose EFI_WIN_NT_THUNK_PROTOCOL's interface, this protocol wrapper all
# necessary Window API used by Nt32 enumlation environment.
@@ -51,7 +51,7 @@
##
# Guids provided by Nt32Pkg for all architecture.
#
-[Guids.common]
+[Guids]
gEfiWinNtPassThroughGuid = { 0xCC664EB8, 0x3C24, 0x4086, { 0xB6, 0xF6, 0x34, 0xE8, 0x56, 0xBC, 0xE3, 0x6E }}
gEfiWinNtConsoleGuid = { 0xBA73672C, 0xA5D3, 0x11D4, { 0xBD, 0x00, 0x00, 0x80, 0xC7, 0x3C, 0x88, 0x81 }}
gEfiWinNtUgaGuid = { 0xAB248E99, 0xABE1, 0x11D4, { 0xBD, 0x0D, 0x00, 0x80, 0xC7, 0x3C, 0x88, 0x81 }}
@@ -66,7 +66,7 @@
##
# Protocols provided by Nt32Pkg for all architecture.
#
-[Protocols.common]
+[Protocols]
gWinNtBusDriverGuid = { 0x0419f582, 0x0625, 0x4531, { 0x8a, 0x33, 0x85, 0xa9, 0x96, 0x5c, 0x95, 0xbc }}
gEfiWinNtThunkProtocolGuid = { 0x58C518B1, 0x76F3, 0x11D4, { 0xBC, 0xEA, 0x00, 0x80, 0xC7, 0x3C, 0x88, 0x81 }}
gEfiWinNtIoProtocolGuid = { 0x96EB4AD6, 0xA32A, 0x11D4, { 0xBC, 0xFD, 0x00, 0x80, 0xC7, 0x3C, 0x88, 0x81 }}
@@ -74,7 +74,7 @@
##
# Ppis provide by Nt32Pkg for all architecture
#
-[Ppis.common]
+[Ppis]
## This PPI wrapper all necessary windows API used by PEI driver in NT32 environment.
gPeiNtThunkPpiGuid = { 0x98c281e5, 0xf906, 0x43dd, { 0xa9, 0x2b, 0xb0, 0x03, 0xbf, 0x27, 0x65, 0xda }}
## This PPI provide system memory scan interface which simulate real platform perform
@@ -90,7 +90,7 @@
# "Fixed At Build" type PCD can be seems as constant and its value will not be
# changed after customized in DSC file.
#
-[PcdsFixedAtBuild.common]
+[PcdsFixedAtBuild]
gEfiNt32PkgTokenSpaceGuid.PcdWinNtBootMode|1|UINT32|0x00001006
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareVolume|L"..\\Fv\\Fv_Recovery.fd"|VOID*|0x00001009
gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySizeForSecMain|L"64!64"|VOID*|0x0000100c
@@ -112,7 +112,7 @@
# "Dynamic" type PCD will be managed by PCD database driver at execution time.
# its value can be modified by PCD_PPI/PCD_PROTOCOL at execution time.
#
-[PcdsDynamic.common]
+[PcdsDynamic]
gEfiNt32PkgTokenSpaceGuid.PcdWinNtPhysicalDisk|L"E:RW;245760;512"|VOID*|0x00001000
gEfiNt32PkgTokenSpaceGuid.PcdWinNtVirtualDisk|L"FW;40960;512"|VOID*|0x00001001
gEfiNt32PkgTokenSpaceGuid.PcdWinNtSerialPort|L"COM1!COM2"|VOID*|0x00001002
@@ -127,7 +127,7 @@
# stored in PE file data section of module. This type PCD mainly is designed for
# binary module.
#
-[PcdsPatchableInModule.common]
+[PcdsPatchableInModule]
gEfiNt32PkgTokenSpaceGuid.PcdWinNtBootMode|1|UINT32|0x00001006
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareVolume|L"..\\Fv\\Fv_Recovery.fd"|VOID*|0x00001009
gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySizeForSecMain|L"64!64"|VOID*|0x0000100c
diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index e8aca5d361..8c70e06467 100644
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# EFI/Framework Emulation Platform with UEFI HII interface supported.
#
# The Emulation Platform can be used to debug individual modules, prior to creating
@@ -14,7 +14,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
################################################################################
#
@@ -48,7 +48,7 @@
#
################################################################################
-[LibraryClasses.common]
+[LibraryClasses]
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
@@ -226,7 +226,7 @@
#
################################################################################
-[PcdsFeatureFlag.common]
+[PcdsFeatureFlag]
gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|FALSE
gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|FALSE
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|TRUE
diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index 9b0c38d3b6..49d20e6cad 100644
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -1,6 +1,7 @@
+## @file
# This is NT32 FDF file with UEFI HII features enabled
#
-# Copyright (c) 2007 - 2009, Intel Corporation
+# Copyright (c) 2007 - 2010, 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
diff --git a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
index f3c7f24e31..c2e6640705 100644
--- a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
+++ b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# NT Emulation Real time clock Architectural Protocol Driver as defined in TIANO
#
# This real time clock module simulates virtual device by time WinAPI.
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
RealTimeClock.c
[Packages]
diff --git a/Nt32Pkg/ResetRuntimeDxe/ResetRuntimeDxe.inf b/Nt32Pkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
index 93e384738a..89a3c932b7 100644
--- a/Nt32Pkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
+++ b/Nt32Pkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# NT Emulation Reset Architectural Protocol Driver as defined in TIANO
#
# This Reset module simulates system reset by process exit on NT.
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
reset.c
[Packages]
diff --git a/Nt32Pkg/Sec/SecMain.inf b/Nt32Pkg/Sec/SecMain.inf
index 1b10a62d75..e3ba8bbdb2 100644
--- a/Nt32Pkg/Sec/SecMain.inf
+++ b/Nt32Pkg/Sec/SecMain.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Entry Point of NT32 Emulator
#
# Main executable file of NT32 Emulator that loads PEI core after initialization finished.
@@ -11,7 +11,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -62,7 +62,7 @@
gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySizeForSecMain
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareVolume
-[BuildOptions.common]
+[BuildOptions]
MSFT:*_*_IA32_DLINK_FLAGS == /out:"$(BIN_DIR)\SecMain.exe" /base:0x10000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"$(VCINSTALLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib
MSFT:*_*_IA32_CC_FLAGS == /nologo /W4 /WX /Gy /c /D UNICODE /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE
MSFT:*_*_IA32_PP_FLAGS == /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
diff --git a/Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf b/Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf
index 6fc345dd34..00dd47bed4 100644
--- a/Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf
+++ b/Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
# Component name for module SnpNt32Dxe
#
-# Copyright (c) 2007, Intel Corporation.
+# Copyright (c) 2007 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
ComponentName.c
SnpNt32.h
SnpNt32.c
diff --git a/Nt32Pkg/StallPei/StallPei.inf b/Nt32Pkg/StallPei/StallPei.inf
index 69a0812933..7b5a6df91b 100644
--- a/Nt32Pkg/StallPei/StallPei.inf
+++ b/Nt32Pkg/StallPei/StallPei.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
# EFI_PEI_STALL implementation for NT32 simulation environment.
#
-# Copyright (c) 2009, Intel Corporation
+# Copyright (c) 2009 - 2010, 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
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -28,7 +28,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
Stall.c
[Packages]
diff --git a/Nt32Pkg/TimerDxe/TimerDxe.inf b/Nt32Pkg/TimerDxe/TimerDxe.inf
index 12edfde81f..96b69cad70 100644
--- a/Nt32Pkg/TimerDxe/TimerDxe.inf
+++ b/Nt32Pkg/TimerDxe/TimerDxe.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
# NT Emulation Timer Architectural Protocol Driver as defined in DXE CIS
#
# This Timer module uses an NT Thread to simulate the timer-tick driven
# timer service. In the future, the Thread creation should possibly be
# abstracted by the CPU architectural protocol
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -14,7 +14,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -33,7 +33,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
Timer.c
Timer.h
diff --git a/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf b/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf
index a1ed01765c..3723603cd7 100644
--- a/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf
+++ b/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Component description file for WinNtAutoScan module
#
# This module abstracts memory auto-scan in a Windows NT environment.
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
WinNtAutoScan.c
[Packages]
diff --git a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIoDxe.inf b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIoDxe.inf
index efe6f470f6..9803d3848f 100644
--- a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIoDxe.inf
+++ b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIoDxe.inf
@@ -1,11 +1,11 @@
-#/** @file
+## @file
# Block Io driver
#
# Produce block IO abstractions for real devices on your PC using Win32 APIs.
# The configuration of what devices to mount or emulate comes from NT
# environment variables. The variables must be visible to the Microsoft*
# Developer Studio for them to work.
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -15,7 +15,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -38,7 +38,7 @@
# DRIVER_DIAG = gWinNtBlockIoDriverDiagnostics
#
-[Sources.common]
+[Sources]
DriverDiagnostics.c
DriverConfiguration.c
ComponentName.c
diff --git a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
index 0518a963b4..3aedacc86e 100644
--- a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
+++ b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
# Win NT Bus driver
#
# This following section documents the envirnoment variables for the Win NT
# build. These variables are used to define the (virtual) hardware
# configuration of the NT environment
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -14,7 +14,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -36,7 +36,7 @@
# COMPONENT_NAME = gWinNtBusDriverComponentName
#
-[Sources.common]
+[Sources]
ComponentName.c
WinNtBusDriver.c
WinNtBusDriver.h
@@ -75,7 +75,7 @@
gEfiWinNtIoProtocolGuid # PROTOCOL BY_START
-[Pcd.common]
+[Pcd]
gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize
gEfiNt32PkgTokenSpaceGuid.PcdWinNtPhysicalDisk
gEfiNt32PkgTokenSpaceGuid.PcdWinNtVirtualDisk
diff --git a/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf b/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf
index a14959fcff..8f84b8baef 100644
--- a/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf
+++ b/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Component description file for WinNtFwh module
#
# This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf b/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf
index fc229817ed..4fd52a145d 100644
--- a/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf
+++ b/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Component description file for FlashMap PEI module
#
# This module installs FlashMap PPI which is used to get flash layout information.
-# Copyright (c) 2006 - 2009, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
FlashMap.c
[Packages]
@@ -48,7 +48,7 @@
[Ppis]
gNtFwhPpiGuid # PPI ALWAYS_CONSUMED
-[Pcd.common]
+[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf b/Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf
index ca01805333..73f10bf587 100644
--- a/Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf
+++ b/Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf
@@ -1,11 +1,11 @@
-#/** @file
+## @file
# Gop Driver
#
# GOP is short hand for UEFI Graphics Output protocol.
# This file is a verision of GopIo the uses WinNtThunk system calls as an IO
# abstraction. For a PCI device WinNtIo would be replaced with
# a PCI IO abstraction that abstracted a specific PCI device.
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -15,7 +15,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -37,7 +37,7 @@
# COMPONENT_NAME = gWinNtGopComponentName
#
-[Sources.common]
+[Sources]
WinNtGopDriver.c
ComponentName.c
WinNtGop.h
diff --git a/Nt32Pkg/WinNtOemHookStatusCodeHandlerDxe/WinNtOemHookStatusCodeHandlerDxe.inf b/Nt32Pkg/WinNtOemHookStatusCodeHandlerDxe/WinNtOemHookStatusCodeHandlerDxe.inf
index e92d5eebb4..1859e1a597 100644
--- a/Nt32Pkg/WinNtOemHookStatusCodeHandlerDxe/WinNtOemHookStatusCodeHandlerDxe.inf
+++ b/Nt32Pkg/WinNtOemHookStatusCodeHandlerDxe/WinNtOemHookStatusCodeHandlerDxe.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# OEM hook status code handler driver which produces general handler and hook it
# onto the DXE status code router.
#
-# Copyright (c) 2007 - 2009, Intel Corporation
+# Copyright (c) 2007 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -29,7 +29,7 @@
# HOB Guid C Name: gEfiWinNtThunkProtocolGuid Hob Type: GUID_EXTENSION
#
-[Sources.common]
+[Sources]
WinNtOemHookStatusCodeHandlerDxe.c
diff --git a/Nt32Pkg/WinNtOemHookStatusCodeHandlerPei/WinNtOemHookStatusCodeHandlerPei.inf b/Nt32Pkg/WinNtOemHookStatusCodeHandlerPei/WinNtOemHookStatusCodeHandlerPei.inf
index 9dbdab5aa0..fb29a72fe5 100644
--- a/Nt32Pkg/WinNtOemHookStatusCodeHandlerPei/WinNtOemHookStatusCodeHandlerPei.inf
+++ b/Nt32Pkg/WinNtOemHookStatusCodeHandlerPei/WinNtOemHookStatusCodeHandlerPei.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# OEM hook status code handler PEIM which produces general handler and hook it
# onto the PEI status code router.
#
-# Copyright (c) 2007 - 2009, Intel Corporation
+# Copyright (c) 2007 - 2010, 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
@@ -13,7 +13,7 @@
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -29,7 +29,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
WinNtOemHookStatusCodeHandlerPei.c
diff --git a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf
index a640ef5d91..9be5441911 100644
--- a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf
+++ b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Serial I/O driver
#
# Our DriverBinding member functions operate on the handles
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf
index 7d0dcc0fc3..5f07dce401 100644
--- a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf
+++ b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf
@@ -1,11 +1,11 @@
-#/** @file
+## @file
# Simple filesystem driver
#
# Produce Simple File System abstractions for directories on your PC using Win32 APIs.
# The configuration of what devices to mount or emulate comes from NT
# environment variables. The variables must be visible to the Microsoft*
# Developer Studio for them to work.
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -15,7 +15,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -37,7 +37,7 @@
# COMPONENT_NAME = gWinNtSimpleFileSystemComponentName
#
-[Sources.common]
+[Sources]
ComponentName.c
WinNtSimpleFileSystem.c
WinNtSimpleFileSystem.h
diff --git a/Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf b/Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf
index 6458735a4b..a5efaf2e16 100644
--- a/Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf
+++ b/Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# A DXE driver to produce EFI_WIN_NT_THUNK_PROTOCOL
#
# EFI_WIN_NT_THUNK_PROTOCOL is a table of pointers to various Windows APIs used by various drivers to accomplish certain task in an NT32 emulator.
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
WinNtThunk.c
WinNtThunk.h
diff --git a/Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocolPei.inf b/Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocolPei.inf
index a6161775a2..ab2ef33806 100644
--- a/Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocolPei.inf
+++ b/Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocolPei.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Stuff driver
#
# Tiano PEIM to abstract construction of firmware volume in a Windows NT environment.
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
WinNtThunkPPIToProtocol.c
[Packages]
diff --git a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf
index fe9e120b43..35ff58574d 100644
--- a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf
+++ b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
# Description file for the Atapi Pass Thru driver.
#
# This driver simulates SCSI devices with Atapi devices to test the SCSI io
# protocol.
-# Copyright (c) 2007, Intel Corporation
+# Copyright (c) 2007 - 2010, 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
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -40,7 +40,7 @@
# COMPONENT_NAME = gAtapiScsiPassThruComponentName
#
-[Sources.common]
+[Sources]
DriverSupportedEfiVersion.c
ComponentName.c
AtapiPassThru.c
diff --git a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
index e9ae2b7e74..40bcbddfe8 100644
--- a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
+++ b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Component description file for CirrusLogic5430 module
#
# Cirrus Logic 5430 Controller Driver.This driver is a sample implementation
@@ -9,7 +9,7 @@
# requires both the UGA Draw and the UGA I/O Protocol. Please refer to Microsoft's
# documentation on UGA for details on how to write a UGA driver that is able
# to function both in the EFI pre-boot environment and from the OS runtime.
-# Copyright (c) 2006 - 2009, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -19,7 +19,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -47,7 +47,7 @@
# COMPONENT_NAME = gCirrusLogic5430ComponentName
#
-[Sources.common]
+[Sources]
ComponentName.c
DriverSupportedEfiVersion.c
CirrusLogic5430UgaDraw.c
@@ -83,7 +83,7 @@
gEfiEdidOverrideProtocolGuid # PROTOCOL TO_START
-[FeaturePcd.common]
+[FeaturePcd]
gOptionRomPkgTokenSpaceGuid.PcdSupportGop
gOptionRomPkgTokenSpaceGuid.PcdSupportUga
diff --git a/OptionRomPkg/OptionRomPkg.dec b/OptionRomPkg/OptionRomPkg.dec
index bcfa8ebd7b..97b73211f0 100644
--- a/OptionRomPkg/OptionRomPkg.dec
+++ b/OptionRomPkg/OptionRomPkg.dec
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Option Rom Package Reference Implementations.
#
# This package is designed to interoperate with the EDK II open source project
@@ -6,7 +6,7 @@
# Option ROM image for all CPU architectures, including EBC target.
# A single driver can support mixes of EFI 1.1, UEFI 2.0 and UEFI 2.1.
#
-# Copyright (c) 2007 - 2009, Intel Corporation.
+# Copyright (c) 2007 - 2010, 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
@@ -16,7 +16,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
DEC_SPECIFICATION = 0x00010005
@@ -24,18 +24,18 @@
PACKAGE_GUID = AA3865E8-7F30-4f59-8696-99F560101852
PACKAGE_VERSION = 0.1
-[PcdsFeatureFlag.common]
+[PcdsFeatureFlag]
gOptionRomPkgTokenSpaceGuid.PcdSupportScsiPassThru|TRUE|BOOLEAN|0x00010001
gOptionRomPkgTokenSpaceGuid.PcdSupportExtScsiPassThru|TRUE|BOOLEAN|0x00010002
gOptionRomPkgTokenSpaceGuid.PcdSupportGop|TRUE|BOOLEAN|0x00010004
gOptionRomPkgTokenSpaceGuid.PcdSupportUga|TRUE|BOOLEAN|0x00010005
-[PcdsFixedAtBuild.common]
+[PcdsFixedAtBuild]
gOptionRomPkgTokenSpaceGuid.PcdDriverSupportedEfiVersion|0x0002000a|UINT32|0x00010003
-[PcdsPatchableInModule.common]
+[PcdsPatchableInModule]
gOptionRomPkgTokenSpaceGuid.PcdDriverSupportedEfiVersion|0x0002000a|UINT32|0x00010003
-[Guids.common]
+[Guids]
gOptionRomPkgTokenSpaceGuid = { 0x1e43298f, 0x3478, 0x41a7, { 0xb5, 0x77, 0x86, 0x6, 0x46, 0x35, 0xc7, 0x28 } }
diff --git a/OptionRomPkg/OptionRomPkg.dsc b/OptionRomPkg/OptionRomPkg.dsc
index df5f83ecff..3fbeca580d 100644
--- a/OptionRomPkg/OptionRomPkg.dsc
+++ b/OptionRomPkg/OptionRomPkg.dsc
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Option Rom Package build validation file for All Architectures.
#
# This package is designed to interoperate with the EDK II open source project
@@ -6,7 +6,7 @@
# Option ROM image for all CPU architectures, including EBC target.
# A single driver can support mixes of EFI 1.1, UEFI 2.0 and UEFI 2.1.
#
-# Copyright (c) 2007 - 2009, Intel Corporation
+# Copyright (c) 2007 - 2010, 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
@@ -16,7 +16,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
################################################################################
#
@@ -42,7 +42,7 @@
[SkuIds]
0|DEFAULT # The entry: 0|DEFAULT is reserved and always required.
-[LibraryClasses.common]
+[LibraryClasses]
DebugLib|MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf
BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
@@ -62,7 +62,7 @@
# Pcd Section - list of all EDK II PCD Entries defined by this Platform
#
################################################################################
-[PcdsFeatureFlag.common]
+[PcdsFeatureFlag]
gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE
gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE
gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|FALSE
@@ -70,7 +70,7 @@
gOptionRomPkgTokenSpaceGuid.PcdSupportScsiPassThru|TRUE
gOptionRomPkgTokenSpaceGuid.PcdSupportExtScsiPassThru|TRUE
-[PcdsFixedAtBuild.common]
+[PcdsFixedAtBuild]
gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|0x0
gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|0x0
gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|0x0
@@ -99,7 +99,7 @@
#
###################################################################################################
-[Components.common]
+[Components]
OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf
OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf
diff --git a/OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf b/OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf
index 2eee03efdf..9de3fabd18 100644
--- a/OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf
+++ b/OptionRomPkg/UndiRuntimeDxe/UndiRuntimeDxe.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Component description file for Undi module.
#
# This module provides support for Universal Network Driver Interface
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -27,7 +27,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
Undi32.h
E100b.h
E100b.c
diff --git a/OvmfPkg/AcpiTables/AcpiTables.inf b/OvmfPkg/AcpiTables/AcpiTables.inf
index 84ee1b1f3c..6b9110e703 100755
--- a/OvmfPkg/AcpiTables/AcpiTables.inf
+++ b/OvmfPkg/AcpiTables/AcpiTables.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
# Component description file for PlatformAcpiTables module.
#
# ACPI table data and ASL sources required to boot the platform.
#
-# Copyright (c) 2008 - 2009, Intel Corporation. <BR>
+# Copyright (c) 2008 - 2010, Intel Corporation. <BR>
# 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
@@ -12,7 +12,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -30,7 +30,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
Platform.h
Madt.aslc
Facp.aslc
diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf
index 60eb23207e..2625b1d27d 100644
--- a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf
+++ b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Firmware Block Services to support emulating non-volatile variables
# by pretending that a memory buffer is storage for the NV variables.
#
@@ -11,7 +11,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.inf b/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.inf
index 9e5767de33..f0e3498d29 100755
--- a/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.inf
+++ b/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
# ACPI Timer Library Instance.
#
-# Copyright (c) 2008, Intel Corporation. <BR>
+# Copyright (c) 2008 - 2010, Intel Corporation. <BR>
# 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
@@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -30,7 +30,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
AcpiTimerLib.c
[Packages]
diff --git a/OvmfPkg/Library/EmuVariableFvbLib/EmuVariableFvbLib.inf b/OvmfPkg/Library/EmuVariableFvbLib/EmuVariableFvbLib.inf
index b6fb4dc087..79a7b65cd6 100644
--- a/OvmfPkg/Library/EmuVariableFvbLib/EmuVariableFvbLib.inf
+++ b/OvmfPkg/Library/EmuVariableFvbLib/EmuVariableFvbLib.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
# OVMF platform customization for EMU Variable FVB driver
#
# This library handles hooks for the EMU Variable FVB driver.
#
-# Copyright (c) 2006 - 2009, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -29,7 +29,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
EmuVariableFvbLib.c
[Packages]
diff --git a/OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf b/OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
index 41f0549abc..a5ae93d392 100644
--- a/OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
+++ b/OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
# NvVarsFileLib
#
# This kibrary saves and restores non-volatile variables in a
# file within a file system.
#
-# Copyright (c) 2006 - 2009, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -14,7 +14,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -30,7 +30,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
FsAccess.c
NvVarsFileLib.c
VarBuffer.c
diff --git a/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf b/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
index 7d856f3177..976ff20479 100644
--- a/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
+++ b/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
# Platform BDS customizations library.
#
-# Copyright (c) 2007 - 2008, Intel Corporation. <BR>
+# Copyright (c) 2007 - 2010, Intel Corporation. <BR>
# 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
@@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -28,7 +28,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
BdsPlatform.c
PlatformData.c
BdsPlatform.h
diff --git a/OvmfPkg/Library/PlatformFvbLibNull/PlatformFvbLibNull.inf b/OvmfPkg/Library/PlatformFvbLibNull/PlatformFvbLibNull.inf
index 3eae1c53f9..351de600fe 100644
--- a/OvmfPkg/Library/PlatformFvbLibNull/PlatformFvbLibNull.inf
+++ b/OvmfPkg/Library/PlatformFvbLibNull/PlatformFvbLibNull.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
# NULL PlatformFvbLib library instance
#
# This library handles hooks for the EMU Variable FVB driver.
#
-# Copyright (c) 2006 - 2009, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -29,7 +29,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
PlatformFvbLibNull.c
[Packages]
diff --git a/OvmfPkg/Library/SecExtractGuidedSectionLib/SecExtractGuidedSectionLib.inf b/OvmfPkg/Library/SecExtractGuidedSectionLib/SecExtractGuidedSectionLib.inf
index 6994f91918..b67d6f8a2a 100644
--- a/OvmfPkg/Library/SecExtractGuidedSectionLib/SecExtractGuidedSectionLib.inf
+++ b/OvmfPkg/Library/SecExtractGuidedSectionLib/SecExtractGuidedSectionLib.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
# Instance of ExtractGuidedSection Library for SEC phase.
#
-# Copyright (c) 2007 - 2009, Intel Corporation.
+# Copyright (c) 2007 - 2010, 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
@@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -26,7 +26,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only)
#
-[Sources.common]
+[Sources]
SecExtractGuidedSectionLib.c
[Packages]
@@ -37,5 +37,5 @@
DebugLib
PcdLib
-[Pcd.common]
+[Pcd]
gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler ## CONSUMES
diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec
index 862811c436..ef142fe2ad 100644
--- a/OvmfPkg/OvmfPkg.dec
+++ b/OvmfPkg/OvmfPkg.dec
@@ -1,7 +1,7 @@
-#/** @file
+## @file
# EFI/Framework Open Virtual Machine Firmware (OVMF) platform
#
-# Copyright (c) 2006 - 2009, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -11,7 +11,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
DEC_VERSION = 0x00010005
@@ -22,7 +22,7 @@
[Includes]
Include
-[Guids.common]
+[Guids]
gUefiOvmfPkgTokenSpaceGuid = {0x93bb96af, 0xb9f2, 0x4eb8, {0x94, 0x62, 0xe0, 0xba, 0x74, 0x56, 0x42, 0x36}}
[PcdsFixedAtBuild]
diff --git a/OvmfPkg/OvmfPkg.fdf b/OvmfPkg/OvmfPkg.fdf
index 432975d2e1..b15ad29a2e 100644
--- a/OvmfPkg/OvmfPkg.fdf
+++ b/OvmfPkg/OvmfPkg.fdf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Open Virtual Machine Firmware: FDF
#
# Copyright (c) 2006 - 2010, Intel Corporation
@@ -11,7 +11,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
################################################################################
[FD.SEC]
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 5d2af6507f..cb133d3b8c 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# EFI/Framework Open Virtual Machine Firmware (OVMF) platform
#
# Copyright (c) 2006 - 2010, Intel Corporation
@@ -11,7 +11,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
################################################################################
#
@@ -47,7 +47,7 @@
# Library Class section - list of all Library Classes needed by this Platform.
#
################################################################################
-[LibraryClasses.common]
+[LibraryClasses]
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
TimerLib|OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
@@ -173,11 +173,11 @@
# Pcd Section - list of all EDK II PCD Entries defined by this Platform.
#
################################################################################
-[PcdsFeatureFlag.common]
+[PcdsFeatureFlag]
gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE
-[PcdsFixedAtBuild.common]
+[PcdsFixedAtBuild]
gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1
gEfiSioTokenSpaceGuid.PcdSerialRegisterBase|0x3F8
gEfiSioTokenSpaceGuid.PcdSerialLineControl|0x07
@@ -196,7 +196,7 @@
gEfiEdkModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled|TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0
-[PcdsFeatureFlag.common]
+[PcdsFeatureFlag]
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE
@@ -205,7 +205,7 @@
gOptionRomPkgTokenSpaceGuid.PcdSupportGop|TRUE
gOptionRomPkgTokenSpaceGuid.PcdSupportUga|FALSE
-[PcdsFixedAtBuild.common]
+[PcdsFixedAtBuild]
gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
@@ -216,7 +216,7 @@
#
################################################################################
-[PcdsDynamicDefault.common]
+[PcdsDynamicDefault]
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
@@ -228,7 +228,7 @@
# Components Section - list of all EDK II Modules needed by this Platform.
#
################################################################################
-[Components.common]
+[Components]
#
# SEC Phase modules
#
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 91bdee251f..19acfb1802 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# EFI/Framework Open Virtual Machine Firmware (OVMF) platform
#
# Copyright (c) 2006 - 2010, Intel Corporation
@@ -11,7 +11,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
################################################################################
#
@@ -47,7 +47,7 @@
# Library Class section - list of all Library Classes needed by this Platform.
#
################################################################################
-[LibraryClasses.common]
+[LibraryClasses]
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
TimerLib|OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
@@ -174,11 +174,11 @@
# Pcd Section - list of all EDK II PCD Entries defined by this Platform.
#
################################################################################
-[PcdsFeatureFlag.common]
+[PcdsFeatureFlag]
gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE
-[PcdsFixedAtBuild.common]
+[PcdsFixedAtBuild]
gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1
gEfiSioTokenSpaceGuid.PcdSerialRegisterBase|0x3F8
gEfiSioTokenSpaceGuid.PcdSerialLineControl|0x07
@@ -197,7 +197,7 @@
gEfiEdkModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled|TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0
-[PcdsFeatureFlag.common]
+[PcdsFeatureFlag]
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE
@@ -206,7 +206,7 @@
gOptionRomPkgTokenSpaceGuid.PcdSupportGop|TRUE
gOptionRomPkgTokenSpaceGuid.PcdSupportUga|FALSE
-[PcdsFixedAtBuild.common]
+[PcdsFixedAtBuild]
gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
@@ -217,7 +217,7 @@
#
################################################################################
-[PcdsDynamicDefault.common]
+[PcdsDynamicDefault]
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index c3c1636c2d..be988723ef 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Open Virtual Machine Firmware: FDF
#
# Copyright (c) 2006 - 2010, Intel Corporation
@@ -11,7 +11,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
################################################################################
[FD.SEC]
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 1e0425d0e3..22f540748f 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# EFI/Framework Open Virtual Machine Firmware (OVMF) platform
#
# Copyright (c) 2006 - 2010, Intel Corporation
@@ -11,7 +11,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
################################################################################
#
@@ -47,7 +47,7 @@
# Library Class section - list of all Library Classes needed by this Platform.
#
################################################################################
-[LibraryClasses.common]
+[LibraryClasses]
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
TimerLib|OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
@@ -174,11 +174,11 @@
# Pcd Section - list of all EDK II PCD Entries defined by this Platform.
#
################################################################################
-[PcdsFeatureFlag.common]
+[PcdsFeatureFlag]
gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE
-[PcdsFixedAtBuild.common]
+[PcdsFixedAtBuild]
gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1
gEfiSioTokenSpaceGuid.PcdSerialRegisterBase|0x3F8
gEfiSioTokenSpaceGuid.PcdSerialLineControl|0x07
@@ -197,7 +197,7 @@
gEfiEdkModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled|TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0
-[PcdsFeatureFlag.common]
+[PcdsFeatureFlag]
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE
@@ -206,7 +206,7 @@
gOptionRomPkgTokenSpaceGuid.PcdSupportGop|TRUE
gOptionRomPkgTokenSpaceGuid.PcdSupportUga|FALSE
-[PcdsFixedAtBuild.common]
+[PcdsFixedAtBuild]
gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
@@ -217,7 +217,7 @@
#
################################################################################
-[PcdsDynamicDefault.common]
+[PcdsDynamicDefault]
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
@@ -229,7 +229,7 @@
# Components Section - list of all EDK II Modules needed by this Platform.
#
################################################################################
-[Components.common]
+[Components]
#
# SEC Phase modules
#
diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
index 9d40837da7..f84785c108 100644
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Platform PEI driver
#
# This module provides platform specific function to detect boot mode.
@@ -12,7 +12,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/OvmfPkg/Sec/SecMain.inf b/OvmfPkg/Sec/SecMain.inf
index d60d005f9d..fdc2bf2872 100644
--- a/OvmfPkg/Sec/SecMain.inf
+++ b/OvmfPkg/Sec/SecMain.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# SEC Driver
#
# Copyright (c) 2008 - 2010, Intel Corporation
@@ -11,7 +11,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -27,7 +27,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
FindPeiCore.c
SecMain.c
diff --git a/PcAtChipsetPkg/8254TimerDxe/8254Timer.inf b/PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
index 5781fb63de..6221a6acab 100644
--- a/PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
+++ b/PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
@@ -1,6 +1,6 @@
-#/*++
+## @file
#
-# Copyright (c) 2005, Intel Corporation
+# Copyright (c) 2005 - 2010, 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
@@ -14,7 +14,7 @@
#
# Abstract:
#
-#--*/
+##
[Defines]
INF_VERSION = 0x00010005
BASE_NAME = Timer
@@ -37,7 +37,7 @@
UefiDriverEntryPoint
IoLib
-[Sources.common]
+[Sources]
Timer.h
Timer.c
diff --git a/PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf b/PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
index 6135a535a4..26b785bd94 100644
--- a/PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
+++ b/PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# 8259 Interrupt Controller driver
#
# Copyright (c) 2005 - 2010, Intel Corporation
@@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf b/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf
index f8467dbec4..143e78ab11 100755
--- a/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf
+++ b/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
#
# Component description file for the IDE Controller Init module.
#
-# Copyright (c) 2008, Intel Corporation. <BR>
+# Copyright (c) 2008 - 2010, Intel Corporation. <BR>
# 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
@@ -11,7 +11,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -29,7 +29,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
ComponentName.c
IdeController.c
IdeController.h
diff --git a/PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf b/PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf
index efe329911e..c96544ec4f 100644
--- a/PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf
+++ b/PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf
@@ -1,6 +1,6 @@
-#/*++
+## @file
#
-# Copyright (c) 2005 - 2009, Intel Corporation
+# Copyright (c) 2005 - 2010, 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
@@ -15,7 +15,7 @@
# Abstract:
# Component description file for PCAT ISA ACPI driver
#
-#--*/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/PcAtChipsetPkg/KbcResetDxe/Reset.inf b/PcAtChipsetPkg/KbcResetDxe/Reset.inf
index 6ed4981b0a..944cce7ca8 100644
--- a/PcAtChipsetPkg/KbcResetDxe/Reset.inf
+++ b/PcAtChipsetPkg/KbcResetDxe/Reset.inf
@@ -1,4 +1,4 @@
-#/*++
+## @file
#
# Copyright (c) 2006 - 2010, Intel Corporation
# All rights reserved. This program and the accompanying materials
@@ -14,7 +14,7 @@
#
# Abstract:
#
-#--*/
+##
[Defines]
INF_VERSION = 0x00010005
BASE_NAME = KbcReset
diff --git a/PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf b/PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf
index ad53431d95..f619e88dc4 100644
--- a/PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf
+++ b/PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf
@@ -1,7 +1,7 @@
-#/**@file
+## @file
# Library instance for SerialIo library class
#
-# Copyright (c) 2006 - 2009, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -29,6 +29,6 @@
BaseLib
IoLib
-[Sources.common]
+[Sources]
SerialPortLib.c
diff --git a/PcAtChipsetPkg/PcAtChipsetPkg.dec b/PcAtChipsetPkg/PcAtChipsetPkg.dec
index d5c39de878..747fcde241 100644
--- a/PcAtChipsetPkg/PcAtChipsetPkg.dec
+++ b/PcAtChipsetPkg/PcAtChipsetPkg.dec
@@ -1,10 +1,10 @@
-#/** @file
+## @file
# Public definitions for PcAtChipset package.
#
# This package is designed to public interfaces and implementation which follows
# PcAt defacto standard.
#
-# Copyright (c) 2009, Intel Corporation.
+# Copyright (c) 2009 - 2010, 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
@@ -14,7 +14,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
DEC_SPECIFICATION = 0x00010005
@@ -22,7 +22,7 @@
PACKAGE_GUID = B728689A-52D3-4b8c-AE89-2CE5514CC6DC
PACKAGE_VERSION = 0.1
-[PcdsFixedAtBuild.common]
+[PcdsFixedAtBuild]
## Pcd8259LegacyModeMask defines the default mask value for platform. This value is determined
# 1) If platform only support pure UEFI, value should be set to 0xFFFF or 0xFFFE;
# Because only clock interrupt is allowed in legacy mode in pure UEFI platform.
@@ -45,6 +45,6 @@
## Pcd8259LegacyModeEdgeLevel defines the default edge level for legacy mode's interrrupt controller.
gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x00000002|UINT16|0x0000
-[Guids.common]
+[Guids]
gPcAtChipsetPkgTokenSpaceGuid = { 0x326ae723, 0xae32, 0x4589, { 0x98, 0xb8, 0xca, 0xc2, 0x3c, 0xdc, 0xc1, 0xb1 } }
diff --git a/PcAtChipsetPkg/PcAtChipsetPkg.dsc b/PcAtChipsetPkg/PcAtChipsetPkg.dsc
index b102718b4b..8c97f13733 100644
--- a/PcAtChipsetPkg/PcAtChipsetPkg.dsc
+++ b/PcAtChipsetPkg/PcAtChipsetPkg.dsc
@@ -1,7 +1,7 @@
-#/** @file
+## @file
# PC/AT Chipset Package
#
-# Copyright (c) 2007 - 2008, Intel Corporation
+# Copyright (c) 2007 - 2010, 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
@@ -11,7 +11,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
PLATFORM_NAME = PcAtChipset
@@ -23,7 +23,7 @@
BUILD_TARGETS = DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
-[LibraryClasses.common]
+[LibraryClasses]
BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
@@ -41,7 +41,7 @@
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
-[Components.common]
+[Components]
PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf
diff --git a/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf b/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
index e9cdf48fd6..d6d537a7a8 100644
--- a/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
+++ b/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
#
# PcRtc driver to install EFI_REAL_TIME_CLOCK_ARCH_PROTOCOL.
#
@@ -14,7 +14,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -30,7 +30,7 @@
# VALID_ARCHITECTURES = IA32 X64 EBC
#
-[Sources.common]
+[Sources]
PcRtcEntry.c
PcRtc.c
PcRtc.h
diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf b/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
index 282e65433f..651cdbe544 100755
--- a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
+++ b/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
#
# Component description file a sinngle segment PCI Host Bridge driver.
#
-# Copyright (c) 2008 - 2009, Intel Corporation. <BR>
+# Copyright (c) 2008 - 2010, Intel Corporation. <BR>
# 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
@@ -11,7 +11,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf b/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf
index 5907a516e9..9d9f503dbc 100644
--- a/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf
+++ b/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
# This is the shell application
#
-# Copyright (c) 2009-2010, Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2009- 2010, Intel Corporation. All rights reserved. <BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010006
diff --git a/ShellPkg/Application/ShellExecTestApp/SA.inf b/ShellPkg/Application/ShellExecTestApp/SA.inf
index 5a676b0e3a..3058cd1237 100644
--- a/ShellPkg/Application/ShellExecTestApp/SA.inf
+++ b/ShellPkg/Application/ShellExecTestApp/SA.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
# Sample UEFI Application Reference EDKII Module
#
# This is a simple shell application
#
-# Copyright (c) 2009-2010, Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2009- 2010, Intel Corporation. All rights reserved. <BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/ShellPkg/Application/ShellLibTestApp/SA3.inf b/ShellPkg/Application/ShellLibTestApp/SA3.inf
index 46cef22e52..ce9ee79b38 100644
--- a/ShellPkg/Application/ShellLibTestApp/SA3.inf
+++ b/ShellPkg/Application/ShellLibTestApp/SA3.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
# Sample UEFI Application Reference EDKII Module
#
# This is a simple shell application
#
-# Copyright (c) 2009-2010, Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2009- 2010, Intel Corporation. All rights reserved. <BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf b/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf
index 1fcc6c5471..a00216c12f 100644
--- a/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf
+++ b/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
# This is the shell sorting testing application
#
-# Copyright (c) 2009-2010, Intel Corporation.All rights reserved. <BR>
+# Copyright (c) 2009- 2010, Intel Corporation.All rights reserved. <BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010006
diff --git a/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf b/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf
index d689a861ca..14a8519986 100644
--- a/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf
+++ b/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Provides interface to shell functionality for shell commands and applications.
#
# Copyright (c) 2006 - 2010, Intel Corporation.All rights reserved. <BR>
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010006
@@ -25,7 +25,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
BaseFileHandleLib.c
[Packages]
@@ -46,5 +46,5 @@
[Guids]
gEfiFileInfoGuid # ALWAYS_CONSUMED
-[Pcd.common]
+[Pcd]
gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize # ALWAYS_CONSUMED
diff --git a/ShellPkg/Library/BaseSortLib/BaseSortLib.inf b/ShellPkg/Library/BaseSortLib/BaseSortLib.inf
index dc7b12365a..3da8e76477 100644
--- a/ShellPkg/Library/BaseSortLib/BaseSortLib.inf
+++ b/ShellPkg/Library/BaseSortLib/BaseSortLib.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
# Library used for sorting routines.
#
-# Copyright (c) 2009-2010, Intel Corporation.All rights reserved. <BR>
+# Copyright (c) 2009- 2010, Intel Corporation.All rights reserved. <BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010006
@@ -25,7 +25,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
BaseSortLib.c
[Packages]
@@ -42,4 +42,4 @@
[Guids]
-[Pcd.common]
+[Pcd]
diff --git a/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf b/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
index 8cb3b59b91..f0f901ec7d 100644
--- a/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
+++ b/ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Provides interface to shell functionality for shell commands and applications.
#
# Copyright (c) 2006 - 2010, Intel Corporation.All rights reserved. <BR>
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010006
@@ -25,7 +25,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
UefiShellCEntryLib.c
[Packages]
@@ -43,5 +43,5 @@
[Guids]
-[Pcd.common]
+[Pcd]
diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
index 5aefe00893..61ad97a8cb 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Provides interface to shell functionality for shell commands and applications.
#
# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved. <BR>
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010006
@@ -27,7 +27,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
UefiShellLib.c
UefiShellLib.h
@@ -63,6 +63,6 @@
gEfiFileInfoGuid # ALWAYS_CONSUMED
gEfiShellEnvironment2ExtGuid # ALWAYS_CONSUMED
-[Pcd.common]
+[Pcd]
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize # ALWAYS_CONSUMED
gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize # ALWAYS_CONSUMED
diff --git a/ShellPkg/Library/UefiSortLib/UefiSortLib.inf b/ShellPkg/Library/UefiSortLib/UefiSortLib.inf
index f8f1bb43a8..73fd571794 100644
--- a/ShellPkg/Library/UefiSortLib/UefiSortLib.inf
+++ b/ShellPkg/Library/UefiSortLib/UefiSortLib.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
# Library used for sorting routines.
#
-# Copyright (c) 2009, Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved. <BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010006
@@ -25,7 +25,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
UefiSortLib.c
[Packages]
@@ -46,4 +46,4 @@
[Guids]
-[Pcd.common]
+[Pcd]
diff --git a/ShellPkg/ShellPkg.dec b/ShellPkg/ShellPkg.dec
index ed70d6bfe5..915f4c2517 100644
--- a/ShellPkg/ShellPkg.dec
+++ b/ShellPkg/ShellPkg.dec
@@ -2,7 +2,7 @@
#
# This Package provides all definitions for EFI and UEFI Shell
#
-# Copyright (c) 2009, Intel Corporation.
+# Copyright (c) 2009 - 2010, Intel Corporation.
#
# All rights reserved.
# This program and the accompanying materials are licensed and made available under
@@ -23,10 +23,10 @@
PACKAGE_VERSION = 0.2
-[Includes.common]
+[Includes]
Include
-[LibraryClasses.common]
+[LibraryClasses]
## @libraryclass Provides most Shell APIs.
# Only available for Shell applications
##
@@ -46,11 +46,11 @@
SortLib|Include/Library/Sortlib.h
-[Guids.common]
+[Guids]
gEfiShellEnvironment2ExtGuid = {0xd2c18636, 0x40e5, 0x4eb5, {0xa3, 0x1b, 0x36, 0x69, 0x5f, 0xd4, 0x2c, 0x87}}
gEfiShellPkgTokenSpaceGuid = {0x171e9188, 0x31d3, 0x40f5, {0xb1, 0x0c, 0x53, 0x9b, 0x2d, 0xb9, 0x40, 0xcd}}
-[Protocols.common]
+[Protocols]
gEfiShellProtocolGuid = {0x6302d008, 0x7f9b, 0x4f30, {0x87, 0xac, 0x60, 0xc9, 0xfe, 0xf5, 0xda, 0x4e}}
gEfiShellParametersProtocolGuid = {0x752f3136, 0x4e16, 0x4fdc, {0xa2, 0x2a, 0xe5, 0xf4, 0x68, 0x12, 0xf4, 0xca}}
gEfiShellEnvironment2Guid = {0x47c7b221, 0xc42a, 0x11d2, {0x8e, 0x57, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b}}
diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
index 86c6c82829..e9d45ffd3d 100644
--- a/ShellPkg/ShellPkg.dsc
+++ b/ShellPkg/ShellPkg.dsc
@@ -1,7 +1,7 @@
-#/** @file
+## @file
# Shell Package
#
-# Copyright (c) 2007 - 2008, Intel Corporation
+# Copyright (c) 2007 - 2010, 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
@@ -11,7 +11,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
PLATFORM_NAME = Shell
@@ -23,7 +23,7 @@
BUILD_TARGETS = DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
-[LibraryClasses.common]
+[LibraryClasses]
UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
@@ -43,9 +43,9 @@
ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
SortLib|ShellPkg/Library/BaseSortLib/BaseSortLib.inf
-[PcdsFixedAtBuild.common]
+[PcdsFixedAtBuild]
-[Components.common]
+[Components]
ShellPkg/Application/ShellExecTestApp/SA.inf
ShellPkg/Application/ShellLibTestApp/SA3.inf
ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf
diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.inf b/UefiCpuPkg/CpuDxe/CpuDxe.inf
index 11be264efe..526e16e1d5 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.inf
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
#
# Component description file for simple CPU driver
#
-# Copyright (c) 2008 - 2009, Intel Corporation. <BR>
+# Copyright (c) 2008 - 2010, Intel Corporation. <BR>
# 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
@@ -11,7 +11,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
index be9c21f6c1..0525a83a2e 100644
--- a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
+++ b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Produces the CPU I/O 2 Protocol.
#
# This DXE driver produces of the CPU I/O 2 Protocol, as introduced by PI 1.2.
@@ -12,7 +12,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf b/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
index b0d83ec16c..b897500ff0 100644
--- a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
+++ b/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Module that produces the SMM CPU I/O 2 Protocol using the services of the I/O Library
#
# Copyright (c) 2009 - 2010, Intel Corporation. <BR>
@@ -9,7 +9,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/UefiCpuPkg/CpuIoPei/CpuIoPei.inf b/UefiCpuPkg/CpuIoPei/CpuIoPei.inf
index 8e4538df8f..6bb829333d 100644
--- a/UefiCpuPkg/CpuIoPei/CpuIoPei.inf
+++ b/UefiCpuPkg/CpuIoPei/CpuIoPei.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Produces the CPU I/O PPI.
#
# This PEIM produces of the CPU I/O PPI.
@@ -12,7 +12,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
index cebb1b5beb..90b798dca3 100644
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
+++ b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# This library defines some routines that are generic for IA32 family CPU
# to be UEFI specification compliant.
#
-# Copyright (c) 2009, Intel Corporation. <BR>
+# Copyright (c) 2009 - 2010, Intel Corporation. <BR>
# 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
@@ -11,7 +11,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf b/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
index b6173ebd4a..31d18bf19e 100644
--- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
+++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# MTRR library provides API for MTRR operation
#
# Copyright (c) 2006 - 2010, Intel Corporation. <BR>
@@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf
index a1a0e78cb1..b796512ca4 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf
+++ b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf
@@ -1,7 +1,7 @@
-#/** @file
+## @file
# Reset Vector binary
#
-# Copyright (c) 2006 - 2009, Intel Corporation.
+# Copyright (c) 2006 - 2010, 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
@@ -10,7 +10,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc
index 738d1a6572..bbd2a1c1fe 100644
--- a/UefiCpuPkg/UefiCpuPkg.dsc
+++ b/UefiCpuPkg/UefiCpuPkg.dsc
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# UefiCpuPkg Package
#
# Copyright (c) 2007 - 2010, Intel Corporation
@@ -11,7 +11,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
PLATFORM_NAME = UefiCpu
@@ -27,7 +27,7 @@
# External libraries to build package
#
-[LibraryClasses.common]
+[LibraryClasses]
BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
@@ -71,7 +71,7 @@
# Drivers/Libraries within this package
#
-[Components.common]
+[Components]
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
UefiCpuPkg/CpuIoPei/CpuIoPei.inf
diff --git a/UnixPkg/BootModePei/BootModePei.inf b/UnixPkg/BootModePei/BootModePei.inf
index d99150761f..ae125ff0a5 100644
--- a/UnixPkg/BootModePei/BootModePei.inf
+++ b/UnixPkg/BootModePei/BootModePei.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Component description file for BootMode module
#
# This module provides platform specific function to detect boot mode.
-# Copyright (c) 2006 - 2008, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
BootModePei.c
diff --git a/UnixPkg/CpuRuntimeDxe/Cpu.inf b/UnixPkg/CpuRuntimeDxe/Cpu.inf
index c037bae61a..39fd4c81f4 100644
--- a/UnixPkg/CpuRuntimeDxe/Cpu.inf
+++ b/UnixPkg/CpuRuntimeDxe/Cpu.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Component description file for Cpu module.
#
# This CPU module abstracts the interrupt subsystem of a platform and the CPU-specific setjump-long pair.
-# Copyright (c) 2006 - 2008, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
CpuIo.c
Cpu.c
CpuDriver.h
diff --git a/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf b/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf
index 578c7b4d87..df0c37c342 100644
--- a/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf
+++ b/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Component description file for Unix Fimware Volume Block DXE driver module.
#
# This DXE runtime driver implements and produces the Fimware Volue Block Protocol on
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/UnixPkg/Library/DxeUnixLib/DxeUnixLib.inf b/UnixPkg/Library/DxeUnixLib/DxeUnixLib.inf
index 01c9f1a722..033fc7c6bd 100644
--- a/UnixPkg/Library/DxeUnixLib/DxeUnixLib.inf
+++ b/UnixPkg/Library/DxeUnixLib/DxeUnixLib.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# A library to produce the global variable 'gUnix'
#
# This library contains a single global variable 'gUnix' along with a constructor to initialize that global.
-# Copyright (c) 2006 - 2008, Intel Corporation.
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -32,7 +32,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
UnixLib.c
diff --git a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
index 0e8b1a87ec..5f6c20e10e 100644
--- a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
+++ b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
# Memory Status Code Library for UEFI drivers
#
# Lib to provide memory journal status code reporting Routines
#
-# Copyright (c) 2009, Intel Corporation
+# Copyright (c) 2009 - 2010, 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
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -32,7 +32,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
UnixOemHookStatusCodeLib.c
diff --git a/UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.inf b/UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.inf
index 83d6963982..ea3d5be4c1 100644
--- a/UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.inf
+++ b/UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# PeCoff extra action libary for DXE phase that run Unix emulator.
#
# Lib to provide memory journal status code reporting Routines
-# Copyright (c) 2007 - 2009, Intel Corporation
+# Copyright (c) 2007 - 2010, 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
@@ -13,7 +13,7 @@
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -33,7 +33,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
DxeUnixPeCoffExtraActionLib.c
[Packages]
diff --git a/UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/EdkUnixPeiPeCoffGetEntryPointLib.inf b/UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/EdkUnixPeiPeCoffGetEntryPointLib.inf
index 5128c3a429..f3eb3626b5 100644
--- a/UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/EdkUnixPeiPeCoffGetEntryPointLib.inf
+++ b/UnixPkg/Library/EdkUnixPeiPeCoffGetEntryPointLib/EdkUnixPeiPeCoffGetEntryPointLib.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Component description file for the EdkNt32PeiPeCoffGetEntryPointLib library.
#
# PeCoffGetEntryPointLib library class for NT32 instance implemented by use NTPeiLoadFile PPI.
-# Copyright (c) 2008, Intel Corporation
+# Copyright (c) 2008 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
PeCoffGetEntryPoint.c
diff --git a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf
index 84a22a6f0e..228dd88024 100644
--- a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf
+++ b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Memory Status Code Library for UEFI drivers
#
# Lib to provide memory journal status code reporting Routines
-# Copyright (c) 2009, Intel Corporation
+# Copyright (c) 2009 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
UnixOemHookStatusCodeLib.c
diff --git a/UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.inf b/UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.inf
index 722d586e17..340aa3003a 100644
--- a/UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.inf
+++ b/UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# PeCoff extra action libary for Pei phase that run UNIX emulator.
#
# Lib to provide memory journal status code reporting Routines
-# Copyright (c) 2007 - 2009, Intel Corporation
+# Copyright (c) 2007 - 2010, 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
@@ -13,7 +13,7 @@
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
PeiUnixPeCoffExtraActionLib.c
[Packages]
diff --git a/UnixPkg/Library/UnixBdsLib/PlatformBds.inf b/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
index 834b5c6897..c5885aa921 100644
--- a/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
+++ b/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Platfrom BDS driver
#
# Do platform action customized by IBV/OEM.
-# Copyright (c) 2006, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
BdsPlatform.c
PlatformData.c
BdsPlatform.h
@@ -57,7 +57,7 @@
[Guids]
gEfiUnixSystemConfigGuid
-[Pcd.common]
+[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
diff --git a/UnixPkg/Library/UnixPeCoffLoaderLib/UnixPeCoffLoaderLib.inf b/UnixPkg/Library/UnixPeCoffLoaderLib/UnixPeCoffLoaderLib.inf
index fcb78396e5..e775ee6365 100644
--- a/UnixPkg/Library/UnixPeCoffLoaderLib/UnixPeCoffLoaderLib.inf
+++ b/UnixPkg/Library/UnixPeCoffLoaderLib/UnixPeCoffLoaderLib.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Component description file for the Nt32PeCoffLoaderLib library.
#
# EdkPeCoffLoaderLib library class for NT32 instance implemented by PeiPeCoffLoader PPI.
-# Copyright (c) 2006, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -32,7 +32,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
UnixPeCoffLoader.c
diff --git a/UnixPkg/MetronomeDxe/Metronome.inf b/UnixPkg/MetronomeDxe/Metronome.inf
index 8b1c58dcaf..270c6eb2c7 100644
--- a/UnixPkg/MetronomeDxe/Metronome.inf
+++ b/UnixPkg/MetronomeDxe/Metronome.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Unix Emulation Metronome Architectural Protocol Driver as defined in DXE CIS
#
# This metronome module simulates metronome by Sleep WinAPI.
-# Copyright (c) 2006, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
Metronome.h
Metronome.c
diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
index e17843107d..e1f4ad8490 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Misc Sub class driver
#
# Parses the MiscSubclassDataTable and reports any generated data to the DataHub.
@@ -15,7 +15,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf b/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
index e90e5290be..35600ed8a7 100644
--- a/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
+++ b/UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Unix Emulation Real time clock Architectural Protocol Driver as defined in TIANO
#
# This real time clock module simulates virtual device by time WinAPI.
-# Copyright (c) 2006, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
RealTimeClock.c
diff --git a/UnixPkg/ResetRuntimeDxe/Reset.inf b/UnixPkg/ResetRuntimeDxe/Reset.inf
index 5eb621ac1c..76d4e67ee0 100644
--- a/UnixPkg/ResetRuntimeDxe/Reset.inf
+++ b/UnixPkg/ResetRuntimeDxe/Reset.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Unix Emulation Reset Architectural Protocol Driver as defined in TIANO
#
# This Reset module simulates system reset by process exit on NT.
-# Copyright (c) 2006, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
Reset.c
diff --git a/UnixPkg/Sec/SecMain.inf b/UnixPkg/Sec/SecMain.inf
index b745faa16d..52c5d0987e 100644
--- a/UnixPkg/Sec/SecMain.inf
+++ b/UnixPkg/Sec/SecMain.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Entry Point of Unix Emulator
#
# Main executable file of Unix Emulator that loads PEI core after initialization finished.
-# Copyright (c) 2008 - 2009, Intel Corporation
+# Copyright (c) 2008 - 2010, Intel Corporation
# Portions copyright (c) 2008-2009 Apple Inc.
#
# All rights reserved. This program and the accompanying materials
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
UgaX11.c
UnixThunk.c
FwVol.c
@@ -67,14 +67,14 @@
gEfiTemporaryRamSupportPpiGuid
-[Pcd.common]
+[Pcd]
gEfiUnixPkgTokenSpaceGuid.PcdUnixBootMode
gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareVolume
gEfiUnixPkgTokenSpaceGuid.PcdUnixMemorySizeForSecMain
gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareFdSize
gEfiUnixPkgTokenSpaceGuid.PcdUnixFdBaseAddress
-[BuildOptions.common]
+[BuildOptions]
GCC:*_*_IA32_DLINK_FLAGS == -o $(BIN_DIR)/SecMain -m elf_i386 -dynamic-linker /lib/ld-linux.so.2 /usr/lib/crt1.o /usr/lib/crti.o -L/usr/X11R6/lib -lXext -lX11 /usr/lib/crtn.o
GCC:*_*_*_DLINK2_FLAGS == -lc
GCC:*_*_IA32_CC_FLAGS == -m32 -g -fshort-wchar -fno-strict-aliasing -Wall -malign-double -idirafter/usr/include -c -include $(DEST_DIR_DEBUG)/AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
diff --git a/UnixPkg/TimerDxe/Timer.inf b/UnixPkg/TimerDxe/Timer.inf
index 39ee61d62d..08ab95682b 100644
--- a/UnixPkg/TimerDxe/Timer.inf
+++ b/UnixPkg/TimerDxe/Timer.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
# Unix Emulation Timer Architectural Protocol Driver as defined in DXE CIS
#
# This Timer module uses an NT Thread to simulate the timer-tick driven
# timer service. In the future, the Thread creation should possibly be
# abstracted by the CPU architectural protocol
-# Copyright (c) 2006, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -14,7 +14,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -33,7 +33,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
Timer.c
Timer.h
diff --git a/UnixPkg/UnixAutoScanPei/UnixAutoScan.inf b/UnixPkg/UnixAutoScanPei/UnixAutoScan.inf
index 0a7db27667..1b54ac2047 100644
--- a/UnixPkg/UnixAutoScanPei/UnixAutoScan.inf
+++ b/UnixPkg/UnixAutoScanPei/UnixAutoScan.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Component description file for UnixAutoScan module
#
# This module abstracts memory auto-scan in a Unix environment.
-# Copyright (c) 2006, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
UnixAutoScan.c
[Packages]
diff --git a/UnixPkg/UnixBlockIoDxe/UnixBlockIo.inf b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.inf
index 00371add9d..b7696594f3 100644
--- a/UnixPkg/UnixBlockIoDxe/UnixBlockIo.inf
+++ b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
# Block Io driver
#
# Produce block IO abstractions for real devices on your PC using Unix APIs.
# The configuration of what devices to mount or emulate comes from
# environment variables.
-# Copyright (c) 2006, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -14,7 +14,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -37,7 +37,7 @@
# DRIVER_DIAG = gUnixBlockIoDriverDiagnostics
#
-[Sources.common]
+[Sources]
DriverDiagnostics.c
DriverConfiguration.c
ComponentName.c
diff --git a/UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf
index d3b0f4c19c..95aeecf661 100644
--- a/UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf
+++ b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
# Unix Bus driver
#
# This following section documents the envirnoment variables for the Win NT
# build. These variables are used to define the (virtual) hardware
# configuration of the NT environment
-# Copyright (c) 2006, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -14,7 +14,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -36,7 +36,7 @@
# COMPONENT_NAME = gUnixBusDriverComponentName
#
-[Sources.common]
+[Sources]
ComponentName.c
UnixBusDriver.c
UnixBusDriver.h
@@ -79,7 +79,7 @@
gEfiUnixIoProtocolGuid # PROTOCOL BY_START
-[Pcd.common]
+[Pcd]
gEfiUnixPkgTokenSpaceGuid.PcdUnixSerialPort
gEfiUnixPkgTokenSpaceGuid.PcdUnixMemorySize
gEfiUnixPkgTokenSpaceGuid.PcdUnixCpuSpeed
diff --git a/UnixPkg/UnixConsoleDxe/UnixConsole.inf b/UnixPkg/UnixConsoleDxe/UnixConsole.inf
index 6a9748a323..2fe6ccf1c9 100644
--- a/UnixPkg/UnixConsoleDxe/UnixConsole.inf
+++ b/UnixPkg/UnixConsoleDxe/UnixConsole.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Console Dxe driver
#
# Simulate console with Unix API
-# Copyright (c) 2006, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -34,7 +34,7 @@
# COMPONENT_NAME = gUnixConsoleComponentName
#
-[Sources.common]
+[Sources]
ComponentName.c
ConsoleOut.c
ConsoleIn.c
diff --git a/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf b/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
index ddc71953fc..f4dfbae413 100644
--- a/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
+++ b/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
@@ -1,4 +1,4 @@
-#/** @file
+## @file
# Component description file for WinNtFwh module
#
# This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
diff --git a/UnixPkg/UnixFlashMapPei/FlashMap.inf b/UnixPkg/UnixFlashMapPei/FlashMap.inf
index 5ebba350a7..fc321c07a0 100644
--- a/UnixPkg/UnixFlashMapPei/FlashMap.inf
+++ b/UnixPkg/UnixFlashMapPei/FlashMap.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Component description file for FlashMap PEI module
#
# This module installs FlashMap PPI which is used to get flash layout information.
-# Copyright (c) 2006, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
FlashMap.c
[Packages]
@@ -60,7 +60,7 @@
[Ppis]
gUnixFwhPpiGuid # PPI ALWAYS_CONSUMED
-[Pcd.common]
+[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
diff --git a/UnixPkg/UnixPkg.dec b/UnixPkg/UnixPkg.dec
index 0a1ebb5b7b..4c2a338e3d 100644
--- a/UnixPkg/UnixPkg.dec
+++ b/UnixPkg/UnixPkg.dec
@@ -1,9 +1,9 @@
-#/** @file
+## @file
#
# This is the Unix Emulation Environment Platform
#
# Reference platform implementation using an emulator.
-# Copyright (c) 2008, Intel Corporation.
+# Copyright (c) 2008 - 2010, Intel Corporation.
#
# All rights reserved.
# This program and the accompanying materials are licensed and made available
@@ -12,7 +12,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES
# OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
DEC_VERSION = 0x00010005
@@ -21,28 +21,28 @@
PACKAGE_VERSION = 0.1
-[Includes.common]
+[Includes]
Include
-[LibraryClasses.common]
+[LibraryClasses]
UnixLib|Include/Library/UnixLib.h
-[Protocols.common]
+[Protocols]
gEfiUnixIoProtocolGuid = {0xf2e23f54, 0x8985, 0x11db, {0xac, 0x79, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35}}
gEfiUnixUgaIoProtocolGuid = {0xf2e5e2c6, 0x8985, 0x11db, {0xa1, 0x91, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35}}
gEfiUnixThunkProtocolGuid = {0xf2e98868, 0x8985, 0x11db, {0x9a, 0x59, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35}}
-[Ppis.common]
+[Ppis]
gPeiUnixAutoScanPpiGuid = {0xf2ed3d14, 0x8985, 0x11db, {0xb0, 0x57, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35}}
gUnixFwhPpiGuid = {0xf2f0dc30, 0x8985, 0x11db, {0xa1, 0x5b, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35}}
gUnixPeiLoadFilePpiGuid = {0xf2f48768, 0x8985, 0x11db, {0xb8, 0xda, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35}}
gPeiUnixThunkPpiGuid = {0xf2f830f2, 0x8985, 0x11db, {0x80, 0x6b, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35}}
-[Guids.common]
+[Guids]
gEfiUnixPkgTokenSpaceGuid = {0xf2b6838c, 0x8985, 0x11db, {0x9d, 0x1c, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35}}
gEfiUnixVirtualDisksGuid = {0xf2ba331a, 0x8985, 0x11db, {0xa4, 0x06, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35}}
gEfiUnixPhysicalDisksGuid = {0xf2bdcc96, 0x8985, 0x11db, {0x87, 0x19, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35}}
@@ -55,7 +55,7 @@
gEfiUnixSerialPortGuid = {0x6d3a727d, 0x66c8, 0x4d19, {0x87, 0xe6, 0x02, 0x15, 0x86, 0x14, 0x90, 0xf3}}
gEfiUnixSystemConfigGuid = {0x375ea976, 0x3ccd, 0x4e74, {0xa8, 0x45, 0x26, 0xb9, 0xb3, 0x24, 0xb1, 0x3c}}
-[PcdsFixedAtBuild.common]
+[PcdsFixedAtBuild]
gEfiUnixPkgTokenSpaceGuid.PcdUnixBootMode|1|UINT32|0x00001006
gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareVolume|L"..\\Fv\\Fv_Recovery.fd"|VOID*|0x00001009
gEfiUnixPkgTokenSpaceGuid.PcdUnixMemorySizeForSecMain|L"64!64"|VOID*|0x0000100c
@@ -76,7 +76,7 @@
gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogSize|0x0|UINT32|0x0000100f
-[PcdsDynamic.common]
+[PcdsDynamic]
gEfiUnixPkgTokenSpaceGuid.PcdUnixPhysicalDisk|L"E:RW;245760;512"|VOID*|0x00001000
gEfiUnixPkgTokenSpaceGuid.PcdUnixVirtualDisk|L"FW;40960;512"|VOID*|0x00001001
gEfiUnixPkgTokenSpaceGuid.PcdUnixUga|L"UGA Window"|VOID*|0x00001003
@@ -88,7 +88,7 @@
gEfiUnixPkgTokenSpaceGuid.PcdUnixSerialPort|L"/dev/ttyS0"|VOID*|0x00001002
-[PcdsPatchableInModule.common]
+[PcdsPatchableInModule]
gEfiUnixPkgTokenSpaceGuid.PcdUnixBootMode|1|UINT32|0x00001006
gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareVolume|L"..\\Fv\\Fv_Recovery.fd"|VOID*|0x00001009
gEfiUnixPkgTokenSpaceGuid.PcdUnixMemorySizeForSecMain|L"64!64"|VOID*|0x0000100c
diff --git a/UnixPkg/UnixPkg.dsc b/UnixPkg/UnixPkg.dsc
index 19039ca9a2..ee541f26df 100644
--- a/UnixPkg/UnixPkg.dsc
+++ b/UnixPkg/UnixPkg.dsc
@@ -1,10 +1,10 @@
-#/** @file
+## @file
#
# EFI/Framework Emulation Platform with UEFI HII interface supported.
#
# The Emulation Platform can be used to debug individual modules, prior to creating
# a real platform. This also provides an example for how an DSC is created.
-# Copyright (c) 2006 - 2009, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -14,7 +14,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
################################################################################
#
@@ -45,7 +45,7 @@
# Library Class section - list of all Library Classes needed by this Platform.
#
################################################################################
-[LibraryClasses.common]
+[LibraryClasses]
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
@@ -284,7 +284,7 @@
gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"%a"
-[PcdsFeatureFlag.common]
+[PcdsFeatureFlag]
gEfiEdkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
gEfiEdkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE
gEfiEdkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|TRUE
diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index 39e8dbbf5e..46e1a14d11 100644
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -1,6 +1,7 @@
+## @file
# This is Unix FDF file with UEFI HII features enabled
#
-# Copyright (c) 2008, Intel Corporation
+# Copyright (c) 2008 - 2010, 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
diff --git a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.inf b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.inf
index 0f74f2699e..2d2702505b 100644
--- a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.inf
+++ b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.inf
@@ -1,9 +1,9 @@
-#/** @file
+## @file
# Serial I/O driver
#
# Our DriverBinding member functions operate on the handles
# created by the Unix Bus driver
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -35,7 +35,7 @@
# COMPONENT_NAME = gUnixSerialIoComponentName
#
-[Sources.common]
+[Sources]
ComponentName.c
UnixSerialIo.c
UnixSerialIo.h
diff --git a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.inf b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.inf
index f3cce016df..39c8a29fc4 100644
--- a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.inf
+++ b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.inf
@@ -1,10 +1,10 @@
-#/** @file
+## @file
# Simple filesystem driver
#
# Produce Simple File System abstractions for directories on your PC using Unix APIs.
# The configuration of what devices to mount or emulate comes from
# environment variables.
-# Copyright (c) 2006, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -14,7 +14,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -36,7 +36,7 @@
# COMPONENT_NAME = gUnixSimpleFileSystemComponentName
#
-[Sources.common]
+[Sources]
ComponentName.c
UnixSimpleFileSystem.c
UnixSimpleFileSystem.h
diff --git a/UnixPkg/UnixThunkDxe/UnixThunk.inf b/UnixPkg/UnixThunkDxe/UnixThunk.inf
index 0b424afaf8..a6a7dca1f6 100644
--- a/UnixPkg/UnixThunkDxe/UnixThunk.inf
+++ b/UnixPkg/UnixThunkDxe/UnixThunk.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# A DXE driver to produce EFI_UNIX_THUNK_PROTOCOL
#
# EFI_UNIX_THUNK_PROTOCOL is a table of pointers to various Unix APIs used by various drivers to accomplish certain task in a Unix emulator.
-# Copyright (c) 2006, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
UnixThunk.c
UnixThunk.h
diff --git a/UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.inf b/UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.inf
index d19fa2a5a3..7848441da6 100644
--- a/UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.inf
+++ b/UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.inf
@@ -1,8 +1,8 @@
-#/** @file
+## @file
# Stuff driver
#
# Tiano PEIM to abstract construction of firmware volume in a Unix environment.
-# Copyright (c) 2006, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -31,7 +31,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
UnixThunkPpiToProtocol.c
diff --git a/UnixPkg/UnixUgaDxe/UnixUga.inf b/UnixPkg/UnixUgaDxe/UnixUga.inf
index 787f193771..ee9a346882 100644
--- a/UnixPkg/UnixUgaDxe/UnixUga.inf
+++ b/UnixPkg/UnixUgaDxe/UnixUga.inf
@@ -1,11 +1,11 @@
-#/** @file
+## @file
# Uga driver
#
# UGA is short hand for Universal Graphics Abstraction protocol.
# This file is a verision of UgaIo the uses UnixThunk system calls as an IO
# abstraction. For a PCI device UnixIo would be replaced with
# a PCI IO abstraction that abstracted a specific PCI device.
-# Copyright (c) 2006, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -15,7 +15,7 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
-#**/
+##
[Defines]
INF_VERSION = 0x00010005
@@ -37,7 +37,7 @@
# COMPONENT_NAME = gUnixUgaComponentName
#
-[Sources.common]
+[Sources]
ComponentName.c
UnixUgaScreen.c
UnixUgaDriver.c