From f28175045d900b01207e96e26a8626e6b232ec46 Mon Sep 17 00:00:00 2001 From: Jiewen Yao Date: Mon, 30 Oct 2017 13:45:57 +0800 Subject: Separate FspMT. Cc: Michael A Kubacki Cc: Amy Chan Cc: Chasel Chiu Cc: Brett Wang Cc: Daocheng Bu Cc: Isaac W Oram Cc: Rangasai V Chaganty Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao Reviewed-by: Michael A Kubacki Reviewed-by: Rangasai V Chaganty --- Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec | 15 +++++++++------ .../Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py | 8 +++++--- 2 files changed, 14 insertions(+), 9 deletions(-) (limited to 'Platform/Intel/MinPlatformPkg') diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec index 71a2afcb93..c4ee28c768 100644 --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec @@ -108,12 +108,15 @@ gMinPlatformModuleTokenSpaceGuid.PcdFlashNvStorageVariableOffset|0x00000000|UINT gMinPlatformModuleTokenSpaceGuid.PcdFlashNvStorageFtwSpareOffset|0x00000000|UINT32|0x2000001A gMinPlatformModuleTokenSpaceGuid.PcdFlashNvStorageFtwWorkingOffset|0x00000000|UINT32|0x2000001B -gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspMTBase|0x00000000|UINT32|0x20000021 -gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspMTSize|0x00000000|UINT32|0x20000022 -gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspMTOffset|0x00000000|UINT32|0x20000023 -gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspSBase|0x00000000|UINT32|0x20000024 -gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspSSize|0x00000000|UINT32|0x20000025 -gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspSOffset|0x00000000|UINT32|0x20000026 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspTBase|0x00000000|UINT32|0x20000021 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspTSize|0x00000000|UINT32|0x20000022 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspTOffset|0x00000000|UINT32|0x20000023 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspMBase|0x00000000|UINT32|0x20000024 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspMSize|0x00000000|UINT32|0x20000025 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspMOffset|0x00000000|UINT32|0x20000026 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspSBase|0x00000000|UINT32|0x20000027 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspSSize|0x00000000|UINT32|0x20000028 +gMinPlatformModuleTokenSpaceGuid.PcdFlashFvFspSOffset|0x00000000|UINT32|0x20000029 gMinPlatformModuleTokenSpaceGuid.PcdFspMaxUpdSize|0x00000000|UINT32|0x80000000 gMinPlatformModuleTokenSpaceGuid.PcdFspReservedSizeOnStackTop|0x00000040|UINT32|0x80000001 diff --git a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py index 1558ad9bc3..7fe26df1d9 100644 --- a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py +++ b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py @@ -57,12 +57,14 @@ flashBase = long(data.split("FLASH_BASE")[1].split("=")[1].split()[0], 16) # Based on Build Target, select the section in the FlashMap file flashmap = data -# Get FSP-S & FSP-M-T offset & calculate the base +# Get FSP-S & FSP-M & FSP-T offset & calculate the base for line in flashmap.split("\n"): if "PcdFlashFvFspSOffset" in line: fspSBaseOffset = long(line.split("=")[1].split()[0], 16) - if "PcdFlashFvFspMTOffset" in line: + if "PcdFlashFvFspMOffset" in line: fspMBaseOffset = long(line.split("=")[1].split()[0], 16) + if "PcdFlashFvFspTOffset" in line: + fspTBaseOffset = long(line.split("=")[1].split()[0], 16) file.close() # @@ -80,7 +82,7 @@ for line in FsptInfo[1].split("\n"): # Calculate FSP-S/M/T base address, to which re-base has to be done fspSBaseAddress = flashBase + fspSBaseOffset + fvOffset fspMBaseAddress = flashBase + fspMBaseOffset -fspTBaseAddress = flashBase + fspMBaseOffset + fspMSize +fspTBaseAddress = flashBase + fspTBaseOffset # # Re-base FSP bin file to new address and save it as fspBinFileRebased using SplitFspBin.py -- cgit v1.2.3