IntelFsp2Pkg: Removing FSP Data Table

[mirror_edk2.git] / DuetPkg / DxeIpl / HobGeneration.c

diff --git a/DuetPkg/DxeIpl/HobGeneration.c b/DuetPkg/DxeIpl/HobGeneration.c
index d1e6232a6369cd38fcc06b6f5f2ad166187ad523..fac74b08fd98d47fdd0d69f23b05ea4c2009de78 100644 (file)
--- a/DuetPkg/DxeIpl/HobGeneration.c
+++ b/DuetPkg/DxeIpl/HobGeneration.c
@@ -1,7 +1,7 @@
 /** @file\r
 \r
-Copyright (c) 2006 - 2010, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+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
 http://opensource.org/licenses/bsd-license.php                                            \r
@@ -23,11 +23,9 @@ Revision History:
 #include "FlashLayout.h"\r
 #include "Debug.h"\r
 \r
-#define EFI_DXE_FILE_GUID \\r
-  { 0xb1644c1a, 0xc16a, 0x4c5b, {0x88, 0xde, 0xea, 0xfb, 0xa9, 0x7e, 0x74, 0xd8 }}\r
-\r
 #define EFI_CPUID_EXTENDED_FUNCTION  0x80000000\r
 #define CPUID_EXTENDED_ADD_SIZE      0x80000008\r
+#define EBDA_VALUE_ADDRESS           0x40E\r
 \r
 HOB_TEMPLATE  gHobTemplate = {\r
   { // Phit\r
@@ -188,7 +186,7 @@ HOB_TEMPLATE  gHobTemplate = {
         0, 0, 0, 0                                  // UINT8                 Reserved[4]; \r
       },\r
     },\r
-    EFI_DXE_FILE_GUID,\r
+    DXE_CORE_FILE_NAME_GUID,\r
     0x0                                             //  EFI_PHYSICAL_ADDRESS of EntryPoint;\r
   },\r
   { // MemoryDxeCore\r
@@ -362,7 +360,7 @@ HOB_TEMPLATE  gHobTemplate = {
         sizeof (MEMORY_DESC_HOB),          // Hob size\r
         0                                  // reserved\r
       },\r
-      EFI_LDR_MEMORY_DESCRIPTOR_GUID\r
+      LDR_MEMORY_DESCRIPTOR_GUID\r
     },\r
     0,\r
     NULL\r
@@ -605,12 +603,21 @@ Return:
 --*/\r
 {\r
   UINTN                Index;\r
+  UINT64               EbdaAddress;\r
 \r
   //\r
   // Prepare Low Memory\r
   // 0x18 pages is 72 KB.\r
   //\r
-  gHob->MemoryFreeUnder1MB.ResourceLength = EFI_MEMORY_BELOW_1MB_END - EFI_MEMORY_BELOW_1MB_START;\r
+  EbdaAddress = ((UINT64)(*(UINT16 *)(UINTN)(EBDA_VALUE_ADDRESS))) << 4;\r
+  if (EbdaAddress < 0x9A000 || EbdaAddress > EFI_MEMORY_BELOW_1MB_END) {\r
+    //\r
+    // EBDA should not go below 0x9A000 in any implementation,\r
+    // so add check here to make sure EBDA_VALUE_ADDRESS has a valid value.\r
+    //\r
+    EbdaAddress = EFI_MEMORY_BELOW_1MB_END;\r
+  }\r
+  gHob->MemoryFreeUnder1MB.ResourceLength = EbdaAddress - EFI_MEMORY_BELOW_1MB_START;\r
   gHob->MemoryFreeUnder1MB.PhysicalStart  = EFI_MEMORY_BELOW_1MB_START;\r
 \r
   //\r