From 3e6cc35f4e8fb5010421e606cfab0e00d0adacc0 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Thu, 25 Aug 2016 01:47:18 -0700 Subject: x86: efi: Fix EFI 64-bit payload build warnings There are lots of warnings when building EFI 64-bit payload. include/asm-generic/bitops/__fls.h:17:2: warning: left shift count >= width of type if (!(word & (~0ul << 32))) { ^ In fact, U-Boot itself as EFI payload is running in 32-bit mode. So BITS_PER_LONG needs to still be 32, but EFI status codes are 64-bit when booting from 64-bit EFI. Introduce EFI_BITS_PER_LONG to bridge those status codes with U-Boot's BITS_PER_LONG. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- arch/x86/include/asm/types.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'arch/x86/include') diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h index 766617f9aa..880dcb488a 100644 --- a/arch/x86/include/asm/types.h +++ b/arch/x86/include/asm/types.h @@ -44,11 +44,7 @@ typedef __INT64_TYPE__ s64; typedef __UINT64_TYPE__ u64; #endif -#ifdef CONFIG_EFI_STUB_64BIT -#define BITS_PER_LONG 64 -#else #define BITS_PER_LONG 32 -#endif /* Dma addresses are 32-bits wide. */ typedef u32 dma_addr_t; -- cgit v1.2.3