summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb (renamed from meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.01.bb)8
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb (renamed from meta/recipes-bsp/u-boot/u-boot-mkimage_2016.01.bb)8
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc5
-rw-r--r--meta/recipes-bsp/u-boot/u-boot/0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch34
-rw-r--r--meta/recipes-bsp/u-boot/u-boot_2016.03.bb (renamed from meta/recipes-bsp/u-boot/u-boot_2016.01.bb)6
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 @@
1SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" 1SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
2LICENSE = "GPLv2+" 2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95" 3LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
4SECTION = "bootloader" 4SECTION = "bootloader"
5DEPENDS = "mtd-utils" 5DEPENDS = "mtd-utils"
6 6
7# This revision corresponds to the tag "v2016.01" 7# This revision corresponds to the tag "v2016.03"
8# We use the revision in order to avoid having to fetch it from the 8# We use the revision in order to avoid having to fetch it from the
9# repo during parse 9# repo during parse
10SRCREV = "fa85e826c16b9ce1ad302a57e9c4b24db0d8b930" 10SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
11 11
12PV = "v2016.01+git${SRCPV}" 12PV = "v2016.03+git${SRCPV}"
13 13
14SRC_URI = "git://git.denx.de/u-boot.git;branch=master" 14SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
15 15
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 @@
1SUMMARY = "U-Boot bootloader image creation tool" 1SUMMARY = "U-Boot bootloader image creation tool"
2LICENSE = "GPLv2+" 2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95" 3LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
4SECTION = "bootloader" 4SECTION = "bootloader"
5 5
6DEPENDS = "openssl" 6DEPENDS = "openssl"
7 7
8# This revision corresponds to the tag "v2016.01" 8# This revision corresponds to the tag "v2016.03"
9# We use the revision in order to avoid having to fetch it from the 9# We use the revision in order to avoid having to fetch it from the
10# repo during parse 10# repo during parse
11SRCREV = "fa85e826c16b9ce1ad302a57e9c4b24db0d8b930" 11SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
12 12
13PV = "v2016.01+git${SRCPV}" 13PV = "v2016.03+git${SRCPV}"
14 14
15SRC_URI = "git://git.denx.de/u-boot.git;branch=master" 15SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
16 16
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"
4PROVIDES = "virtual/bootloader" 4PROVIDES = "virtual/bootloader"
5 5
6LICENSE = "GPLv2+" 6LICENSE = "GPLv2+"
7LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95" 7LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
8 8
9SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ 9SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
10 file://0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch"
11 10
12S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
13 12
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 @@
1From 7205442e621db54ea06c3bca2d793e1ae2214f9c Mon Sep 17 00:00:00 2001
2From: Tom Rini <trini@konsulko.com>
3Date: Thu, 10 Dec 2015 16:46:01 -0500
4Subject: [PATCH] am335x_evm.h: unsed CONFIG_BOOTDELAY
5
6Now that ti_armv7_common.h uses config_distro_defaults.h we don't need
7to include it again and then undef CONFIG_BOOTDELAY
8
9Signed-off-by: Tom Rini <trini@konsulko.com>
10
11Upstream-Status: Backport
12
13---
14 include/configs/am335x_evm.h | 4 ----
15 1 file changed, 4 deletions(-)
16
17diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
18index c51db8c..cf6a606 100644
19--- a/include/configs/am335x_evm.h
20+++ b/include/configs/am335x_evm.h
21@@ -18,10 +18,6 @@
22
23 #include <configs/ti_am335x_common.h>
24
25-/* Don't override the distro default bootdelay */
26-#undef CONFIG_BOOTDELAY
27-#include <config_distro_defaults.h>
28-
29 #ifndef CONFIG_SPL_BUILD
30 #ifndef CONFIG_FIT
31 # define CONFIG_FIT
32--
332.7.0
34
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
2 2
3DEPENDS += "dtc-native" 3DEPENDS += "dtc-native"
4 4
5# This revision corresponds to the tag "v2016.01" 5# This revision corresponds to the tag "v2016.03"
6# We use the revision in order to avoid having to fetch it from the 6# We use the revision in order to avoid having to fetch it from the
7# repo during parse 7# repo during parse
8SRCREV = "fa85e826c16b9ce1ad302a57e9c4b24db0d8b930" 8SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
9 9
10PV = "v2016.01+git${SRCPV}" 10PV = "v2016.03+git${SRCPV}"