Re: [U-Boot] [PATCH v3 2/8] efi: Use asmlinkage for EFIAPI
Hi Alex, On 19 October 2016 at 01:11, Alexander Grafwrote: > > > On 18/10/2016 22:37, Simon Glass wrote: >> Hi Alex, >> >> On 18 October 2016 at 01:12, Alexander Graf wrote: >>> On 10/18/2016 04:29 AM, Simon Glass wrote: This is required for x86 and is also correct for ARM (since it is empty). Signed-off-by: Simon Glass Reviewed-by: Bin Meng >>> >>> >>> (Replying here in lack for a cover letter) >>> >>> Could you please rebase your patches on top of >>> >>> https://github.com/agraf/u-boot.git efi-next >>> >>> so that all the patches that I already queued are not repeated in the patch >>> set and we don't get any conflicts? >> >> I can do that - but is this targeting -next? I was expecting these >> patches to land in master. > > Sorry, they are on their way to master. It's just old habit wrt my > naming scheme: > > -next: current development branch, basically staging for master I'd suggest calling that 'master'. > -release-number: future patches that I already applied proactively for > the next release, or backports :) > > As it stands, I've only taken the base patches, not all of them. Would > you expect all of the x86 efi enablement to land in 2016.11? No, let's target the release after that. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 2/8] efi: Use asmlinkage for EFIAPI
On 18/10/2016 22:37, Simon Glass wrote: > Hi Alex, > > On 18 October 2016 at 01:12, Alexander Grafwrote: >> On 10/18/2016 04:29 AM, Simon Glass wrote: >>> >>> This is required for x86 and is also correct for ARM (since it is empty). >>> >>> Signed-off-by: Simon Glass >>> Reviewed-by: Bin Meng >> >> >> (Replying here in lack for a cover letter) >> >> Could you please rebase your patches on top of >> >> https://github.com/agraf/u-boot.git efi-next >> >> so that all the patches that I already queued are not repeated in the patch >> set and we don't get any conflicts? > > I can do that - but is this targeting -next? I was expecting these > patches to land in master. Sorry, they are on their way to master. It's just old habit wrt my naming scheme: -next: current development branch, basically staging for master -release-number: future patches that I already applied proactively for the next release, or backports :) As it stands, I've only taken the base patches, not all of them. Would you expect all of the x86 efi enablement to land in 2016.11? Alex ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 2/8] efi: Use asmlinkage for EFIAPI
Hi Alex, On 18 October 2016 at 01:12, Alexander Grafwrote: > On 10/18/2016 04:29 AM, Simon Glass wrote: >> >> This is required for x86 and is also correct for ARM (since it is empty). >> >> Signed-off-by: Simon Glass >> Reviewed-by: Bin Meng > > > (Replying here in lack for a cover letter) > > Could you please rebase your patches on top of > > https://github.com/agraf/u-boot.git efi-next > > so that all the patches that I already queued are not repeated in the patch > set and we don't get any conflicts? I can do that - but is this targeting -next? I was expecting these patches to land in master. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 2/8] efi: Use asmlinkage for EFIAPI
On 10/18/2016 04:29 AM, Simon Glass wrote: This is required for x86 and is also correct for ARM (since it is empty). Signed-off-by: Simon GlassReviewed-by: Bin Meng (Replying here in lack for a cover letter) Could you please rebase your patches on top of https://github.com/agraf/u-boot.git efi-next so that all the patches that I already queued are not repeated in the patch set and we don't get any conflicts? Thanks! Alex ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3 2/8] efi: Use asmlinkage for EFIAPI
This is required for x86 and is also correct for ARM (since it is empty). Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v3: None Changes in v2: - Move efi.h changes to a new patch arch/avr32/include/asm/linkage.h | 0 arch/m68k/include/asm/linkage.h | 0 arch/microblaze/include/asm/linkage.h | 0 arch/mips/include/asm/linkage.h | 0 arch/nios2/include/asm/linkage.h | 0 arch/openrisc/include/asm/linkage.h | 0 arch/sandbox/include/asm/linkage.h| 0 arch/sh/include/asm/linkage.h | 0 arch/sparc/include/asm/linkage.h | 0 include/efi.h | 3 ++- 10 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 arch/avr32/include/asm/linkage.h create mode 100644 arch/m68k/include/asm/linkage.h create mode 100644 arch/microblaze/include/asm/linkage.h create mode 100644 arch/mips/include/asm/linkage.h create mode 100644 arch/nios2/include/asm/linkage.h create mode 100644 arch/openrisc/include/asm/linkage.h create mode 100644 arch/sandbox/include/asm/linkage.h create mode 100644 arch/sh/include/asm/linkage.h create mode 100644 arch/sparc/include/asm/linkage.h diff --git a/arch/avr32/include/asm/linkage.h b/arch/avr32/include/asm/linkage.h new file mode 100644 index 000..e69de29 diff --git a/arch/m68k/include/asm/linkage.h b/arch/m68k/include/asm/linkage.h new file mode 100644 index 000..e69de29 diff --git a/arch/microblaze/include/asm/linkage.h b/arch/microblaze/include/asm/linkage.h new file mode 100644 index 000..e69de29 diff --git a/arch/mips/include/asm/linkage.h b/arch/mips/include/asm/linkage.h new file mode 100644 index 000..e69de29 diff --git a/arch/nios2/include/asm/linkage.h b/arch/nios2/include/asm/linkage.h new file mode 100644 index 000..e69de29 diff --git a/arch/openrisc/include/asm/linkage.h b/arch/openrisc/include/asm/linkage.h new file mode 100644 index 000..e69de29 diff --git a/arch/sandbox/include/asm/linkage.h b/arch/sandbox/include/asm/linkage.h new file mode 100644 index 000..e69de29 diff --git a/arch/sh/include/asm/linkage.h b/arch/sh/include/asm/linkage.h new file mode 100644 index 000..e69de29 diff --git a/arch/sparc/include/asm/linkage.h b/arch/sparc/include/asm/linkage.h new file mode 100644 index 000..e69de29 diff --git a/include/efi.h b/include/efi.h index 5a3b8cf..d07187c 100644 --- a/include/efi.h +++ b/include/efi.h @@ -15,6 +15,7 @@ #ifndef _EFI_H #define _EFI_H +#include #include #include @@ -22,7 +23,7 @@ /* EFI uses the Microsoft ABI which is not the default for GCC */ #define EFIAPI __attribute__((ms_abi)) #else -#define EFIAPI +#define EFIAPI asmlinkage #endif struct efi_device_path; -- 2.8.0.rc3.226.g39d4020 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot