1. solve build time issue that FV size is exceed due to more modules is included.

2. solve invalid instruction issue when running SecMain executive.

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

diff --git a/UnixPkg/Sec/SecMain.c b/UnixPkg/Sec/SecMain.c
index d548644386b9e3acad3c9f61caae33939ee0d518..f0627be39a9943daa1ce1e33c238f049882273a7 100644 (file)
--- a/UnixPkg/Sec/SecMain.c
+++ b/UnixPkg/Sec/SecMain.c
@@ -1070,9 +1070,9 @@ IsPdbFile (
     return FALSE;
   }
 
     return FALSE;
   }
 

-  if ((PdbFileName[Len - 3] == 'P' || PdbFileName[Len - 3] == 'p') &&
-      (PdbFileName[Len - 2] == 'D' || PdbFileName[Len - 2] == 'd') &&
-      (PdbFileName[Len - 1] == 'B' || PdbFileName[Len - 1] == 'b')) {
+  if ((PdbFileName[Len - 3] == 'D' || PdbFileName[Len - 3] == 'd') &&
+      (PdbFileName[Len - 2] == 'L' || PdbFileName[Len - 2] == 'l') &&
+      (PdbFileName[Len - 1] == 'L' || PdbFileName[Len - 1] == 'l')) {

     return TRUE;
   }
 
     return TRUE;
   }
 

diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index 2a6ee25f6ce473144e8b88c1e54af625d13ce573..42e73a2fd9a1f345fc4eae766ffa42503c7d88ac 100644 (file)
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -32,10 +32,10 @@
 # relocated in place (works, but not a great idea).\r
 #\r
 BaseAddress   = 0x41000000|gEfiUnixPkgTokenSpaceGuid.PcdUnixFdBaseAddress   #The base address of the FLASH Device.\r
 # relocated in place (works, but not a great idea).\r
 #\r
 BaseAddress   = 0x41000000|gEfiUnixPkgTokenSpaceGuid.PcdUnixFdBaseAddress   #The base address of the FLASH Device.\r

-Size          = 0x002a0000|gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareFdSize  #The size in bytes of the FLASH Device\r
+Size          = 0x00300000|gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareFdSize  #The size in bytes of the FLASH Device\r

 ErasePolarity = 1\r
 BlockSize     = 0x10000\r
 ErasePolarity = 1\r
 BlockSize     = 0x10000\r

-NumBlocks     = 0x2a\r
+NumBlocks     = 0x30\r

 \r
 ################################################################################\r
 #\r
 \r
 ################################################################################\r
 #\r


@@ -52,11 +52,11 @@ NumBlocks     = 0x2a
 # RegionType <FV, DATA, or FILE>\r
 #\r
 ################################################################################\r
 # RegionType <FV, DATA, or FILE>\r
 #\r
 ################################################################################\r

-0x00000000|0x00280000\r
+0x00000000|0x002e0000\r

 gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoveryBase|gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoverySize\r
 FV = FvRecovery\r
 \r
 gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoveryBase|gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoverySize\r
 FV = FvRecovery\r
 \r

-0x00280000|0x0000c000\r
+0x002e0000|0x0000c000\r

 gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
 #NV_VARIABLE_STORE\r
 DATA = {\r
 gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
 #NV_VARIABLE_STORE\r
 DATA = {\r


@@ -90,11 +90,11 @@ DATA = {
   0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
 }\r
 \r
   0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
 }\r
 \r

-0x0028c000|0x00002000\r
+0x002ec000|0x00002000\r

 #NV_EVENT_LOG\r
 gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogBase|gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogSize\r
 \r
 #NV_EVENT_LOG\r
 gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogBase|gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogSize\r
 \r

-0x0028e000|0x00002000\r
+0x002ee000|0x00002000\r

 gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize\r
 #NV_FTW_WORKING\r
 DATA = {\r
 gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize\r
 #NV_FTW_WORKING\r
 DATA = {\r


@@ -108,7 +108,7 @@ DATA = {
   0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
 }\r
 \r
   0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
 }\r
 \r

-0x00290000|0x00010000\r
+0x002f0000|0x00010000\r

 #NV_FTW_SPARE\r
 gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
 \r
 #NV_FTW_SPARE\r
 gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
 \r