Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1360798

[PATCH v2 9/9] efifb: enable the efi-framebuffer platform driver for ARM and arm64

Show all headers | View raw

Allows the efifb driver to be built for ARM and arm64. This simply involves
updating the Kconfig dependency expression, and supplying dummy versions of
efifb_setup_from_dmi().

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 arch/arm/include/asm/efi.h   | 4 ++++
 arch/arm64/include/asm/efi.h | 4 ++++
 drivers/video/fbdev/Kconfig  | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/arch/arm/include/asm/efi.h b/arch/arm/include/asm/efi.h
index be12877e8609..76ce7adde990 100644
--- a/arch/arm/include/asm/efi.h
+++ b/arch/arm/include/asm/efi.h
@@ -66,6 +66,10 @@ void efi_virtmap_unload(void);
 struct screen_info *alloc_screen_info(efi_system_table_t *sys_table_arg);
 void free_screen_info(efi_system_table_t *sys_table, struct screen_info *si);
 
+static inline void efifb_setup_from_dmi(struct screen_info *si, const char *opt)
+{
+}
+
 /*
  * A reasonable upper bound for the uncompressed kernel size is 32 MBytes,
  * so we will reserve that amount of memory. We have no easy way to tell what
diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h
index ed6c85d3a583..ec43456e3ef1 100644
--- a/arch/arm64/include/asm/efi.h
+++ b/arch/arm64/include/asm/efi.h
@@ -57,6 +57,10 @@ int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md);
 #define alloc_screen_info(x...)		&screen_info
 #define free_screen_info(x...)
 
+static inline void efifb_setup_from_dmi(struct screen_info *si, const char *opt)
+{
+}
+
 #define EFI_ALLOC_ALIGN		SZ_64K
 
 /*
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 983280e8d93f..e5a391aecde1 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -761,7 +761,7 @@ config FB_VESA
 
 config FB_EFI
 	bool "EFI-based Framebuffer Support"
-	depends on (FB = y) && X86 && EFI
+	depends on (FB = y) && !IA64 && EFI
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-- 
2.5.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/9] EFI framebuffer support for ARM and arm64 Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 17:50 +0100
  [PATCH v2 4/9] efi: efifb: use builtin_platform_driver and drop unused includes Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 17:50 +0100
  [PATCH v2 8/9] efi/arm*: wire up struct screen_info to efi-framebuffer platform device Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 17:50 +0100
    Re: [PATCH v2 8/9] efi/arm*: wire up struct screen_info to  efi-framebuffer platform device David Herrmann <dh.herrmann@gmail.com> - 2016-03-21 15:00 +0100
  [PATCH v2 3/9] efi/x86: efifb: move DMI based quirks handling out of generic code Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 17:50 +0100
    Re: [PATCH v2 3/9] efi/x86: efifb: move DMI based quirks handling out  of generic code David Herrmann <dh.herrmann@gmail.com> - 2016-03-21 15:00 +0100
  [PATCH v2 5/9] efi/arm64: libstub: make screen_info accessible to the UEFI stub Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 17:50 +0100
  [PATCH v2 9/9] efifb: enable the efi-framebuffer platform driver for ARM and arm64 Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 17:50 +0100
  [PATCH v2 1/9] efi/x86: prepare GOP handling code for reuse as generic code Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 17:50 +0100
  [PATCH v2 2/9] efi: libstub: move Graphics Output Protocol handling to generic code Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 18:00 +0100
  [PATCH v2 7/9] efi/arm*: libstub: wire up GOP protocol to struct screen_info Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 18:00 +0100
  [PATCH v2 6/9] efi/arm: libstub: make screen_info accessible to the UEFI stub Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-03-18 18:00 +0100

csiph-web