Sync the branch changes to trunk.

[mirror_edk2.git] / Vlv2TbltDevicePkg / PlatformPkg.fdf

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 80772758690b835a476cbb1f156457ab836d1d47..ff0da1e834bdb89f60289beb534b606052dae782 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -34,49 +34,38 @@ DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET   = 0x00040000
 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE     = 0x00040000
 
 !if $(MINNOW2_FSP_BUILD) == TRUE
-DEFINE FLASH_REGION_FSPBIN_OFFSET                             = 0x000B0000
+DEFINE FLASH_REGION_FSPBIN_OFFSET                             = 0x00080000
 DEFINE FLASH_REGION_FSPBIN_SIZE                               = 0x00048000
-DEFINE FLASH_REGION_FSPBIN_BASE                               = 0xFFDB0000
+DEFINE FLASH_REGION_FSPBIN_BASE                               = 0xFFD80000
 
-DEFINE FLASH_REGION_AZALIABIN_OFFSET                          = 0x000F8000
+DEFINE FLASH_REGION_AZALIABIN_OFFSET                          = 0x000C8000
 DEFINE FLASH_REGION_AZALIABIN_SIZE                            = 0x00008000
-DEFINE FLASH_REGION_AZALIABIN_BASE                            = 0xFFDF8000
+DEFINE FLASH_REGION_AZALIABIN_BASE                            = 0xFFDC8000
 
 !endif
 
-DEFINE FLASH_REGION_VLVMICROCODE_OFFSET                       = 0x00100000
+DEFINE FLASH_REGION_VLVMICROCODE_OFFSET                       = 0x000D0000 
 DEFINE FLASH_REGION_VLVMICROCODE_SIZE                         = 0x00030000
-DEFINE FLASH_REGION_VLVMICROCODE_BASE                         = 0xFFE00000
+DEFINE FLASH_REGION_VLVMICROCODE_BASE                         = 0xFFDD0000
 
 !if $(TARGET) == RELEASE
-DEFINE FLASH_REGION_FVMAIN_OFFSET                             = 0x00170000
-DEFINE FLASH_REGION_FVMAIN_SIZE                               = 0x0012d000
+DEFINE FLASH_REGION_FVMAIN_OFFSET                             = 0x00100000
+DEFINE FLASH_REGION_FVMAIN_SIZE                               = 0x001AF000
 !else
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-DEFINE FLASH_REGION_FVMAIN_OFFSET                             = 0x00130000
-DEFINE FLASH_REGION_FVMAIN_SIZE                               = 0x00176000
-!else
-DEFINE FLASH_REGION_FVMAIN_OFFSET                             = 0x00140000
-DEFINE FLASH_REGION_FVMAIN_SIZE                               = 0x00166000
-!endif
+DEFINE FLASH_REGION_FVMAIN_OFFSET                             = 0x00100000
+DEFINE FLASH_REGION_FVMAIN_SIZE                               = 0x001A6000
 !endif
 
 !if $(TARGET) == RELEASE
-DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET                       = 0x0029d000
+DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET                       = 0x002AF000
 DEFINE FLASH_REGION_FV_RECOVERY2_SIZE                         = 0x00021000
 
 DEFINE FLASH_REGION_FV_RECOVERY_OFFSET                        = 0x002D0000
 DEFINE FLASH_REGION_FV_RECOVERY_SIZE                          = 0x00030000
 !else
 
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
 DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET                       = 0x002A6000
 DEFINE FLASH_REGION_FV_RECOVERY2_SIZE                         = 0x0002D000
-!else
-DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET                       = 0x002A6000
-DEFINE FLASH_REGION_FV_RECOVERY2_SIZE                         = 0x0002D000
-!endif
-
 
 DEFINE FLASH_REGION_FV_RECOVERY_OFFSET                        = 0x002D3000
 DEFINE FLASH_REGION_FV_RECOVERY_SIZE                          = 0x0002D000
@@ -677,7 +666,8 @@ FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {
 # UEFI Shell
 #
 FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
-    SECTION PE32 = EdkShellBinPkg/FullShell/$(EDK_DXE_ARCHITECTURE)/Shell_Full.efi
+#    SECTION PE32 = EdkShellBinPkg/FullShell/$(EDK_DXE_ARCHITECTURE)/Shell_Full.efi
+    SECTION PE32 = ShellBinPkg/UefiShell/$(EDK_DXE_ARCHITECTURE)/Shell.efi
   }