summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerictian <erictian@6f19259b-4bc3-4df7-8a09-765794883524>2011-03-31 09:18:14 +0000
committererictian <erictian@6f19259b-4bc3-4df7-8a09-765794883524>2011-03-31 09:18:14 +0000
commitad33170dc0b76121de076447f1bdabe7b103e9b6 (patch)
tree61953792f5af1abe5fbc087ff761df05b2e5bac8
parentb2bf9735860994b4f4ae3904fd784bedcdd26da1 (diff)
downloadedk2-platforms-ad33170dc0b76121de076447f1bdabe7b103e9b6.tar.xz
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
-rw-r--r--UnixPkg/Sec/SecMain.c6
-rw-r--r--UnixPkg/UnixPkg.fdf14
2 files changed, 10 insertions, 10 deletions
diff --git a/UnixPkg/Sec/SecMain.c b/UnixPkg/Sec/SecMain.c
index d548644386..f0627be39a 100644
--- a/UnixPkg/Sec/SecMain.c
+++ b/UnixPkg/Sec/SecMain.c
@@ -1070,9 +1070,9 @@ IsPdbFile (
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;
}
diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index 2a6ee25f6c..42e73a2fd9 100644
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -32,10 +32,10 @@
# relocated in place (works, but not a great idea).
#
BaseAddress = 0x41000000|gEfiUnixPkgTokenSpaceGuid.PcdUnixFdBaseAddress #The base address of the FLASH Device.
-Size = 0x002a0000|gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareFdSize #The size in bytes of the FLASH Device
+Size = 0x00300000|gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareFdSize #The size in bytes of the FLASH Device
ErasePolarity = 1
BlockSize = 0x10000
-NumBlocks = 0x2a
+NumBlocks = 0x30
################################################################################
#
@@ -52,11 +52,11 @@ NumBlocks = 0x2a
# RegionType <FV, DATA, or FILE>
#
################################################################################
-0x00000000|0x00280000
+0x00000000|0x002e0000
gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoveryBase|gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoverySize
FV = FvRecovery
-0x00280000|0x0000c000
+0x002e0000|0x0000c000
gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
#NV_VARIABLE_STORE
DATA = {
@@ -90,11 +90,11 @@ DATA = {
0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
}
-0x0028c000|0x00002000
+0x002ec000|0x00002000
#NV_EVENT_LOG
gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogBase|gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogSize
-0x0028e000|0x00002000
+0x002ee000|0x00002000
gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
#NV_FTW_WORKING
DATA = {
@@ -108,7 +108,7 @@ DATA = {
0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
}
-0x00290000|0x00010000
+0x002f0000|0x00010000
#NV_FTW_SPARE
gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize