Remove the #ifdef style code ported from EDK tree. EdkII use PCD for customization.

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

6 files changed, 3 insertions, 27 deletions

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c
index 4b66ac0..0c0eeff 100644
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c
@@ -2386,7 +2386,7 @@ InitializeBCDriver (
             SystemTable,

             &mPxeBcDriverBinding,

             NULL,

-            COMPONENT_NAME,

+            &gPxeBcComponentName,

             NULL,

             NULL

             );

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h
index f4a19ba..e04acc3 100644
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h
@@ -436,14 +436,6 @@ PxeBcLibGetSmbiosSystemGuidAndSerialNumber (
   )
 ;
 
-#ifdef EFI_SIZE_REDUCTION_APPLIED
-  #define COMPONENT_NAME_CODE(code)
-  #define COMPONENT_NAME            NULL
-#else
-  #define COMPONENT_NAME_CODE(code) code
-  #define COMPONENT_NAME            &gPxeBcComponentName
-#endif
-
 
 //
 // Define SMBIOS tables.
diff --git a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4.c b/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4.c
index fe4da51..7fcd7c2 100644
--- a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4.c
+++ b/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4.c
@@ -99,7 +99,7 @@ PxeDhcp4DriverEntryPoint (
           SystemTable,

           &gPxeDhcp4DriverBinding,

           NULL,

-          COMPONENT_NAME,

+          &gPxeDhcp4ComponentName,

           NULL,

           NULL

           );

diff --git a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4.h b/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4.h
index b33ed3e..7e971d4 100644
--- a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4.h
+++ b/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4.h
@@ -340,14 +340,6 @@ Returns:
 --*/
 ;
 
-#ifdef EFI_SIZE_REDUCTION_APPLIED
-  #define COMPONENT_NAME_CODE(code)
-  #define COMPONENT_NAME            NULL
-#else
-  #define COMPONENT_NAME_CODE(code) code
-  #define COMPONENT_NAME            &gPxeDhcp4ComponentName
-#endif
-
 #endif /* _PXEDHCP4_H */
 
 /* EOF - PxeDhcp4.h */
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/snp.c b/MdeModulePkg/Universal/Network/SnpDxe/snp.c
index 460cdfd..d5055e7 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/snp.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/snp.c
@@ -1262,7 +1262,7 @@ InitializeSnpNiiDriver (
           SystemTable,

           &mSimpleNetworkDriverBinding,

           NULL,

-          COMPONENT_NAME,

+          &gSimpleNetworkComponentName,

           NULL,

           NULL

           );

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/snp.h b/MdeModulePkg/Universal/Network/SnpDxe/snp.h
index 90c9f3d..08c4f4d 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/snp.h
+++ b/MdeModulePkg/Universal/Network/SnpDxe/snp.h
@@ -426,14 +426,6 @@ InitializeSnpNiiDriver (
   )
 ;
 
-#ifdef EFI_SIZE_REDUCTION_APPLIED
-  #define COMPONENT_NAME_CODE(code)
-  #define COMPONENT_NAME            NULL
-#else
-  #define COMPONENT_NAME_CODE(code) code
-  #define COMPONENT_NAME            &gSimpleNetworkComponentName
-#endif
-
 #define SNP_MEM_PAGES(x)  (((x) - 1) / 4096 + 1)