aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Clark2017-09-13 18:05:24 -0400
committerAlexander Graf2017-09-20 10:20:00 +0200
commit0d6ab32e3712fe7bc2e3aaf3d93e0d5910264df3 (patch)
tree7fd7c80b4b07e112063695d9cfc21437a7936e30
parent0923876d297b046010df390277115aed2b3537e9 (diff)
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>
-rw-r--r--include/efi.h4
-rw-r--r--include/part.h3
-rw-r--r--include/part_efi.h4
3 files changed, 6 insertions, 5 deletions
diff --git a/include/efi.h b/include/efi.h
index 1bc22ccdf88..63cbdb61ec5 100644
--- 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 86117a7ce5d..b2e820ef8ad 100644
--- 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 317c044795c..31e6bc6e140 100644
--- 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 */