DEFINE FLASH_REGION_VLVMICROCODE_SIZE = 0x00040000\r
DEFINE FLASH_REGION_VLVMICROCODE_BASE = 0xFFC00000\r
\r
-DEFINE FLASH_REGION_VPD_OFFSET = 0x00130000\r
+DEFINE FLASH_REGION_VPD_OFFSET = 0x00040000\r
DEFINE FLASH_REGION_VPD_SIZE = 0x0003E000\r
\r
-DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET = 0x0016E000\r
+DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET = 0x0007E000\r
DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_SIZE = 0x00002000\r
\r
\r
-DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET = 0x00170000\r
+DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET = 0x00080000\r
DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE = 0x00040000\r
\r
!if $(MINNOW2_FSP_BUILD) == TRUE\r
-DEFINE FLASH_REGION_FSPBIN_OFFSET = 0x001B0000\r
+DEFINE FLASH_REGION_FSPBIN_OFFSET = 0x000C0000\r
DEFINE FLASH_REGION_FSPBIN_SIZE = 0x00048000\r
-DEFINE FLASH_REGION_FSPBIN_BASE = 0xFFDB0000\r
+DEFINE FLASH_REGION_FSPBIN_BASE = 0xFFCC0000\r
\r
-DEFINE FLASH_REGION_AZALIABIN_OFFSET = 0x001F8000\r
+DEFINE FLASH_REGION_AZALIABIN_OFFSET = 0x00108000\r
DEFINE FLASH_REGION_AZALIABIN_SIZE = 0x00008000\r
-DEFINE FLASH_REGION_AZALIABIN_BASE = 0xFFDF8000\r
+DEFINE FLASH_REGION_AZALIABIN_BASE = 0xFFD08000\r
\r
!endif\r
\r
-DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00200000\r
-DEFINE FLASH_REGION_FVMAIN_SIZE = 0x00196000\r
+DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00110000\r
+DEFINE FLASH_REGION_FVMAIN_SIZE = 0x00215000\r
\r
-DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x00396000\r
-DEFINE FLASH_REGION_FV_RECOVERY2_SIZE = 0x0002C000\r
+DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x00325000\r
+DEFINE FLASH_REGION_FV_RECOVERY2_SIZE = 0x0006B000\r
\r
-DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x003C2000\r
-DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x0003E000\r
+DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x00390000\r
+DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x00070000\r
\r
################################################################################\r
#\r
#\r
INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf\r
INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf\r
-INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf\r
+INF UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf\r
\r
INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf\r
INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf\r
-INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCommunicationSmm.inf\r
+INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf\r
INF $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf\r
INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf\r
-# INF Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Dts/Smm/DigitalThermalSensor.inf\r
INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf\r
#\r
# ACPI\r
[Rule.Common.SEC.BINARY]\r
FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {\r
PE32 PE32 Align = 8 |.efi\r
- RAW BIN Align = 16 |.com\r
+!if $(MINNOW2_FSP_BUILD) == TRUE\r
+ RAW RAW |.raw\r
+!else\r
+ RAW BIN Align = 16 |.com\r
+!endif\r
}\r
\r
[Rule.Common.PEI_CORE]\r