Add support for u-boot-socfpga 2019.04

2019.04 is now the officially supported u-boot for all
socfpga platforms.

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

4 files changed, 1 insertions, 7 deletions

diff --git a/conf/machine/arria10.conf b/conf/machine/arria10.conf
index 249edcc..3fd23c1 100644
--- a/conf/machine/arria10.conf
+++ b/conf/machine/arria10.conf
@@ -4,8 +4,6 @@
 
 require conf/machine/include/socfpga.inc
 
-PREFERRED_VERSION_u-boot-socfpga ?= "v2019.07%"
-
 SPL_BINARY = "u-boot-with-spl.sfp"
 UBOOT_BINARY = "u-boot-dtb.img"
 
diff --git a/conf/machine/arria5.conf b/conf/machine/arria5.conf
index 01cc58b..0110fb1 100644
--- a/conf/machine/arria5.conf
+++ b/conf/machine/arria5.conf
@@ -4,8 +4,6 @@
 
 require conf/machine/include/socfpga.inc
 
-PREFERRED_VERSION_u-boot-socfpga ?= "v2019.01%"
-
 UBOOT_CONFIG ??= "arria5-socdk"
 
 UBOOT_CONFIG[arria5-socdk] = "socfpga_arria5_defconfig"
diff --git a/conf/machine/cyclone5.conf b/conf/machine/cyclone5.conf
index c66af25..a9c45ef 100644
--- a/conf/machine/cyclone5.conf
+++ b/conf/machine/cyclone5.conf
@@ -4,8 +4,6 @@
 
 require conf/machine/include/socfpga.inc
 
-PREFERRED_VERSION_u-boot-socfpga ?= "v2019.01%"
-
 UBOOT_CONFIG ??= "cyclone5-socdk"
 
 UBOOT_CONFIG[cyclone5-socdk] = "socfpga_cyclone5_defconfig"
diff --git a/conf/machine/include/socfpga_armv8a.inc b/conf/machine/include/socfpga_armv8a.inc
index e6307a7..150e3f2 100644
--- a/conf/machine/include/socfpga_armv8a.inc
+++ b/conf/machine/include/socfpga_armv8a.inc
@@ -8,7 +8,7 @@ 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.hex"
+SPL_BINARY = "spl/u-boot-spl-dtb.hex"
 UBOOT_SUFFIX = "img"
 UBOOT_BINARY = "u-boot.img"
 UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"