diff options
| author | Arnd Bergmann <[email protected]> | 2023-10-17 11:39:46 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2023-10-17 16:33:39 +0200 |
| commit | b8466fe82b79215b9ae28623a87c9a937ebd4f80 (patch) | |
| tree | 6d9cb9b29928eb83d851f1d05566cac146f2fd23 /arch/riscv/kernel/image-vars.h | |
| parent | 1e3c8526918403a4cebbd67bcd18443bf68df939 (diff) | |
efi: move screen_info into efi init code
After the vga console no longer relies on global screen_info, there are
only two remaining use cases:
- on the x86 architecture, it is used for multiple boot methods
(bzImage, EFI, Xen, kexec) to commucate the initial VGA or framebuffer
settings to a number of device drivers.
- on other architectures, it is only used as part of the EFI stub,
and only for the three sysfb framebuffers (simpledrm, simplefb, efifb).
Remove the duplicate data structure definitions by moving it into the
efi-init.c file that sets it up initially for the EFI case, leaving x86
as an exception that retains its own definition for non-EFI boots.
The added #ifdefs here are optional, I added them to further limit the
reach of screen_info to configurations that have at least one of the
users enabled.
Reviewed-by: Ard Biesheuvel <[email protected]>
Reviewed-by: Javier Martinez Canillas <[email protected]>
Acked-by: Helge Deller <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'arch/riscv/kernel/image-vars.h')
| -rw-r--r-- | arch/riscv/kernel/image-vars.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/riscv/kernel/image-vars.h b/arch/riscv/kernel/image-vars.h index ea1a10355ce9..3df30dd1c458 100644 --- a/arch/riscv/kernel/image-vars.h +++ b/arch/riscv/kernel/image-vars.h @@ -28,7 +28,9 @@ __efistub__start_kernel = _start_kernel; __efistub__end = _end; __efistub__edata = _edata; __efistub___init_text_end = __init_text_end; +#if defined(CONFIG_EFI_EARLYCON) || defined(CONFIG_SYSFB) __efistub_screen_info = screen_info; +#endif #endif |