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>

6 files changed, 13 insertions, 9 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}"
diff --git a/recipes-bsp/u-boot/u-boot-socfpga-common.inc b/recipes-bsp/u-boot/u-boot-socfpga-common.inc
index 06f0992..2038545 100644
--- a/recipes-bsp/u-boot/u-boot-socfpga-common.inc
+++ b/recipes-bsp/u-boot/u-boot-socfpga-common.inc
@@ -1,9 +1,12 @@
 HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
 SECTION = "bootloaders"
+DEPENDS += "flex-native bison-native"
 
-PV_append = "+git${SRCPV}"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
+PE = "1"
 
-SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
+PV_append = "+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/u-boot/u-boot-socfpga_v2019.04.bb b/recipes-bsp/u-boot/u-boot-socfpga_v2019.04.bb
new file mode 100644
index 0000000..f9e1afc
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-socfpga_v2019.04.bb
@@ -0,0 +1,7 @@
+require u-boot-socfpga-common.inc
+require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
+
+SRC_URI = "git://github.com/altera-opensource/u-boot-socfpga.git;branch=socfpga_v2019.04"
+SRCREV = "bc38a09daa09e73b075006d8006caa84bb2fe0fe"
+
+DEPENDS += "dtc-native bc-native u-boot-mkimage-native"