5 files changed, 13 insertions, 48 deletions

diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.01.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb
index 30b7c7a980..dfda5c1d30 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb
@@ -1,15 +1,15 @@
 SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
 SECTION = "bootloader"
 DEPENDS = "mtd-utils"
 
-# This revision corresponds to the tag "v2016.01"
+# This revision corresponds to the tag "v2016.03"
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "fa85e826c16b9ce1ad302a57e9c4b24db0d8b930"
+SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
 
-PV = "v2016.01+git${SRCPV}"
+PV = "v2016.03+git${SRCPV}"
 
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
 
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb
index 5d163a8af4..d5921a0443 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb
@@ -1,16 +1,16 @@
 SUMMARY = "U-Boot bootloader image creation tool"
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
 SECTION = "bootloader"
 
 DEPENDS = "openssl"
 
-# This revision corresponds to the tag "v2016.01"
+# This revision corresponds to the tag "v2016.03"
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "fa85e826c16b9ce1ad302a57e9c4b24db0d8b930"
+SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
 
-PV = "v2016.01+git${SRCPV}"
+PV = "v2016.03+git${SRCPV}"
 
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
 
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index ac8f338bd8..48be71d2ef 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -4,10 +4,9 @@ SECTION = "bootloaders"
 PROVIDES = "virtual/bootloader"
 
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
 
-SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
-           file://0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch"
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta/recipes-bsp/u-boot/u-boot/0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch b/meta/recipes-bsp/u-boot/u-boot/0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch
deleted file mode 100644
index 70c87c4cfd..0000000000
--- a/meta/recipes-bsp/u-boot/u-boot/0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7205442e621db54ea06c3bca2d793e1ae2214f9c Mon Sep 17 00:00:00 2001
-From: Tom Rini <trini@konsulko.com>
-Date: Thu, 10 Dec 2015 16:46:01 -0500
-Subject: [PATCH] am335x_evm.h: unsed CONFIG_BOOTDELAY
-
-Now that ti_armv7_common.h uses config_distro_defaults.h we don't need
-to include it again and then undef CONFIG_BOOTDELAY
-
-Signed-off-by: Tom Rini <trini@konsulko.com>
-
-Upstream-Status: Backport
-
----
- include/configs/am335x_evm.h | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
-index c51db8c..cf6a606 100644
---- a/include/configs/am335x_evm.h
-+++ b/include/configs/am335x_evm.h
-@@ -18,10 +18,6 @@
-
- #include <configs/ti_am335x_common.h>
-
--/* Don't override the distro default bootdelay */
--#undef CONFIG_BOOTDELAY
--#include <config_distro_defaults.h>
--
- #ifndef CONFIG_SPL_BUILD
- #ifndef CONFIG_FIT
- # define CONFIG_FIT
---
-2.7.0
-
diff --git a/meta/recipes-bsp/u-boot/u-boot_2016.01.bb b/meta/recipes-bsp/u-boot/u-boot_2016.03.bb
index d5c11811f4..836b0ce03e 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2016.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2016.03.bb
@@ -2,9 +2,9 @@ require u-boot.inc
 
 DEPENDS += "dtc-native"
 
-# This revision corresponds to the tag "v2016.01"
+# This revision corresponds to the tag "v2016.03"
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "fa85e826c16b9ce1ad302a57e9c4b24db0d8b930"
+SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
 
-PV = "v2016.01+git${SRCPV}"
+PV = "v2016.03+git${SRCPV}"