Revision: 17811
          http://sourceforge.net/p/edk2/code/17811
Author:   abiesheuvel
Date:     2015-07-02 07:32:44 +0000 (Thu, 02 Jul 2015)
Log Message:
-----------
MdeModulePkg: move arch-specific allocation granularity defines to DxeMain.h

Move the definitions of EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT and
DEFAULT_PAGE_ALLOCATION to DxeMain.h to make them available explicitly
to all parts of DxeCore.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <[email protected]>
Reviewed-by: "Yao, Jiewen" <[email protected]>

Modified Paths:
--------------
    trunk/edk2/MdeModulePkg/Core/Dxe/DxeMain.h
    trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Imem.h

Modified: trunk/edk2/MdeModulePkg/Core/Dxe/DxeMain.h
===================================================================
--- trunk/edk2/MdeModulePkg/Core/Dxe/DxeMain.h  2015-07-02 07:32:33 UTC (rev 
17810)
+++ trunk/edk2/MdeModulePkg/Core/Dxe/DxeMain.h  2015-07-02 07:32:44 UTC (rev 
17811)
@@ -124,6 +124,31 @@
 ///
 #define DEPEX_STACK_SIZE_INCREMENT  0x1000
 
+#if defined (MDE_CPU_IPF)
+///
+/// For Itanium machines make the default allocations 8K aligned
+///
+#define EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT  (EFI_PAGE_SIZE * 2)
+#define DEFAULT_PAGE_ALLOCATION                     (EFI_PAGE_SIZE * 2)
+
+#elif defined (MDE_CPU_AARCH64)
+///
+/// 64-bit ARM systems allow the OS to execute with 64 KB page size,
+/// so for improved interoperability with the firmware, align the
+/// runtime regions to 64 KB as well
+///
+#define EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT  (SIZE_64KB)
+#define DEFAULT_PAGE_ALLOCATION                     (EFI_PAGE_SIZE)
+
+#else
+///
+/// For genric EFI machines make the default allocations 4K aligned
+///
+#define EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT  (EFI_PAGE_SIZE)
+#define DEFAULT_PAGE_ALLOCATION                     (EFI_PAGE_SIZE)
+
+#endif
+
 typedef struct {
   EFI_GUID                    *ProtocolGuid;
   VOID                        **Protocol;

Modified: trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Imem.h
===================================================================
--- trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Imem.h 2015-07-02 07:32:33 UTC (rev 
17810)
+++ trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Imem.h 2015-07-02 07:32:44 UTC (rev 
17811)
@@ -15,31 +15,6 @@
 #ifndef _IMEM_H_
 #define _IMEM_H_
 
-#if defined (MDE_CPU_IPF)
-///
-/// For Itanium machines make the default allocations 8K aligned
-///
-#define EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT  (EFI_PAGE_SIZE * 2)
-#define DEFAULT_PAGE_ALLOCATION                     (EFI_PAGE_SIZE * 2)
-
-#elif defined (MDE_CPU_AARCH64)
-///
-/// 64-bit ARM systems allow the OS to execute with 64 KB page size,
-/// so for improved interoperability with the firmware, align the
-/// runtime regions to 64 KB as well
-///
-#define EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT  (SIZE_64KB)
-#define DEFAULT_PAGE_ALLOCATION                     (EFI_PAGE_SIZE)
-
-#else
-///
-/// For genric EFI machines make the default allocations 4K aligned
-///
-#define EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT  (EFI_PAGE_SIZE)
-#define DEFAULT_PAGE_ALLOCATION                     (EFI_PAGE_SIZE)
-
-#endif
-
 //
 // +---------------------------------------------------+
 // | 0..(EfiMaxMemoryType - 1)    - Normal memory type |


------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to