1.replace macros EFI32 with MDE_CPU_IA32

2.replace macros EFIX64 with MDE_CPU_X64
3.replace macros EFI64 with MDE_CPU_IPF

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

diff --git a/EdkModulePkg/Core/Pei/PeiMain.h b/EdkModulePkg/Core/Pei/PeiMain.h
index 53c429f6e0ef6bef2f428c99cef544217cf36197..82121ac043612a19a519c1ea0bad8efa6640c645 100644 (file)
--- a/EdkModulePkg/Core/Pei/PeiMain.h
+++ b/EdkModulePkg/Core/Pei/PeiMain.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation\r
+Copyright (c) 2006 - 2007, Intel Corporation\r

 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -347,7 +347,7 @@ Returns:
 --*/\r
 ;\r
 \r
 --*/\r
 ;\r
 \r

-#ifdef EFI64\r
+#if   defined (MDE_CPU_IPF)\r

   //\r
   // In Ipf we should make special changes for the PHIT pointers to support\r
   // recovery boot in cache mode.\r
   //\r
   // In Ipf we should make special changes for the PHIT pointers to support\r
   // recovery boot in cache mode.\r

diff --git a/EdkModulePkg/Include/Library/EdkGenericBdsLib.h b/EdkModulePkg/Include/Library/EdkGenericBdsLib.h
index 7ec022262023067405cc3b385eb743a0518f5c5f..dedffab2a7433c4fb1173489f48876d990bd30d6 100644 (file)
--- a/EdkModulePkg/Include/Library/EdkGenericBdsLib.h
+++ b/EdkModulePkg/Include/Library/EdkGenericBdsLib.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r

 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r


@@ -305,7 +305,7 @@ BdsBootByDiskSignatureAndPartition (
 //\r
 // Notes: EFI 64 shadow all option rom\r
 //\r
 //\r
 // Notes: EFI 64 shadow all option rom\r
 //\r

-#ifdef EFI64\r
+#if   defined (MDE_CPU_IPF)\r

 #define EFI64_SHADOW_ALL_LEGACY_ROM() ShadowAllOptionRom ();\r
 VOID\r
 ShadowAllOptionRom();\r
 #define EFI64_SHADOW_ALL_LEGACY_ROM() ShadowAllOptionRom ();\r
 VOID\r
 ShadowAllOptionRom();\r


@@ -316,7 +316,7 @@ ShadowAllOptionRom();
 //\r
 // BBS support macros and functions\r
 //\r
 //\r
 // BBS support macros and functions\r
 //\r

-#ifdef EFI32\r
+#if   defined (MDE_CPU_IA32)\r

 #define REFRESH_LEGACY_BOOT_OPTIONS \\r
         BdsDeleteAllInvalidLegacyBootOptions ();\\r
         BdsAddNonExistingLegacyBootOptions (); \\r
 #define REFRESH_LEGACY_BOOT_OPTIONS \\r
         BdsDeleteAllInvalidLegacyBootOptions ();\\r
         BdsAddNonExistingLegacyBootOptions (); \\r

diff --git a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BootMaint/BBSsupport.h b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BootMaint/BBSsupport.h
index 572beb11ab741d6b5a8c5256d742fff267701291..9a2007cb3ede24794ed1fe9e0fdf7f7b941dd80e 100644 (file)
--- a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BootMaint/BBSsupport.h
+++ b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BootMaint/BBSsupport.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r

 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r


@@ -26,7 +26,7 @@ Revision History
 \r
 #include "BootMaint/BootMaint.h"\r
 \r
 \r
 #include "BootMaint/BootMaint.h"\r
 \r

-#ifdef EFI32\r
+#if   defined (MDE_CPU_IA32)\r

 #define REFRESH_LEGACY_BOOT_OPTIONS \\r
         BdsDeleteAllInvalidLegacyBootOptions ();\\r
         BdsAddNonExistingLegacyBootOptions (); \\r
 #define REFRESH_LEGACY_BOOT_OPTIONS \\r
         BdsDeleteAllInvalidLegacyBootOptions ();\\r
         BdsAddNonExistingLegacyBootOptions (); \\r

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.h b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.h
index 37778f442126b8ae1477d4055badf646796535b5..663fd0a0988148773f742eac0cf0ad861146ab9b 100644 (file)
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.h
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r

 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r


@@ -26,7 +26,7 @@ Revision History
 \r
 #include "Generic/BootMaint/BootMaint.h"\r
 \r
 \r
 #include "Generic/BootMaint/BootMaint.h"\r
 \r

-#ifdef EFI32\r
+#if   defined (MDE_CPU_IA32)\r

 #define REFRESH_LEGACY_BOOT_OPTIONS \\r
         BdsDeleteAllInvalidLegacyBootOptions ();\\r
         BdsAddNonExistingLegacyBootOptions (); \\r
 #define REFRESH_LEGACY_BOOT_OPTIONS \\r
         BdsDeleteAllInvalidLegacyBootOptions ();\\r
         BdsAddNonExistingLegacyBootOptions (); \\r

diff --git a/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h b/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h
index 7ec022262023067405cc3b385eb743a0518f5c5f..aa3cfaea7a1082fccfba2afdd5cc951a8e751468 100644 (file)
--- a/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h
+++ b/EdkNt32Pkg/Include/Library/EdkGenericBdsLib.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation\r

 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r


@@ -305,7 +305,7 @@ BdsBootByDiskSignatureAndPartition (
 //\r
 // Notes: EFI 64 shadow all option rom\r
 //\r
 //\r
 // Notes: EFI 64 shadow all option rom\r
 //\r

-#ifdef EFI64\r
+#if   defined (MDE_CPU_IPF)\r

 #define EFI64_SHADOW_ALL_LEGACY_ROM() ShadowAllOptionRom ();\r
 VOID\r
 ShadowAllOptionRom();\r
 #define EFI64_SHADOW_ALL_LEGACY_ROM() ShadowAllOptionRom ();\r
 VOID\r
 ShadowAllOptionRom();\r


@@ -316,7 +316,7 @@ ShadowAllOptionRom();
 //\r
 // BBS support macros and functions\r
 //\r
 //\r
 // BBS support macros and functions\r
 //\r

-#ifdef EFI32\r
+#if   defined (MDE_CPU_IA32)\r

 #define REFRESH_LEGACY_BOOT_OPTIONS \\r
         BdsDeleteAllInvalidLegacyBootOptions ();\\r
         BdsAddNonExistingLegacyBootOptions (); \\r
 #define REFRESH_LEGACY_BOOT_OPTIONS \\r
         BdsDeleteAllInvalidLegacyBootOptions ();\\r
         BdsAddNonExistingLegacyBootOptions (); \\r