Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / include / part_efi.h

diff --git a/include/part_efi.h b/include/part_efi.h
index 3012b91adee8f57d07ecb8892e2e786ee994bafd..4c8f6cc473c8fd02c8140629c8fa8c2462a87fb1 100644 (file)
--- a/include/part_efi.h
+++ b/include/part_efi.h
@@ -27,8 +27,7 @@
 #define GPT_HEADER_SIGNATURE 0x5452415020494645ULL
 #define GPT_HEADER_REVISION_V1 0x00010000
 #define GPT_PRIMARY_PARTITION_TABLE_LBA 1ULL
-#define GPT_ENTRY_NAME "gpt"
-#define GPT_ENTRY_NUMBERS              128
+#define GPT_ENTRY_NUMBERS              CONFIG_EFI_PARTITION_ENTRIES_NUMBERS
 #define GPT_ENTRY_SIZE                 128
 
 #define PARTITION_SYSTEM_GUID \
@@ -43,6 +42,9 @@
 #define PARTITION_BASIC_DATA_GUID \
        EFI_GUID( 0xEBD0A0A2, 0xB9E5, 0x4433, \
                0x87, 0xC0, 0x68, 0xB6, 0xB7, 0x26, 0x99, 0xC7)
+#define PARTITION_LINUX_FILE_SYSTEM_DATA_GUID \
+       EFI_GUID(0x0FC63DAF, 0x8483, 0x4772, \
+               0x8E, 0x79, 0x3D, 0x69, 0xD8, 0x47, 0x7D, 0xE4)
 #define PARTITION_LINUX_RAID_GUID \
        EFI_GUID( 0xa19d880f, 0x05fc, 0x4d3b, \
                0xa0, 0x06, 0x74, 0x3f, 0x0f, 0x84, 0x91, 0x1e)
@@ -56,10 +58,6 @@
 /* linux/include/efi.h */
 typedef u16 efi_char16_t;
 
-typedef struct {
-       u8 b[16];
-} efi_guid_t;
-
 /* based on linux/include/genhd.h */
 struct partition {
        u8 boot_ind;            /* 0x80 - active */