DEFINE FLASH_AREA_BASE_ADDRESS = 0xFF800000
DEFINE FLASH_AREA_SIZE = 0x00800000
+DEFINE FLASH_REGION_VLVMICROCODE_OFFSET = 0x00000000
+DEFINE FLASH_REGION_VLVMICROCODE_SIZE = 0x00030000
+DEFINE FLASH_REGION_VLVMICROCODE_BASE = 0xFFD00000
-DEFINE FLASH_REGION_VPD_OFFSET = 0x00000000
+DEFINE FLASH_REGION_VPD_OFFSET = 0x00030000
DEFINE FLASH_REGION_VPD_SIZE = 0x0003E000
-DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET = 0x0003E000
+DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET = 0x0006E000
DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_SIZE = 0x00002000
-DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET = 0x00040000
+DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET = 0x00070000
DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE = 0x00040000
!if $(MINNOW2_FSP_BUILD) == TRUE
!endif
-DEFINE FLASH_REGION_VLVMICROCODE_OFFSET = 0x00100000
-DEFINE FLASH_REGION_VLVMICROCODE_SIZE = 0x00030000
-DEFINE FLASH_REGION_VLVMICROCODE_BASE = 0xFFE00000
-
-!if $(TARGET) == RELEASE
-DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00170000
-DEFINE FLASH_REGION_FVMAIN_SIZE = 0x0012d000
-!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
-!endif
-
-!if $(TARGET) == RELEASE
-DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x0029d000
-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_FVMAIN_OFFSET = 0x00100000
+DEFINE FLASH_REGION_FVMAIN_SIZE = 0x001A5000
+DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x002A5000
+DEFINE FLASH_REGION_FV_RECOVERY2_SIZE = 0x0002C000
-DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x002D3000
-DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x0002D000
-!endif
+DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x002D1000
+DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x0002F000
################################################################################
#
# Fv Size can be adjusted; FVMAIN_COMPACT can be reduced to 0x120000, and FV_RECOVERY can be enlarged to 0x80000
#
################################################################################
+ #
+ # CPU Microcodes
+ #
+
+$(FLASH_REGION_VLVMICROCODE_OFFSET)|$(FLASH_REGION_VLVMICROCODE_SIZE)
+gPlatformModuleTokenSpaceGuid.PcdFlashMicroCodeAddress|gPlatformModuleTokenSpaceGuid.PcdFlashMicroCodeSize
+FV = MICROCODE_FV
$(FLASH_REGION_VPD_OFFSET)|$(FLASH_REGION_VPD_SIZE)
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
#NV_VARIABLE_STORE
FILE = Vlv2TbltDevicePkg/FspAzaliaConfigData/AzaliaConfig.bin
!endif
- #
- # CPU Microcodes
- #
-
-$(FLASH_REGION_VLVMICROCODE_OFFSET)|$(FLASH_REGION_VLVMICROCODE_SIZE)
-gPlatformModuleTokenSpaceGuid.PcdFlashMicroCodeAddress|gPlatformModuleTokenSpaceGuid.PcdFlashMicroCodeSize
-FV = MICROCODE_FV
#
# Main Block
!if $(SOURCE_DEBUG_ENABLE) != TRUE
INF IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
!endif
-INF IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
-INF IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
+#INF IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
+#INF IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
#
# SDIO
# Console
#
INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
-INF Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
INF IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
# 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
}