-#define EFI_FVB2_READ_DISABLED_CAP 0x00000001\r
-#define EFI_FVB2_READ_ENABLED_CAP 0x00000002\r
-#define EFI_FVB2_READ_STATUS 0x00000004\r
-#define EFI_FVB2_WRITE_DISABLED_CAP 0x00000008\r
-#define EFI_FVB2_WRITE_ENABLED_CAP 0x00000010\r
-#define EFI_FVB2_WRITE_STATUS 0x00000020\r
-#define EFI_FVB2_LOCK_CAP 0x00000040\r
-#define EFI_FVB2_LOCK_STATUS 0x00000080\r
-#define EFI_FVB2_STICKY_WRITE 0x00000200\r
-#define EFI_FVB2_MEMORY_MAPPED 0x00000400\r
-#define EFI_FVB2_ERASE_POLARITY 0x00000800\r
-#define EFI_FVB2_READ_LOCK_CAP 0x00001000\r
-#define EFI_FVB2_READ_LOCK_STATUS 0x00002000\r
-#define EFI_FVB2_WRITE_LOCK_CAP 0x00004000\r
-#define EFI_FVB2_WRITE_LOCK_STATUS 0x00008000\r
-#define EFI_FVB2_ALIGNMENT 0x001F0000\r
-#define EFI_FVB2_ALIGNMENT_1 0x00000000\r
-#define EFI_FVB2_ALIGNMENT_2 0x00010000\r
-#define EFI_FVB2_ALIGNMENT_4 0x00020000\r
-#define EFI_FVB2_ALIGNMENT_8 0x00030000\r
-#define EFI_FVB2_ALIGNMENT_16 0x00040000\r
-#define EFI_FVB2_ALIGNMENT_32 0x00050000\r
-#define EFI_FVB2_ALIGNMENT_64 0x00060000\r
-#define EFI_FVB2_ALIGNMENT_128 0x00070000\r
-#define EFI_FVB2_ALIGNMENT_256 0x00080000\r
-#define EFI_FVB2_ALIGNMENT_512 0x00090000\r
-#define EFI_FVB2_ALIGNMENT_1K 0x000A0000\r
-#define EFI_FVB2_ALIGNMENT_2K 0x000B0000\r
-#define EFI_FVB2_ALIGNMENT_4K 0x000C0000\r
-#define EFI_FVB2_ALIGNMENT_8K 0x000D0000\r
-#define EFI_FVB2_ALIGNMENT_16K 0x000E0000\r
-#define EFI_FVB2_ALIGNMENT_32K 0x000F0000\r
-#define EFI_FVB2_ALIGNMENT_64K 0x00100000\r
-#define EFI_FVB2_ALIGNMENT_128K 0x00110000\r
-#define EFI_FVB2_ALIGNMENT_256K 0x00120000\r
-#define EFI_FVB2_ALIGNMENT_512K 0x00130000\r
-#define EFI_FVB2_ALIGNMENT_1M 0x00140000\r
-#define EFI_FVB2_ALIGNMENT_2M 0x00150000\r
-#define EFI_FVB2_ALIGNMENT_4M 0x00160000\r
-#define EFI_FVB2_ALIGNMENT_8M 0x00170000\r
-#define EFI_FVB2_ALIGNMENT_16M 0x00180000\r
-#define EFI_FVB2_ALIGNMENT_32M 0x00190000\r
-#define EFI_FVB2_ALIGNMENT_64M 0x001A0000\r
-#define EFI_FVB2_ALIGNMENT_128M 0x001B0000\r
-#define EFI_FVB2_ALIGNMENT_256M 0x001C0000\r
-#define EFI_FVB2_ALIGNMENT_512M 0x001D0000\r
-#define EFI_FVB2_ALIGNMENT_1G 0x001E0000\r
-#define EFI_FVB2_ALIGNMENT_2G 0x001F0000\r
-#define EFI_FVB2_WEAK_ALIGNMENT 0x80000000\r
+#define EFI_FVB2_READ_DISABLED_CAP 0x00000001\r
+#define EFI_FVB2_READ_ENABLED_CAP 0x00000002\r
+#define EFI_FVB2_READ_STATUS 0x00000004\r
+#define EFI_FVB2_WRITE_DISABLED_CAP 0x00000008\r
+#define EFI_FVB2_WRITE_ENABLED_CAP 0x00000010\r
+#define EFI_FVB2_WRITE_STATUS 0x00000020\r
+#define EFI_FVB2_LOCK_CAP 0x00000040\r
+#define EFI_FVB2_LOCK_STATUS 0x00000080\r
+#define EFI_FVB2_STICKY_WRITE 0x00000200\r
+#define EFI_FVB2_MEMORY_MAPPED 0x00000400\r
+#define EFI_FVB2_ERASE_POLARITY 0x00000800\r
+#define EFI_FVB2_READ_LOCK_CAP 0x00001000\r
+#define EFI_FVB2_READ_LOCK_STATUS 0x00002000\r
+#define EFI_FVB2_WRITE_LOCK_CAP 0x00004000\r
+#define EFI_FVB2_WRITE_LOCK_STATUS 0x00008000\r
+#define EFI_FVB2_ALIGNMENT 0x001F0000\r
+#define EFI_FVB2_ALIGNMENT_1 0x00000000\r
+#define EFI_FVB2_ALIGNMENT_2 0x00010000\r
+#define EFI_FVB2_ALIGNMENT_4 0x00020000\r
+#define EFI_FVB2_ALIGNMENT_8 0x00030000\r
+#define EFI_FVB2_ALIGNMENT_16 0x00040000\r
+#define EFI_FVB2_ALIGNMENT_32 0x00050000\r
+#define EFI_FVB2_ALIGNMENT_64 0x00060000\r
+#define EFI_FVB2_ALIGNMENT_128 0x00070000\r
+#define EFI_FVB2_ALIGNMENT_256 0x00080000\r
+#define EFI_FVB2_ALIGNMENT_512 0x00090000\r
+#define EFI_FVB2_ALIGNMENT_1K 0x000A0000\r
+#define EFI_FVB2_ALIGNMENT_2K 0x000B0000\r
+#define EFI_FVB2_ALIGNMENT_4K 0x000C0000\r
+#define EFI_FVB2_ALIGNMENT_8K 0x000D0000\r
+#define EFI_FVB2_ALIGNMENT_16K 0x000E0000\r
+#define EFI_FVB2_ALIGNMENT_32K 0x000F0000\r
+#define EFI_FVB2_ALIGNMENT_64K 0x00100000\r
+#define EFI_FVB2_ALIGNMENT_128K 0x00110000\r
+#define EFI_FVB2_ALIGNMENT_256K 0x00120000\r
+#define EFI_FVB2_ALIGNMENT_512K 0x00130000\r
+#define EFI_FVB2_ALIGNMENT_1M 0x00140000\r
+#define EFI_FVB2_ALIGNMENT_2M 0x00150000\r
+#define EFI_FVB2_ALIGNMENT_4M 0x00160000\r
+#define EFI_FVB2_ALIGNMENT_8M 0x00170000\r
+#define EFI_FVB2_ALIGNMENT_16M 0x00180000\r
+#define EFI_FVB2_ALIGNMENT_32M 0x00190000\r
+#define EFI_FVB2_ALIGNMENT_64M 0x001A0000\r
+#define EFI_FVB2_ALIGNMENT_128M 0x001B0000\r
+#define EFI_FVB2_ALIGNMENT_256M 0x001C0000\r
+#define EFI_FVB2_ALIGNMENT_512M 0x001D0000\r
+#define EFI_FVB2_ALIGNMENT_1G 0x001E0000\r
+#define EFI_FVB2_ALIGNMENT_2G 0x001F0000\r
+#define EFI_FVB2_WEAK_ALIGNMENT 0x80000000\r