Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9822504c authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar
Browse files

efifb: Enable the efi-framebuffer platform driver for ARM and arm64 



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: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarMatt Fleming <matt@codeblueprint.co.uk>
Cc: Borislav Petkov <bp@alien8.de>
Cc: David Herrmann <dh.herrmann@gmail.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Jones <pjones@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/1461614832-17633-25-git-send-email-matt@codeblueprint.co.uk


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent e3271c96

arch/arm/include/asm/efi.h

+4 −0
Original line number Diff line number Diff line
@@ -67,6 +67,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

arch/arm64/include/asm/efi.h

+4 −0
Original line number Diff line number Diff line
@@ -59,6 +59,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



/*

drivers/video/fbdev/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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