git: b304cd9789ca - stable/12 - Drop EFI_STAGING_SIZE back down to 64M

[Maxim Sobolev]

Hmm, that's really annoying, reminiscent of the old DOS days, where you
might have few megs of memory, but won't be able to use it due to some
bios/motherboard quirk. :-/

Can we at least have some specific section for VMWare to teak that in? We
already have the HYPER-V section in that file, so it's not unheard of. At
the very least other virtual machines (i.e. VirtualBox in the EFI mode or
majority "real" EFI servers) do not have this restriction.

Thanks!

-Max

On Mon, Mar 22, 2021 at 2:48 PM Ryan Moeller <freqlabs at freebsd.org> wrote:

> The branch stable/12 has been updated by freqlabs:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=b304cd9789ca7ff3df629af42a976450e8660a11
>
> commit b304cd9789ca7ff3df629af42a976450e8660a11
> Author:     Warner Losh <imp at FreeBSD.org>
> AuthorDate: 2020-12-17 17:02:09 +0000
> Commit:     Ryan Moeller <freqlabs at FreeBSD.org>
> CommitDate: 2021-03-22 20:30:23 +0000
>
>     Drop EFI_STAGING_SIZE back down to 64M
>
>     vmware can't cope with anything larger than 64MB. Drop this back to
>     64MB everywhere but arm.
>
>     PR: 251866
>     MFC After: 1 week
>
>     (cherry picked from commit 4d6047edb675e52b8fad57135ab3ded8e66d0dac)
> ---
>  stand/efi/loader/copy.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/stand/efi/loader/copy.c b/stand/efi/loader/copy.c
> index 6499a44b9bbe..6ad673d62897 100644
> --- a/stand/efi/loader/copy.c
> +++ b/stand/efi/loader/copy.c
> @@ -176,9 +176,7 @@ out:
>  #endif /* __i386__ || __amd64__ */
>
>  #ifndef EFI_STAGING_SIZE
> -#if defined(__amd64__)
> -#define        EFI_STAGING_SIZE        100
> -#elif defined(__arm__)
> +#if defined(__arm__)
>  #define        EFI_STAGING_SIZE        32
>  #else
>  #define        EFI_STAGING_SIZE        64
>
>