Revision: 17172
http://sourceforge.net/p/edk2/code/17172
Author: timhe
Date: 2015-04-14 06:29:13 +0000 (Tue, 14 Apr 2015)
Log Message:
-----------
Sync the branch changes to trunk.
Update BiosID and optimize the flash layout.
Upgrade uefi shell from 1.0 to 2.0.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tim He <[email protected]>
Modified Paths:
--------------
trunk/edk2/Vlv2TbltDevicePkg/BiosIdD.env
trunk/edk2/Vlv2TbltDevicePkg/BiosIdR.env
trunk/edk2/Vlv2TbltDevicePkg/BiosIdx64D.env
trunk/edk2/Vlv2TbltDevicePkg/BiosIdx64R.env
trunk/edk2/Vlv2TbltDevicePkg/PlatformPkg.fdf
trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
Modified: trunk/edk2/Vlv2TbltDevicePkg/BiosIdD.env
===================================================================
--- trunk/edk2/Vlv2TbltDevicePkg/BiosIdD.env 2015-04-14 06:05:51 UTC (rev
17171)
+++ trunk/edk2/Vlv2TbltDevicePkg/BiosIdD.env 2015-04-14 06:29:13 UTC (rev
17172)
@@ -35,5 +35,5 @@
BUILD_TYPE = D
BOARD_ID = BLAKCRB
-VERSION_MAJOR = 0078
-VERSION_MINOR = 02
+VERSION_MAJOR = 0079
+VERSION_MINOR = 01
Modified: trunk/edk2/Vlv2TbltDevicePkg/BiosIdR.env
===================================================================
--- trunk/edk2/Vlv2TbltDevicePkg/BiosIdR.env 2015-04-14 06:05:51 UTC (rev
17171)
+++ trunk/edk2/Vlv2TbltDevicePkg/BiosIdR.env 2015-04-14 06:29:13 UTC (rev
17172)
@@ -35,5 +35,5 @@
BUILD_TYPE = R
BOARD_ID = BLAKCRB
-VERSION_MAJOR = 0078
-VERSION_MINOR = 02
+VERSION_MAJOR = 0079
+VERSION_MINOR = 01
Modified: trunk/edk2/Vlv2TbltDevicePkg/BiosIdx64D.env
===================================================================
--- trunk/edk2/Vlv2TbltDevicePkg/BiosIdx64D.env 2015-04-14 06:05:51 UTC (rev
17171)
+++ trunk/edk2/Vlv2TbltDevicePkg/BiosIdx64D.env 2015-04-14 06:29:13 UTC (rev
17172)
@@ -34,6 +34,6 @@
OEM_ID = X64
BUILD_TYPE = D
-VERSION_MAJOR = 0078
-VERSION_MINOR = 02
+VERSION_MAJOR = 0079
+VERSION_MINOR = 01
BOARD_ID = BBAYCRB
Modified: trunk/edk2/Vlv2TbltDevicePkg/BiosIdx64R.env
===================================================================
--- trunk/edk2/Vlv2TbltDevicePkg/BiosIdx64R.env 2015-04-14 06:05:51 UTC (rev
17171)
+++ trunk/edk2/Vlv2TbltDevicePkg/BiosIdx64R.env 2015-04-14 06:29:13 UTC (rev
17172)
@@ -34,6 +34,6 @@
OEM_ID = X64
BUILD_TYPE = R
-VERSION_MAJOR = 0078
-VERSION_MINOR = 02
+VERSION_MAJOR = 0079
+VERSION_MINOR = 01
BOARD_ID = BBAYCRB
Modified: trunk/edk2/Vlv2TbltDevicePkg/PlatformPkg.fdf
===================================================================
--- trunk/edk2/Vlv2TbltDevicePkg/PlatformPkg.fdf 2015-04-14 06:05:51 UTC
(rev 17171)
+++ trunk/edk2/Vlv2TbltDevicePkg/PlatformPkg.fdf 2015-04-14 06:29:13 UTC
(rev 17172)
@@ -34,50 +34,39 @@
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
+DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00100000
+DEFINE FLASH_REGION_FVMAIN_SIZE = 0x001A6000
!endif
-!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
!endif
@@ -677,7 +666,8 @@
# 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
}
Modified: trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
===================================================================
--- trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf 2015-04-14 06:05:51 UTC
(rev 17171)
+++ trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf 2015-04-14 06:29:13 UTC
(rev 17172)
@@ -34,29 +34,29 @@
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
-DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00130000
-DEFINE FLASH_REGION_FVMAIN_SIZE = 0x0016C000
+DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00100000
+DEFINE FLASH_REGION_FVMAIN_SIZE = 0x00196000
-DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x0029C000
-DEFINE FLASH_REGION_FV_RECOVERY2_SIZE = 0x0002F000
+DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x00296000
+DEFINE FLASH_REGION_FV_RECOVERY2_SIZE = 0x0002D000
-DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x002CB000
-DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x00035000
+DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x002C3000
+DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x0003D000
################################################################################
#
Modified: trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
===================================================================
--- trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc 2015-04-14 06:05:51 UTC
(rev 17171)
+++ trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc 2015-04-14 06:29:13 UTC
(rev 17172)
@@ -585,7 +585,7 @@
[PcdsFixedAtBuild.common]
!if $(MINNOW2_FSP_BUILD) == TRUE
# $(FLASH_REGION_VLVMICROCODE_BASE)
- gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFE00000
+ gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFDD0000
# $(FLASH_REGION_VLVMICROCODE_SIZE)
gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00030000
gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60
@@ -594,7 +594,7 @@
# $(FLASH_AREA_SIZE)
gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000
# $(FLASH_REGION_FSPBIN_BASE)
- gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFDB0000
+ gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFD80000
!endif
!if $(PERFORMANCE_ENABLE) == TRUE
Modified: trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
===================================================================
--- trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc 2015-04-14 06:05:51 UTC
(rev 17171)
+++ trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc 2015-04-14 06:29:13 UTC
(rev 17172)
@@ -585,7 +585,7 @@
[PcdsFixedAtBuild.common]
!if $(MINNOW2_FSP_BUILD) == TRUE
# $(FLASH_REGION_VLVMICROCODE_BASE)
- gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFE00000
+ gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFDD0000
# $(FLASH_REGION_VLVMICROCODE_SIZE)
gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00030000
gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60
@@ -594,7 +594,7 @@
# $(FLASH_AREA_SIZE)
gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000
# $(FLASH_REGION_FSPBIN_BASE)
- gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFDB0000
+ gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFD80000
!endif
!if $(PERFORMANCE_ENABLE) == TRUE
@@ -813,10 +813,12 @@
## This PCD defines the video horizontal resolution.
# This PCD could be set to 0 then video resolution could be at highest
resolution.
- gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0
+ #gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0
+ gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|800
## This PCD defines the video vertical resolution.
# This PCD could be set to 0 then video resolution could be at highest
resolution.
- gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0
+ #gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0
+ gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|600
## This PCD defines the Console output column and the default value is 25
according to UEFI spec.
# This PCD could be set to 0 then console output could be at max column and
max row.
Modified: trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
===================================================================
--- trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgX64.dsc 2015-04-14 06:05:51 UTC
(rev 17171)
+++ trunk/edk2/Vlv2TbltDevicePkg/PlatformPkgX64.dsc 2015-04-14 06:29:13 UTC
(rev 17172)
@@ -585,7 +585,7 @@
[PcdsFixedAtBuild.common]
!if $(MINNOW2_FSP_BUILD) == TRUE
# $(FLASH_REGION_VLVMICROCODE_BASE)
- gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFE00000
+ gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFDD0000
# $(FLASH_REGION_VLVMICROCODE_SIZE)
gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00030000
gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60
@@ -594,7 +594,7 @@
# $(FLASH_AREA_SIZE)
gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000
# $(FLASH_REGION_FSPBIN_BASE)
- gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFDB0000
+ gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFD80000
!endif
!if $(PERFORMANCE_ENABLE) == TRUE
@@ -813,10 +813,12 @@
## This PCD defines the video horizontal resolution.
# This PCD could be set to 0 then video resolution could be at highest
resolution.
- gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0
+ #gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0
+ gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|800
## This PCD defines the video vertical resolution.
# This PCD could be set to 0 then video resolution could be at highest
resolution.
- gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0
+ #gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0
+ gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|600
## This PCD defines the Console output column and the default value is 25
according to UEFI spec.
# This PCD could be set to 0 then console output could be at max column and
max row.
------------------------------------------------------------------------------
BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT
Develop your own process in accordance with the BPMN 2 standard
Learn Process modeling best practices with Bonita BPM through live exercises
http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_
source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
