[U-Boot] [U-Boot,v3,01/21] part: move efi_guid_t

[Heinrich Schuchardt]

On 09/14/2017 12:05 AM, Rob Clark wrote:
> Prep work for next patch.
> 
> Signed-off-by: Rob Clark <robdclark at gmail.com>
> ---
>  include/efi.h      | 4 ++++
>  include/part.h     | 3 ++-
>  include/part_efi.h | 4 ----
>  3 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/include/efi.h b/include/efi.h
> index 02b78b31b1..87b0b43f20 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 86117a7ce5..b2e820ef8a 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 317c044795..31e6bc6e14 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 */
> 

Compiled and tested with and without CONFIG_EFI_PARTITION.

Reviewed-by: Heinrich Schuchardt <xypron.glpk at gmx.de>