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 <tim.he@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17172 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Tim He 2015-04-14 06:29:13 +00:00 committed by timhe
parent 8507a90305
commit a4d42c22d2
9 changed files with 47 additions and 53 deletions

View File

@ -26,5 +26,5 @@ OEM_ID = I32
BUILD_TYPE = D BUILD_TYPE = D
BOARD_ID = BLAKCRB BOARD_ID = BLAKCRB
VERSION_MAJOR = 0078 VERSION_MAJOR = 0079
VERSION_MINOR = 02 VERSION_MINOR = 01

View File

@ -26,5 +26,5 @@ OEM_ID = I32
BUILD_TYPE = R BUILD_TYPE = R
BOARD_ID = BLAKCRB BOARD_ID = BLAKCRB
VERSION_MAJOR = 0078 VERSION_MAJOR = 0079
VERSION_MINOR = 02 VERSION_MINOR = 01

View File

@ -25,6 +25,6 @@ BOARD_REV = 1
OEM_ID = X64 OEM_ID = X64
BUILD_TYPE = D BUILD_TYPE = D
VERSION_MAJOR = 0078 VERSION_MAJOR = 0079
VERSION_MINOR = 02 VERSION_MINOR = 01
BOARD_ID = BBAYCRB BOARD_ID = BBAYCRB

View File

@ -25,6 +25,6 @@ BOARD_REV = 1
OEM_ID = X64 OEM_ID = X64
BUILD_TYPE = R BUILD_TYPE = R
VERSION_MAJOR = 0078 VERSION_MAJOR = 0079
VERSION_MINOR = 02 VERSION_MINOR = 01
BOARD_ID = BBAYCRB BOARD_ID = BBAYCRB

View File

@ -34,49 +34,38 @@ DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET = 0x00040000
DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE = 0x00040000 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE = 0x00040000
!if $(MINNOW2_FSP_BUILD) == TRUE !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_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_SIZE = 0x00008000
DEFINE FLASH_REGION_AZALIABIN_BASE = 0xFFDF8000 DEFINE FLASH_REGION_AZALIABIN_BASE = 0xFFDC8000
!endif !endif
DEFINE FLASH_REGION_VLVMICROCODE_OFFSET = 0x00100000 DEFINE FLASH_REGION_VLVMICROCODE_OFFSET = 0x000D0000
DEFINE FLASH_REGION_VLVMICROCODE_SIZE = 0x00030000 DEFINE FLASH_REGION_VLVMICROCODE_SIZE = 0x00030000
DEFINE FLASH_REGION_VLVMICROCODE_BASE = 0xFFE00000 DEFINE FLASH_REGION_VLVMICROCODE_BASE = 0xFFDD0000
!if $(TARGET) == RELEASE !if $(TARGET) == RELEASE
DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00170000 DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00100000
DEFINE FLASH_REGION_FVMAIN_SIZE = 0x0012d000 DEFINE FLASH_REGION_FVMAIN_SIZE = 0x001AF000
!else !else
!if $(SOURCE_DEBUG_ENABLE) == TRUE DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00100000
DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00130000 DEFINE FLASH_REGION_FVMAIN_SIZE = 0x001A6000
DEFINE FLASH_REGION_FVMAIN_SIZE = 0x00176000
!else
DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00140000
DEFINE FLASH_REGION_FVMAIN_SIZE = 0x00166000
!endif
!endif !endif
!if $(TARGET) == RELEASE !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_RECOVERY2_SIZE = 0x00021000
DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x002D0000 DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x002D0000
DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x00030000 DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x00030000
!else !else
!if $(SOURCE_DEBUG_ENABLE) == TRUE
DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x002A6000 DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x002A6000
DEFINE FLASH_REGION_FV_RECOVERY2_SIZE = 0x0002D000 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_OFFSET = 0x002D3000
DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x0002D000 DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x0002D000
@ -677,7 +666,8 @@ FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {
# UEFI Shell # UEFI Shell
# #
FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) { 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
} }

View File

@ -34,29 +34,29 @@ DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET = 0x00040000
DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE = 0x00040000 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE = 0x00040000
!if $(MINNOW2_FSP_BUILD) == TRUE !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_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_SIZE = 0x00008000
DEFINE FLASH_REGION_AZALIABIN_BASE = 0xFFDF8000 DEFINE FLASH_REGION_AZALIABIN_BASE = 0xFFDC8000
!endif !endif
DEFINE FLASH_REGION_VLVMICROCODE_OFFSET = 0x00100000 DEFINE FLASH_REGION_VLVMICROCODE_OFFSET = 0x000D0000
DEFINE FLASH_REGION_VLVMICROCODE_SIZE = 0x00030000 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_OFFSET = 0x00100000
DEFINE FLASH_REGION_FVMAIN_SIZE = 0x0016C000 DEFINE FLASH_REGION_FVMAIN_SIZE = 0x00196000
DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x0029C000 DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x00296000
DEFINE FLASH_REGION_FV_RECOVERY2_SIZE = 0x0002F000 DEFINE FLASH_REGION_FV_RECOVERY2_SIZE = 0x0002D000
DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x002CB000 DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x002C3000
DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x00035000 DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x0003D000
################################################################################ ################################################################################
# #

View File

@ -585,7 +585,7 @@
[PcdsFixedAtBuild.common] [PcdsFixedAtBuild.common]
!if $(MINNOW2_FSP_BUILD) == TRUE !if $(MINNOW2_FSP_BUILD) == TRUE
# $(FLASH_REGION_VLVMICROCODE_BASE) # $(FLASH_REGION_VLVMICROCODE_BASE)
gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFE00000 gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFDD0000
# $(FLASH_REGION_VLVMICROCODE_SIZE) # $(FLASH_REGION_VLVMICROCODE_SIZE)
gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00030000 gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00030000
gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60 gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60
@ -594,7 +594,7 @@
# $(FLASH_AREA_SIZE) # $(FLASH_AREA_SIZE)
gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000 gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000
# $(FLASH_REGION_FSPBIN_BASE) # $(FLASH_REGION_FSPBIN_BASE)
gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFDB0000 gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFD80000
!endif !endif
!if $(PERFORMANCE_ENABLE) == TRUE !if $(PERFORMANCE_ENABLE) == TRUE

View File

@ -585,7 +585,7 @@
[PcdsFixedAtBuild.common] [PcdsFixedAtBuild.common]
!if $(MINNOW2_FSP_BUILD) == TRUE !if $(MINNOW2_FSP_BUILD) == TRUE
# $(FLASH_REGION_VLVMICROCODE_BASE) # $(FLASH_REGION_VLVMICROCODE_BASE)
gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFE00000 gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFDD0000
# $(FLASH_REGION_VLVMICROCODE_SIZE) # $(FLASH_REGION_VLVMICROCODE_SIZE)
gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00030000 gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00030000
gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60 gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60
@ -594,7 +594,7 @@
# $(FLASH_AREA_SIZE) # $(FLASH_AREA_SIZE)
gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000 gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000
# $(FLASH_REGION_FSPBIN_BASE) # $(FLASH_REGION_FSPBIN_BASE)
gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFDB0000 gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFD80000
!endif !endif
!if $(PERFORMANCE_ENABLE) == TRUE !if $(PERFORMANCE_ENABLE) == TRUE
@ -813,10 +813,12 @@
## This PCD defines the video horizontal resolution. ## This PCD defines the video horizontal resolution.
# This PCD could be set to 0 then video resolution could be at highest 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 defines the video vertical resolution.
# This PCD could be set to 0 then video resolution could be at highest 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 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. # This PCD could be set to 0 then console output could be at max column and max row.

View File

@ -585,7 +585,7 @@
[PcdsFixedAtBuild.common] [PcdsFixedAtBuild.common]
!if $(MINNOW2_FSP_BUILD) == TRUE !if $(MINNOW2_FSP_BUILD) == TRUE
# $(FLASH_REGION_VLVMICROCODE_BASE) # $(FLASH_REGION_VLVMICROCODE_BASE)
gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFE00000 gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFDD0000
# $(FLASH_REGION_VLVMICROCODE_SIZE) # $(FLASH_REGION_VLVMICROCODE_SIZE)
gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00030000 gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00030000
gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60 gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60
@ -594,7 +594,7 @@
# $(FLASH_AREA_SIZE) # $(FLASH_AREA_SIZE)
gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000 gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000
# $(FLASH_REGION_FSPBIN_BASE) # $(FLASH_REGION_FSPBIN_BASE)
gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFDB0000 gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFD80000
!endif !endif
!if $(PERFORMANCE_ENABLE) == TRUE !if $(PERFORMANCE_ENABLE) == TRUE
@ -813,10 +813,12 @@
## This PCD defines the video horizontal resolution. ## This PCD defines the video horizontal resolution.
# This PCD could be set to 0 then video resolution could be at highest 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 defines the video vertical resolution.
# This PCD could be set to 0 then video resolution could be at highest 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 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. # This PCD could be set to 0 then console output could be at max column and max row.