| Message ID | 20170910112149.21358-3-robdclark@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Alexander Graf |
| Headers | show |
| Series | efi_loader: enough UEFI for standard distro boot | expand |
On 09/10/2017 01:21 PM, Rob Clark wrote: > Prep work for next patch. > > Signed-off-by: Rob Clark <robdclark@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 */ > The patch extends https://lists.denx.de/pipermail/u-boot/2017-September/304970.html [PATCH 1/1] efi_loader: move efi_guid_t typedef to efi.h A descriptive commit message might be helpful. Acked-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
On 10 September 2017 at 05:21, Rob Clark <robdclark@gmail.com> wrote: > Prep work for next patch. Move it where? Reviewed-by: Simon Glass <sjg@chromium.org> > > Signed-off-by: Rob Clark <robdclark@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; Please add a comment to this
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 */
Prep work for next patch. Signed-off-by: Rob Clark <robdclark@gmail.com> --- include/efi.h | 4 ++++ include/part.h | 3 ++- include/part_efi.h | 4 ---- 3 files changed, 6 insertions(+), 5 deletions(-)