On Fri, Apr 05, 2019 at 03:33:54AM +0200, Heinrich Schuchardt wrote:
> Since TianoCore EDK2 commit d65f2cea36d1 ("ShellPkg/CommandLib: Locate
> proper UnicodeCollation instance") in edk2 the UEFI Shell crashes if EFI
> variable PlatformLang is not defined.
>
> As this variable is anyway prescribed in the UEFI 2.7 spec let's define it
> to L"en-US". Use the same value for PlatformLangCodes that defines the list
> of all supported languages.
>
> Signed-off-by: Heinrich Schuchardt <[email protected]>
> ---
> lib/efi_loader/efi_setup.c | 27 +++++++++++++++++++++++++++
> 1 file changed, 27 insertions(+)
>
> diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c
> index 8266d06c2e..e431c1c053 100644
> --- a/lib/efi_loader/efi_setup.c
> +++ b/lib/efi_loader/efi_setup.c
> @@ -10,6 +10,9 @@
>
> #define OBJ_LIST_NOT_INITIALIZED 1
>
> +/* Language code for American English according to RFC 4646 */
> +#define EN_US L"en-US"
> +
> static efi_status_t efi_obj_list_initialized = OBJ_LIST_NOT_INITIALIZED;
>
> /* Initialize and populate EFI object list */
> @@ -24,6 +27,30 @@ efi_status_t efi_init_obj_list(void)
> */
> efi_save_gd();
>
> + /*
> + * Variable PlatformLang defines the language that the machine has been
> + * configured for.
> + */
> + ret = EFI_CALL(efi_set_variable(L"PlatformLang",
> + &efi_global_variable_guid,
> + EFI_VARIABLE_BOOTSERVICE_ACCESS |
> + EFI_VARIABLE_RUNTIME_ACCESS,
> + sizeof(EN_US), EN_US));
> + if (ret != EFI_SUCCESS)
> + goto out;
> +
> + /*
> + * Variable PlatformLangCodes defines the language codes that the
> + * machine can support.
> + */
> + ret = EFI_CALL(efi_set_variable(L"PlatformLangCodes",
> + &efi_global_variable_guid,
> + EFI_VARIABLE_BOOTSERVICE_ACCESS |
> + EFI_VARIABLE_RUNTIME_ACCESS,
> + sizeof(EN_US), EN_US));
> + if (ret != EFI_SUCCESS)
> + goto out;
I don't think that it is a good idea to make a hard-coding like this
in init code. Instead, we should add some kind of framework so that
initial (default) variables can be configured.
-Takahiro Akashi
> /* Initialize once only */
> if (efi_obj_list_initialized != OBJ_LIST_NOT_INITIALIZED)
> return efi_obj_list_initialized;
> --
> 2.20.1
>
_______________________________________________
U-Boot mailing list
[email protected]
https://lists.denx.de/listinfo/u-boot
