part: move efi_guid_t

Prep work for next patch.

Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/include/efi.h b/include/efi.h
index 1bc22ccdf88c430d7ffb6c29a0b0e4979e4cde5a..63cbdb61ec5d237f514e0870395274745c4cc2bb 100644 (file)
--- a/include/efi.h
+++ b/include/efi.h
@@ -28,6 +28,10 @@
 
 struct efi_device_path;
 
+typedef struct {
+       u8 b[16];
+} efi_guid_t;
+
 #define EFI_BITS_PER_LONG      BITS_PER_LONG
 
 /*

diff --git a/include/part.h b/include/part.h
index 86117a7ce5d3c57e80c1ec9dc8293718b5c78c32..b2e820ef8ada0549db9b19014799a5105039fd42 100644 (file)
--- a/include/part.h
+++ b/include/part.h
@@ -280,8 +280,9 @@ struct part_driver {
 #define U_BOOT_PART_TYPE(__name)                                       \
        ll_entry_declare(struct part_driver, __name, part_driver)
 
-#if CONFIG_IS_ENABLED(EFI_PARTITION)
 #include <part_efi.h>
+
+#if CONFIG_IS_ENABLED(EFI_PARTITION)
 /* disk/part_efi.c */
 /**
  * write_gpt_table() - Write the GUID Partition Table to disk

diff --git a/include/part_efi.h b/include/part_efi.h
index 317c044795caf68081aee879dc20c40835091256..31e6bc6e140fe2956b15da1012b74be71bf422c0 100644 (file)
--- a/include/part_efi.h
+++ b/include/part_efi.h
@@ -58,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 */