5 files changed, 35 insertions, 57 deletions

diff --git a/recipes-bsp/u-boot/u-boot-common_2016.05.inc b/recipes-bsp/u-boot/u-boot-socfpga-common.inc
index 985e221..d0f1723 100644
--- a/recipes-bsp/u-boot/u-boot-common_2016.05.inc
+++ b/recipes-bsp/u-boot/u-boot-socfpga-common.inc
@@ -4,12 +4,7 @@ SECTION = "bootloaders"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
 
-# This revision corresponds to the tag "v2016.05"
-# We use the revision in order to avoid having to fetch it from the
-# repo during parse
-SRCREV = "aeaec0e682f45b9e0c62c522fafea353931f73ed"
-
-PV = "v2016.05+git${SRCPV}"
+PV_append = "+git${SRCPV}"
 
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
 
diff --git a/recipes-bsp/u-boot/u-boot-socfpga_2014.10.bb b/recipes-bsp/u-boot/u-boot-socfpga_2014.10.bb
deleted file mode 100644
index 7ee2a5c..0000000
--- a/recipes-bsp/u-boot/u-boot-socfpga_2014.10.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-UBOOT_SUFFIX ?= "img"
-UBOOT_RAW_BINARY ?= "u-boot-dtb.bin"
-UBOOT_DTB ?= "u-boot.dtb"
-
-require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot:"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-PROVIDES += "u-boot"
-PKG_${PN} = "u-boot"
-PKG_${PN}-dev = "u-boot-dev"
-PKG_${PN}-dbg = "u-boot-dbg"
-
-S = "${WORKDIR}/git"
-
-# SPL (Second Program Loader) to be loaded over UART
-SPL_UART_BINARY ?= ""
-SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}"
-SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"
-
-do_deploy_append () {
-    install ${S}/${UBOOT_RAW_BINARY} ${DEPLOYDIR}/${UBOOT_RAW_BINARY}
-    install ${S}/${UBOOT_DTB} ${DEPLOYDIR}/${UBOOT_DTB}
-}
-
-# DEPEND on dtc-native for mainline u-boot because the mainline u-boot depends
-# on some of the latest syntax constructs for an appended in dtb used for
-# items like secure boot/image signing.
-DEPENDS += "dtc-native"
-
-DESCRIPTION = "Mainline u-boot bootloader"
-
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
-
-PV = "2014.10"
-
-UBOOT_BRANCH ?= "socfpga_v${PV}_arria10_bringup"
-UBOOT_REPO ?= "git://github.com/altera-opensource/u-boot-socfpga.git"
-UBOOT_PROT ?= "https"
-
-SRC_URI = "${UBOOT_REPO};protocol=${UBOOT_PROT};branch=${UBOOT_BRANCH}"
-
-#SoCEDS 15.1 release
-SRCREV = "2c7fd1aac5f06ceea822c4d6a8af9ea2b11fdfd4"
-
diff --git a/recipes-bsp/u-boot/u-boot-socfpga_v2014.10.bb b/recipes-bsp/u-boot/u-boot-socfpga_v2014.10.bb
new file mode 100644
index 0000000..5c82261
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-socfpga_v2014.10.bb
@@ -0,0 +1,18 @@
+require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
+PR="r1"
+# This revision corresponds to the SoCEDS 16.1 release
+SRCREV = "ab2181dd766157a74b309d12e0b61c4f3cdc8564"
+
+UBOOT_BRANCH ?= "socfpga_${PV}_arria10_bringup"
+UBOOT_REPO ?= "git://github.com/altera-opensource/u-boot-socfpga.git"
+UBOOT_PROT ?= "https"
+
+SRC_URI = "${UBOOT_REPO};protocol=${UBOOT_PROT};branch=${UBOOT_BRANCH}"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
+
+DEPENDS += "dtc-native"
+
+UBOOT_BINARY = "u-boot-dtb.bin"
+
diff --git a/recipes-bsp/u-boot/u-boot-socfpga_2016.05.bb b/recipes-bsp/u-boot/u-boot-socfpga_v2016.05.bb
index 8f5e038..a4e1f44 100644
--- a/recipes-bsp/u-boot/u-boot-socfpga_2016.05.bb
+++ b/recipes-bsp/u-boot/u-boot-socfpga_v2016.05.bb
@@ -1,6 +1,11 @@
-require u-boot-common_${PV}.inc
+require u-boot-socfpga-common.inc
 require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
 
+# This revision corresponds to the tag "v2016.05"
+# We use the revision in order to avoid having to fetch it from the
+# repo during parse 
+SRCREV = "aeaec0e682f45b9e0c62c522fafea353931f73ed"
+
 DEPENDS += "dtc-native"
 
 do_install_append_10m50 () {
diff --git a/recipes-bsp/u-boot/u-boot-socfpga_v2016.11.bb b/recipes-bsp/u-boot/u-boot-socfpga_v2016.11.bb
new file mode 100644
index 0000000..e0eb0cd
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-socfpga_v2016.11.bb
@@ -0,0 +1,10 @@
+require u-boot-socfpga-common.inc
+require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
+
+# This revision corresponds to the tag "v2016.11"
+# We use the revision in order to avoid having to fetch it from the
+# repo during parse 
+SRCREV = "29e0cfb4f77f7aa369136302cee14a91e22dca71"
+
+DEPENDS += "dtc-native"
+