diff mbox

bootlader/grub2: disable x86-64-efi choice on !BR2_ARCH_IS_64

Message ID 1421431115-5202-1-git-send-email-s.martin49@gmail.com
State Accepted
Headers show

Commit Message

Samuel Martin Jan. 16, 2015, 5:58 p.m. UTC
When x86-64-efi platform is selected, grub2 automatically adds -m64 to the
CFLAGS. This makes the configure script failed when the toolchain does not
have multilib support (like the Buildroot ones).

Reported-by: Noe Rubinstein <nrubinstein@aldebaran-robotics.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 boot/grub2/Config.in | 1 +
 1 file changed, 1 insertion(+)

Comments

Yann E. MORIN Jan. 18, 2015, 3:42 p.m. UTC | #1
Samuel, All,

On 2015-01-16 18:58 +0100, Samuel Martin spake thusly:
> When x86-64-efi platform is selected, grub2 automatically adds -m64 to the
> CFLAGS. This makes the configure script failed when the toolchain does not
> have multilib support (like the Buildroot ones).
> 
> Reported-by: Noe Rubinstein <nrubinstein@aldebaran-robotics.com>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

I fail to see a case where we would want to build a 64-bit EFI GRUB to
later start a 32-bit kernel and userland.

Since we do not support multilib, the user would have to have two
builds: one for the 32-bit kernel+userland, one for the 64-bit
bootloader (if that is even possible to boot a 32-bit kernel from a
64-bit EFI GRUB).

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  boot/grub2/Config.in | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in
> index 626344a..c465a4d 100644
> --- a/boot/grub2/Config.in
> +++ b/boot/grub2/Config.in
> @@ -132,6 +132,7 @@ config BR2_TARGET_GRUB2_I386_EFI
>  
>  config BR2_TARGET_GRUB2_X86_64_EFI
>  	bool "x86-64-efi"
> +	depends on BR2_ARCH_IS_64
>  	help
>  	  Select this option if the platform you're targetting has a
>  	  64 bits EFI BIOS.
> -- 
> 2.1.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Thomas Petazzoni Feb. 3, 2015, 11:11 a.m. UTC | #2
Dear Samuel Martin,

On Fri, 16 Jan 2015 18:58:35 +0100, Samuel Martin wrote:
> When x86-64-efi platform is selected, grub2 automatically adds -m64 to the
> CFLAGS. This makes the configure script failed when the toolchain does not
> have multilib support (like the Buildroot ones).
> 
> Reported-by: Noe Rubinstein <nrubinstein@aldebaran-robotics.com>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Applied, thanks!

Thomas
diff mbox

Patch

diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in
index 626344a..c465a4d 100644
--- a/boot/grub2/Config.in
+++ b/boot/grub2/Config.in
@@ -132,6 +132,7 @@  config BR2_TARGET_GRUB2_I386_EFI
 
 config BR2_TARGET_GRUB2_X86_64_EFI
 	bool "x86-64-efi"
+	depends on BR2_ARCH_IS_64
 	help
 	  Select this option if the platform you're targetting has a
 	  64 bits EFI BIOS.