//\r
// Constants\r
//\r
-#define EMU_FVB_BLOCK_SIZE (FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize))\r
-#define EMU_FVB_SIZE (2 * FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize))\r
+#define EMU_FVB_BLOCK_SIZE \\r
+ EFI_PAGE_SIZE\r
+#define EMU_FVB_NUM_SPARE_BLOCKS \\r
+ EFI_SIZE_TO_PAGES ((UINTN)FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize))\r
+#define EMU_FVB_NUM_TOTAL_BLOCKS \\r
+ (2 * EMU_FVB_NUM_SPARE_BLOCKS)\r
+#define EMU_FVB_SIZE \\r
+ (EMU_FVB_NUM_TOTAL_BLOCKS * EMU_FVB_BLOCK_SIZE)\r
#define FTW_WRITE_QUEUE_SIZE \\r
(FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) - \\r
sizeof (EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER))\r