mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 07:34:31 +00:00
efi_loader: Fall back to fdtfile naming convention
When there is no $fdtfile variable set, we still have a good chance that on 32bit arm the fdtfile really is just called $soc-$board.dtb. Enable the exports for $soc and $board in our distr defaults and make use of them in the efi boot script. Reported-by: Andreas Faerber <afaerber@suse.de> Reported-by: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Alexander Graf <agraf@suse.de> Reviewed-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
1c39809b92
commit
ff2545ab78
2 changed files with 22 additions and 3 deletions
|
@ -99,6 +99,21 @@
|
|||
#endif
|
||||
|
||||
#ifdef BOOTEFI_NAME
|
||||
#if defined(CONFIG_ARM) && !defined(CONFIG_ARM64)
|
||||
/*
|
||||
* On 32bit ARM systems there is a reasonable number of systems that follow
|
||||
* the $soc-$board$boardver.dtb name scheme for their device trees. Use that
|
||||
* scheme if we don't have an explicit fdtfile variable.
|
||||
*/
|
||||
#define BOOTENV_EFI_SET_FDTFILE_FALLBACK \
|
||||
"if test -z \"${fdtfile}\" -a -n \"${soc}\"; then " \
|
||||
"setenv efi_fdtfile ${soc}-${board}${boardver}.dtb; " \
|
||||
"fi; "
|
||||
#else
|
||||
#define BOOTENV_EFI_SET_FDTFILE_FALLBACK
|
||||
#endif
|
||||
|
||||
|
||||
#define BOOTENV_SHARED_EFI \
|
||||
"boot_efi_binary=" \
|
||||
"load ${devtype} ${devnum}:${distro_bootpart} " \
|
||||
|
@ -111,14 +126,16 @@
|
|||
\
|
||||
"load_efi_dtb=" \
|
||||
"load ${devtype} ${devnum}:${distro_bootpart} " \
|
||||
"${fdt_addr_r} ${prefix}${fdtfile}\0" \
|
||||
"${fdt_addr_r} ${prefix}${efi_fdtfile}\0" \
|
||||
\
|
||||
"efi_dtb_prefixes=/ /dtb/ /dtb/current/\0" \
|
||||
"scan_dev_for_efi=" \
|
||||
"setenv efi_fdtfile ${fdtfile}; " \
|
||||
BOOTENV_EFI_SET_FDTFILE_FALLBACK \
|
||||
"for prefix in ${efi_dtb_prefixes}; do " \
|
||||
"if test -e ${devtype} " \
|
||||
"${devnum}:${distro_bootpart} " \
|
||||
"${prefix}${fdtfile}; then " \
|
||||
"${prefix}${efi_fdtfile}; then " \
|
||||
"run load_efi_dtb; " \
|
||||
"fi;" \
|
||||
"done;" \
|
||||
|
@ -128,7 +145,8 @@
|
|||
"efi/boot/"BOOTEFI_NAME"; " \
|
||||
"run boot_efi_binary; " \
|
||||
"echo EFI LOAD FAILED: continuing...; " \
|
||||
"fi; \0"
|
||||
"fi; " \
|
||||
"setenv efi_fdtfile\0"
|
||||
#define SCAN_DEV_FOR_EFI "run scan_dev_for_efi;"
|
||||
#else
|
||||
#define BOOTENV_SHARED_EFI
|
||||
|
|
|
@ -65,5 +65,6 @@
|
|||
#define CONFIG_ISO_PARTITION
|
||||
#define CONFIG_SUPPORT_RAW_INITRD
|
||||
#define CONFIG_SYS_HUSH_PARSER
|
||||
#define CONFIG_ENV_VARS_UBOOT_CONFIG
|
||||
|
||||
#endif /* _CONFIG_CMD_DISTRO_DEFAULTS_H */
|
||||
|
|
Loading…
Reference in a new issue