Add preferred provider for u-boot

PREFERRED_PROVIDER_u-boot ?= "u-boot-socfpga" is required
if enabled u-boot kernel signing of fitimages.  The uboot-sign
class requires this is set when u-boot is being provided by
a package not called u-boot.  For socfpga devices, the u-boot
package is u-boot-socfpga.

Signed-off-by: Dalon Westergreen <dwesterg@gmail.com>

2 files changed, 5 insertions, 3 deletions

diff --git a/conf/machine/include/socfpga.inc b/conf/machine/include/socfpga.inc
index 256c008..f274060 100644
--- a/conf/machine/include/socfpga.inc
+++ b/conf/machine/include/socfpga.inc
@@ -9,6 +9,7 @@ KERNEL_PROVIDER ?= "linux-altera"
 PREFERRED_PROVIDER_virtual/kernel ?= "${KERNEL_PROVIDER}"
 
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-socfpga"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-socfpga"
 
 # Increase this everytime you change something in the kernel
 MACHINE_KERNEL_PR = "r1"
diff --git a/conf/machine/include/socfpga_armv8a.inc b/conf/machine/include/socfpga_armv8a.inc
index 603f61a..e6307a7 100644
--- a/conf/machine/include/socfpga_armv8a.inc
+++ b/conf/machine/include/socfpga_armv8a.inc
@@ -6,11 +6,12 @@ KERNEL_IMAGETYPE = "Image"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
 
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-socfpga"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-socfpga"
 
-SPL_BINARY = "spl/u-boot-spl-dtb.hex"
+SPL_BINARY = "spl/u-boot-spl.hex"
 UBOOT_SUFFIX = "img"
-UBOOT_BINARY = "u-boot-dtb.img"
-UBOOT_IMAGE = "u-boot-dtb-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_BINARY = "u-boot.img"
+UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
 
 IMAGE_FSTYPES ?= "cpio ext3 tar.gz"
 do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot virtual/bootloader:do_deploy virtual/kernel:do_deploy"