From 891e02db364c3b6a75d933af4eae5c40014a18b8 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 13 Apr 2016 13:44:29 +0200 Subject: [PATCH] XXX openSUSE XXX: Load dtb from partition 2 Upstream U-Boot loads the device tree from the EFI partition. This is mostly because upstream we don't know which partition really holds the boot data. For openSUSE however we do know, so let's just patch the boot script to load device trees from partition 2. Signed-off-by: Alexander Graf --- include/config_distro_bootcmd.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index d672e8ebe6..d06fb4367e 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -138,16 +138,16 @@ "fi\0" \ \ "load_efi_dtb=" \ - "load ${devtype} ${devnum}:${distro_bootpart} " \ + "load ${devtype} ${devnum}:2 " \ "${fdt_addr_r} ${prefix}${efi_fdtfile}\0" \ \ - "efi_dtb_prefixes=/ /dtb/ /dtb/current/\0" \ + "efi_dtb_prefixes=/ /dtb/ /dtb/current/ /boot/ /boot/dtb/ /boot/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} " \ + "${devnum}:2 " \ "${prefix}${efi_fdtfile}; then " \ "run load_efi_dtb; " \ "fi;" \