2 files changed, 83 insertions, 10 deletions
diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
index c30eff1b5d..bc405bfe79 100644
--- a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
+++ b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
@@ -1,6 +1,6 @@
 ## @file
 #
-#  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
 #  which accompanies this distribution.  The full text of the license may be found at
@@ -12,15 +12,18 @@
 ##
 
 [Head]
-NumOfUpdate = 1
-NumOfRecovery = 1
-Update0 = Vlv2FvMain
-Recovery0 = Vlv2FvMain
+NumOfUpdate = 5
+NumOfRecovery = 0
+Update0 = Vlv2FvBinary
+Update1 = Vlv2FvMain
+Update2 = Vlv2FvRecovery2
+Update3 = Vlv2FvRecovery
+Update4 = Vlv2FvNvRam
 
 [Vlv2FvMicrocode]
 FirmwareType = 0            # SystemFirmware
 AddressType = 0             # 0 - relative address, 1 - absolute address.
-BaseAddress = 0x00000000    # Base address offset on flash
+BaseAddress = 0x00400000    # Base address offset on flash
 Length      = 0x00040000    # Length
 ImageOffset = 0x00000000    # Image offset of this SystemFirmware image
 FileGuid    = 14D83A59-A810-4556-8192-1C0A593C065C  # PcdEdkiiSystemFirmwareFileGuid
@@ -28,7 +31,7 @@ FileGuid    = 14D83A59-A810-4556-8192-1C0A593C065C  # PcdEdkiiSystemFirmwareFile
 [Vlv2FvNvRam]
 FirmwareType = 1            # NvRam
 AddressType = 0             # 0 - relative address, 1 - absolute address.
-BaseAddress = 0x00040000    # Base address offset on flash
+BaseAddress = 0x00440000    # Base address offset on flash
 Length      = 0x00080000    # Length
 ImageOffset = 0x00040000    # Image offset of this SystemFirmware image
 FileGuid    = 14D83A59-A810-4556-8192-1C0A593C065C  # PcdEdkiiSystemFirmwareFileGuid
@@ -36,7 +39,7 @@ FileGuid    = 14D83A59-A810-4556-8192-1C0A593C065C  # PcdEdkiiSystemFirmwareFile
 [Vlv2FvBinary]
 FirmwareType = 0            # SystemFirmware
 AddressType = 0             # 0 - relative address, 1 - absolute address.
-BaseAddress = 0x000C0000    # Base address offset on flash
+BaseAddress = 0x004C0000    # Base address offset on flash
 Length      = 0x00050000    # Length
 ImageOffset = 0x000C0000    # Image offset of this SystemFirmware image
 FileGuid    = 14D83A59-A810-4556-8192-1C0A593C065C  # PcdEdkiiSystemFirmwareFileGuid
@@ -52,7 +55,7 @@ FileGuid    = 14D83A59-A810-4556-8192-1C0A593C065C  # PcdEdkiiSystemFirmwareFile
 [Vlv2FvRecovery2]
 FirmwareType = 0            # SystemFirmware
 AddressType = 0             # 0 - relative address, 1 - absolute address.
-BaseAddress = 0x00320000    # Base address offset on flash
+BaseAddress = 0x00720000    # Base address offset on flash
 Length      = 0x00070000    # Length
 ImageOffset = 0x00320000    # Image offset of this SystemFirmware image
 FileGuid    = 14D83A59-A810-4556-8192-1C0A593C065C  # PcdEdkiiSystemFirmwareFileGuid
@@ -60,7 +63,7 @@ FileGuid    = 14D83A59-A810-4556-8192-1C0A593C065C  # PcdEdkiiSystemFirmwareFile
 [Vlv2FvRecovery]
 FirmwareType = 0            # SystemFirmware
 AddressType = 0             # 0 - relative address, 1 - absolute address.
-BaseAddress = 0x00390000    # Base address offset on flash
+BaseAddress = 0x00790000    # Base address offset on flash
 Length      = 0x00070000    # Length
 ImageOffset = 0x00390000    # Image offset of this SystemFirmware image
 FileGuid    = 14D83A59-A810-4556-8192-1C0A593C065C  # PcdEdkiiSystemFirmwareFileGuid
diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfigGcc.ini b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfigGcc.ini
new file mode 100644
index 0000000000..438a5a9842
--- /dev/null
+++ b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfigGcc.ini
@@ -0,0 +1,70 @@
+## @file
+#
+#  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
+#  This program and the accompanying materials
+#  are licensed and made available under the terms and conditions of the BSD License
+#  which accompanies this distribution.  The full text of the license may be found at
+#  http://opensource.org/licenses/bsd-license.php
+#
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+##
+
+[Head]
+NumOfUpdate = 5
+NumOfRecovery = 0
+Update0 = Vlv2FvBinary
+Update1 = Vlv2FvMain
+Update2 = Vlv2FvRecovery2
+Update3 = Vlv2FvRecovery
+Update4 = Vlv2FvNvRam
+
+[Vlv2FvMicrocode]
+FirmwareType = 0            # SystemFirmware
+AddressType = 0             # 0 - relative address, 1 - absolute address.
+BaseAddress = 0x00400000    # Base address offset on flash
+Length      = 0x00040000    # Length
+ImageOffset = 0x00000000    # Image offset of this SystemFirmware image
+FileGuid    = 14D83A59-A810-4556-8192-1C0A593C065C  # PcdEdkiiSystemFirmwareFileGuid
+
+[Vlv2FvNvRam]
+FirmwareType = 1            # NvRam
+AddressType = 0             # 0 - relative address, 1 - absolute address.
+BaseAddress = 0x00440000    # Base address offset on flash
+Length      = 0x00080000    # Length
+ImageOffset = 0x00040000    # Image offset of this SystemFirmware image
+FileGuid    = 14D83A59-A810-4556-8192-1C0A593C065C  # PcdEdkiiSystemFirmwareFileGuid
+
+[Vlv2FvBinary]
+FirmwareType = 0            # SystemFirmware
+AddressType = 0             # 0 - relative address, 1 - absolute address.
+BaseAddress = 0x004C0000    # Base address offset on flash
+Length      = 0x00050000    # Length
+ImageOffset = 0x000C0000    # Image offset of this SystemFirmware image
+FileGuid    = 14D83A59-A810-4556-8192-1C0A593C065C  # PcdEdkiiSystemFirmwareFileGuid
+
+[Vlv2FvMain]
+FirmwareType = 0            # SystemFirmware
+AddressType = 0             # 0 - relative address, 1 - absolute address.
+BaseAddress = 0x00510000    # Base address offset on flash
+Length      = 0x00215000    # Length
+ImageOffset = 0x00110000    # Image offset of this SystemFirmware image
+FileGuid    = 14D83A59-A810-4556-8192-1C0A593C065C  # PcdEdkiiSystemFirmwareFileGuid
+
+[Vlv2FvRecovery2]
+FirmwareType = 0            # SystemFirmware
+AddressType = 0             # 0 - relative address, 1 - absolute address.
+BaseAddress = 0x00725000    # Base address offset on flash
+Length      = 0x0006B000    # Length
+ImageOffset = 0x00325000    # Image offset of this SystemFirmware image
+FileGuid    = 14D83A59-A810-4556-8192-1C0A593C065C  # PcdEdkiiSystemFirmwareFileGuid
+
+[Vlv2FvRecovery]
+FirmwareType = 0            # SystemFirmware
+AddressType = 0             # 0 - relative address, 1 - absolute address.
+BaseAddress = 0x00790000    # Base address offset on flash
+Length      = 0x00070000    # Length
+ImageOffset = 0x00390000    # Image offset of this SystemFirmware image
+FileGuid    = 14D83A59-A810-4556-8192-1C0A593C065C  # PcdEdkiiSystemFirmwareFileGuid
+