[U-Boot] [PATCH 1/1] efi_loader: duplicate IMAGE_SUBSYSTEM_EFI_APPLICATION

[U-Boot] [PATCH 1/1] efi_loader: duplicate IMAGE_SUBSYSTEM_EFI_APPLICATION

[Heinrich Schuchardt]

IMAGE_SUBSYSTEM_EFI_APPLICATION is already defined in
include/asm-generic/pe.h which is included in include/pe.h. We should
not define it twice.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
 include/pe.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/pe.h b/include/pe.h
index 36e1908b7e..c7aeb2dcb6 100644
--- a/include/pe.h
+++ b/include/pe.h
@@ -48,7 +48,6 @@ typedef struct _IMAGE_DOS_HEADER {

 #define IMAGE_NT_OPTIONAL_HDR32_MAGIC	0x10b
 #define IMAGE_NT_OPTIONAL_HDR64_MAGIC	0x20b
-#define IMAGE_SUBSYSTEM_EFI_APPLICATION	10

 typedef struct _IMAGE_FILE_HEADER {
 	uint16_t Machine;
--
2.20.1

[U-Boot] [PATCH 1/1] efi_loader: duplicate IMAGE_SUBSYSTEM_EFI_APPLICATION

[AKASHI Takahiro]

Heinrich,

I wonder why we need "asm-generic/pe.h."
If IMAGE_SUBSYSTEM_EFI_APPLICATION can be arch-specific,
why not move other definitions, like * relocation types, too?

-Takahiro Akashi

On Thu, Jul 11, 2019 at 06:28:24PM +0200, Heinrich Schuchardt wrote:
> IMAGE_SUBSYSTEM_EFI_APPLICATION is already defined in
> include/asm-generic/pe.h which is included in include/pe.h. We should
> not define it twice.
> 
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> ---
>  include/pe.h | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/include/pe.h b/include/pe.h
> index 36e1908b7e..c7aeb2dcb6 100644
> --- a/include/pe.h
> +++ b/include/pe.h
> @@ -48,7 +48,6 @@ typedef struct _IMAGE_DOS_HEADER {
> 
>  #define IMAGE_NT_OPTIONAL_HDR32_MAGIC	0x10b
>  #define IMAGE_NT_OPTIONAL_HDR64_MAGIC	0x20b
> -#define IMAGE_SUBSYSTEM_EFI_APPLICATION	10
> 
>  typedef struct _IMAGE_FILE_HEADER {
>  	uint16_t Machine;
> --
> 2.20.1
> 

[U-Boot] [PATCH 1/1] efi_loader: duplicate IMAGE_SUBSYSTEM_EFI_APPLICATION

[Heinrich Schuchardt]

On 7/12/19 2:59 AM, AKASHI Takahiro wrote:
> Heinrich,
>
> I wonder why we need "asm-generic/pe.h".

The assembler cannot understand includes that contain C specific syntax.
So we cannot include "pe.h". This is why "asm-generic/pe.h" has been
split off.

> If IMAGE_SUBSYSTEM_EFI_APPLICATION can be arch-specific,
> why not move other definitions, like * relocation types, too?

We need those symbols in include/asm-generic/pe.h that are used by
assembler code. IMAGE_SUBSYSTEM_EFI_APPLICATION is not arch-specific but
it is used in arch/arm/lib/crt0_arm_efi.S and others.

Best regards

Heinrich

>
> -Takahiro Akashi
>
> On Thu, Jul 11, 2019 at 06:28:24PM +0200, Heinrich Schuchardt wrote:
>> IMAGE_SUBSYSTEM_EFI_APPLICATION is already defined in
>> include/asm-generic/pe.h which is included in include/pe.h. We should
>> not define it twice.
>>
>> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
>> ---
>>   include/pe.h | 1 -
>>   1 file changed, 1 deletion(-)
>>
>> diff --git a/include/pe.h b/include/pe.h
>> index 36e1908b7e..c7aeb2dcb6 100644
>> --- a/include/pe.h
>> +++ b/include/pe.h
>> @@ -48,7 +48,6 @@ typedef struct _IMAGE_DOS_HEADER {
>>
>>   #define IMAGE_NT_OPTIONAL_HDR32_MAGIC	0x10b
>>   #define IMAGE_NT_OPTIONAL_HDR64_MAGIC	0x20b
>> -#define IMAGE_SUBSYSTEM_EFI_APPLICATION	10
>>
>>   typedef struct _IMAGE_FILE_HEADER {
>>   	uint16_t Machine;
>> --
>> 2.20.1
>>
>

[U-Boot] [PATCH 1/1] efi_loader: duplicate IMAGE_SUBSYSTEM_EFI_APPLICATION

[AKASHI Takahiro]

On Fri, Jul 12, 2019 at 08:04:59AM +0200, Heinrich Schuchardt wrote:
> On 7/12/19 2:59 AM, AKASHI Takahiro wrote:
> >Heinrich,
> >
> >I wonder why we need "asm-generic/pe.h".
> 
> The assembler cannot understand includes that contain C specific syntax.
> So we cannot include "pe.h". This is why "asm-generic/pe.h" has been
> split off.

If so, why not use "#if(n)def __ASSEMBLY__"?
It is a common usage in lots of headers.

-Takahiro Akashi

> >If IMAGE_SUBSYSTEM_EFI_APPLICATION can be arch-specific,
> >why not move other definitions, like * relocation types, too?
> 
> We need those symbols in include/asm-generic/pe.h that are used by
> assembler code. IMAGE_SUBSYSTEM_EFI_APPLICATION is not arch-specific but
> it is used in arch/arm/lib/crt0_arm_efi.S and others.
> 
> Best regards
> 
> Heinrich
> 
> >
> >-Takahiro Akashi
> >
> >On Thu, Jul 11, 2019 at 06:28:24PM +0200, Heinrich Schuchardt wrote:
> >>IMAGE_SUBSYSTEM_EFI_APPLICATION is already defined in
> >>include/asm-generic/pe.h which is included in include/pe.h. We should
> >>not define it twice.
> >>
> >>Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> >>---
> >>  include/pe.h | 1 -
> >>  1 file changed, 1 deletion(-)
> >>
> >>diff --git a/include/pe.h b/include/pe.h
> >>index 36e1908b7e..c7aeb2dcb6 100644
> >>--- a/include/pe.h
> >>+++ b/include/pe.h
> >>@@ -48,7 +48,6 @@ typedef struct _IMAGE_DOS_HEADER {
> >>
> >>  #define IMAGE_NT_OPTIONAL_HDR32_MAGIC	0x10b
> >>  #define IMAGE_NT_OPTIONAL_HDR64_MAGIC	0x20b
> >>-#define IMAGE_SUBSYSTEM_EFI_APPLICATION	10
> >>
> >>  typedef struct _IMAGE_FILE_HEADER {
> >>  	uint16_t Machine;
> >>--
> >>2.20.1
> >>
> >
>