[PATCH 02/35] x86: Create a new header for EFI

[Heinrich Schuchardt]

On 9/8/21 3:33 PM, Simon Glass wrote:
> The setup routines are called from zimage but don't really belong in the
> zimage header. Add a new EFI header to house these. Add comments so it is
> clear what the functions do.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
>   arch/x86/include/asm/efi.h    | 32 ++++++++++++++++++++++++++++++++
>   arch/x86/include/asm/zimage.h |  3 ---
>   arch/x86/lib/zimage.c         |  1 +
>   3 files changed, 33 insertions(+), 3 deletions(-)
>   create mode 100644 arch/x86/include/asm/efi.h

In the future we should be able to run the EFI app on any UEFI
architecture. Given this background are the function definitions really
x86 specific?

Best regards

Heinrich

>
> diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
> new file mode 100644
> index 00000000000..c1735e4dc5f
> --- /dev/null
> +++ b/arch/x86/include/asm/efi.h
> @@ -0,0 +1,32 @@
> +/* SPDX-License-Identifier: GPL-2.0+ */
> +/*
> + * Copyright Google LLC
> + */
> +
> +#ifndef _ASM_EFI_H_
> +#define _ASM_EFI_H_
> +
> +struct efi_info;
> +struct screen_info;
> +
> +/**
> + * setup_video() - Set up the screen info in the x86 setup
> + *
> + * This is needed so Linux can use the display (when U-Boot is an EFI payload)
> + *
> + * @efi_info: Pointer to place to put the screen info in the x86 setup base
> + */
> +void setup_video(struct screen_info *screen_info);
> +
> +/**
> + * setup_efi_info() - Set up the EFI info needed by Linux to boot
> + *
> + * This writes a suitable signature, table pointers, memory-map pointer, etc.
> + * These are needed for Linux to boot from U-Boot (when U-Boot is an EFI
> + * payload).
> + *
> + * @efi_info: Pointer to place to put the EFI info in the x86 setup base
> + */
> +void setup_efi_info(struct efi_info *efi_info);
> +
> +#endif
> diff --git a/arch/x86/include/asm/zimage.h b/arch/x86/include/asm/zimage.h
> index 6679767d16b..fa6e7f76e05 100644
> --- a/arch/x86/include/asm/zimage.h
> +++ b/arch/x86/include/asm/zimage.h
> @@ -72,7 +72,4 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
>    */
>   void zimage_dump(struct boot_params *base_ptr);
>
> -void setup_video(struct screen_info *screen_info);
> -void setup_efi_info(struct efi_info *efi_info);
> -
>   #endif
> diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
> index 9938c80a42b..7ce02226ef9 100644
> --- a/arch/x86/lib/zimage.c
> +++ b/arch/x86/lib/zimage.c
> @@ -29,6 +29,7 @@
>   #include <asm/byteorder.h>
>   #include <asm/bootm.h>
>   #include <asm/bootparam.h>
> +#include <asm/efi.h>
>   #include <asm/global_data.h>
>   #ifdef CONFIG_SYS_COREBOOT
>   #include <asm/arch/timestamp.h>
>