[U-Boot,v2,05/16] efi: Correct header order in efi_memory

Message ID 20171204212832.130100-6-sjg@chromium.org
State New
Delegated to: Alexander Graf
Headers show
Series
  • efi: Enable basic sandbox support for EFI loader
Related show

Commit Message

Simon Glass Dec. 4, 2017, 9:28 p.m.
The headers are not in the correct order. Fix this. Also drop libfdt_env.h
since it is not needed.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2:
- Update commit message to dropping libfdt_env.h

 lib/efi_loader/efi_memory.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Heinrich Schuchardt Dec. 4, 2017, 10:28 p.m. | #1
On 12/04/2017 10:28 PM, Simon Glass wrote:
> The headers are not in the correct order. Fix this. Also drop libfdt_env.h
> since it is not needed.

What do you consider as correct order? Do you mean sorted alphabetically?
Includes should be self sufficient and the correct execution be 
independent of the sequence.

Best regards

Heinrich

> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
> 
> Changes in v2:
> - Update commit message to dropping libfdt_env.h
> 
>   lib/efi_loader/efi_memory.c | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
> index d47759e08e..e95896ca0a 100644
> --- a/lib/efi_loader/efi_memory.c
> +++ b/lib/efi_loader/efi_memory.c
> @@ -8,12 +8,11 @@
>   
>   #include <common.h>
>   #include <efi_loader.h>
> +#include <inttypes.h>
>   #include <malloc.h>
> +#include <watchdog.h>
>   #include <asm/global_data.h>
> -#include <libfdt_env.h>
>   #include <linux/list_sort.h>
> -#include <inttypes.h>
> -#include <watchdog.h>
>   
>   DECLARE_GLOBAL_DATA_PTR;
>   
>
Simon Glass Dec. 5, 2017, 9:11 p.m. | #2
Hi Heinrich,

On 4 December 2017 at 15:28, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
>
>
> On 12/04/2017 10:28 PM, Simon Glass wrote:
>>
>> The headers are not in the correct order. Fix this. Also drop libfdt_env.h
>> since it is not needed.
>
>
> What do you consider as correct order? Do you mean sorted alphabetically?
> Includes should be self sufficient and the correct execution be independent
> of the sequence.

https://www.denx.de/wiki/U-Boot/CodingStyle

If we need libfdt we should include libfdt.h I think.

Regards,
Simon

Patch

diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index d47759e08e..e95896ca0a 100644
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -8,12 +8,11 @@ 
 
 #include <common.h>
 #include <efi_loader.h>
+#include <inttypes.h>
 #include <malloc.h>
+#include <watchdog.h>
 #include <asm/global_data.h>
-#include <libfdt_env.h>
 #include <linux/list_sort.h>
-#include <inttypes.h>
-#include <watchdog.h>
 
 DECLARE_GLOBAL_DATA_PTR;