Roll back revision 2222 to recover the wrong checking.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2780 6f19259b-4bc3-4df7-8a09-765794883524

MdeModulePkg/Universal/Disk/DiskIo/Dxe/ComponentName.c

@@ -12,11 +12,6 @@
 
 **/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "DiskIo.h"
 
 //

MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.h

@@ -16,11 +16,6 @@
 #ifndef _DISK_IO_H
 #define _DISK_IO_H
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include <Uefi.h>
 #include <Protocol/BlockIo.h>
 #include <Protocol/ComponentName.h>

MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf

@@ -1,13 +1,12 @@
 #/** @file
-# Component description file for DiskIo module.
+#  Component description file for DiskIo module.
-#
-# DiskIo driver that layers it's self on every Block IO protocol in the system.
-# Copyright (c) 2006 - 2007, Intel Corporation
 #
+#  Copyright (c) 2006 - 2007, Intel Corporation
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
 #  which accompanies this distribution. The full text of the license may be found at
 #  http://opensource.org/licenses/bsd-license.php
+#
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
@@ -35,8 +34,8 @@
 #
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
-#  DRIVER_BINDING                =  gDiskIoDriverBinding                         
+#  DRIVER_BINDING                =  gDiskIoDriverBinding
-#  COMPONENT_NAME                =  gDiskIoComponentName                         
+#  COMPONENT_NAME                =  gDiskIoComponentName
 #
 
 ################################################################################
@@ -49,8 +48,6 @@
   ComponentName.c
   DiskIo.h
   diskio.c
-  CommonHeader.h
-  EntryPoint.c
 
 
 ################################################################################
@@ -63,6 +60,18 @@
 [Includes]
   $(WORKSPACE)/MdePkg/Include/Library
 
+################################################################################
+#
+# Package Dependency Section - list of Package files that are required for
+#                              this module.
+#
+################################################################################
+
+[Packages]
+  $(WORKSPACE)/MdeModulePkg/MdeModulePkg.dec
+  $(WORKSPACE)/MdePkg/MdePkg.dec
+
+
 ################################################################################
 #
 # Library Class Section - list of Library Classes that are required for

MdeModulePkg/Universal/Disk/DiskIo/Dxe/diskio.c

@@ -20,11 +20,6 @@
 
 **/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "DiskIo.h"
 
 EFI_DRIVER_BINDING_PROTOCOL gDiskIoDriverBinding = {

MdeModulePkg/Universal/Disk/Partition/Dxe/ComponentName.c

@@ -12,11 +12,6 @@
 
 **/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Partition.h"
 
 //

MdeModulePkg/Universal/Disk/Partition/Dxe/ElTorito.c

@@ -13,11 +13,6 @@
 **/
 
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Partition.h"
 
 

MdeModulePkg/Universal/Disk/Partition/Dxe/Gpt.c

@@ -14,11 +14,6 @@
 **/
 
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Partition.h"
 
 

MdeModulePkg/Universal/Disk/Partition/Dxe/Mbr.c

@@ -29,11 +29,6 @@ Abstract:
 
 --*/
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Partition.h"
 
 STATIC

MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.c

@@ -16,11 +16,6 @@
 **/
 
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Partition.h"
 
 //

MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.h

@@ -18,11 +18,6 @@
 #ifndef _PARTITION_H 
 #define _PARTITION_H 
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include <Uefi.h>
 #include <Protocol/BlockIo.h>
 #include <Guid/Gpt.h>

MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.inf

@@ -5,12 +5,13 @@
 #  that represents the bytes Start to End of the Parent Block IO 
 #  device (one partition of physical BlockIo device, 
 #  which can be one of GPT, MBR, ElTorito partition).
-# Copyright (c) 2006 - 2007, Intel Corporation
 #
+#  Copyright (c) 2006 - 2007, Intel Corporation
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
 #  which accompanies this distribution. The full text of the license may be found at
 #  http://opensource.org/licenses/bsd-license.php
+#  
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
@@ -55,8 +56,6 @@
   ElTorito.c
   Partition.c
   Partition.h
-  CommonHeader.h
-  EntryPoint.c
 
 
 ################################################################################
@@ -69,6 +68,17 @@
 [Includes]
   $(WORKSPACE)/MdePkg/Include/Library
 
+################################################################################
+#
+# Package Dependency Section - list of Package files that are required for
+#                              this module.
+#
+################################################################################
+
+[Packages]
+  MdePkg/MdePkg.dec
+
+
 ################################################################################
 #
 # Library Class Section - list of Library Classes that are required for

MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.c

@@ -13,11 +13,6 @@
 **/
 
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "SecurityStub.h"
 
 //

MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.h

@@ -16,11 +16,6 @@
 #define _SECURITY_STUB_ARCH_PROTOCOL_H
 
 
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 //
 // Common header files for this module.
 //

MdeModulePkg/Universal/Security/SecurityStub/Dxe/SecurityStub.inf

@@ -1,13 +1,12 @@
 #/** @file
-# Component description file for SecurityStub module
+#  Component description file for SecurityStub module
-#
-# This driver supports platform security service.
-# Copyright (c) 2006 - 2007, Intel Corporation
 #
+#  Copyright (c) 2006 - 2007, Intel Corporation
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
 #  which accompanies this distribution. The full text of the license may be found at
 #  http://opensource.org/licenses/bsd-license.php
+#
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
@@ -46,7 +45,6 @@
   SecurityStub.c
   SecurityStub.h
   SecurityStub.dxs
-  CommonHeader.h
 
 
 ################################################################################
@@ -59,6 +57,17 @@
 [Includes]
   $(WORKSPACE)/MdePkg/Include/Library
 
+################################################################################
+#
+# Package Dependency Section - list of Package files that are required for
+#                              this module.
+#
+################################################################################
+
+[Packages]
+  MdePkg/MdePkg.dec
+
+
 ################################################################################
 #
 # Library Class Section - list of Library Classes that are required for