summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2015-02-10 13:56:00 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-14 08:40:59 +0000
commit34a4413ef7a873e8bfed4153173cc7050965510b (patch)
treeea24d7359fe1c57f4ddda08b8a0db6e97d19655a
parent1993237a90fb12de37d9212f900e48ebe67e9f55 (diff)
downloadpoky-34a4413ef7a873e8bfed4153173cc7050965510b.tar.gz
u-boot: update to version 2015.01
(From OE-Core rev: 62052810dbf3ed19697078a48b617bfbdadf2a29) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch36
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb (renamed from meta/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb)21
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-mkimage_2014.07.bb34
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb32
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc4
-rw-r--r--meta/recipes-bsp/u-boot/u-boot_2015.01.bb (renamed from meta/recipes-bsp/u-boot/u-boot_2014.07.bb)6
6 files changed, 85 insertions, 48 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch b/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch
new file mode 100644
index 0000000000..381b505d1e
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch
@@ -0,0 +1,36 @@
1From ee2d75513452aa6d5306fd380104adc8a2f6d8f2 Mon Sep 17 00:00:00 2001
2From: Masahiro Yamada <yamada.m@jp.panasonic.com>
3Date: Wed, 3 Dec 2014 10:22:50 +0900
4Subject: [PATCH] tools: env: fix build error
5
6Since CONFIG_SYS_ARCH, CONFIG_SYS_CPU, ... were moved to Kconfig,
7tools/env/fw_printenv fails to build if CONFIG_ENV_VARS_UBOOT_CONFIG
8is defined.
9(I do not think this is the right way to fix the problem, but
10for now I do not have enough time to take a close look.)
11
12Upstream-Status: Submitted [http://patchwork.ozlabs.org/patch/417192/]
13
14Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
15Reported-by: Denys Dmytriyenko <denys@ti.com>
16---
17 tools/env/fw_env.c | 3 +++
18 1 file changed, 3 insertions(+)
19
20diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
21index 1173eea..698fe51 100644
22--- a/tools/env/fw_env.c
23+++ b/tools/env/fw_env.c
24@@ -8,6 +8,9 @@
25 * SPDX-License-Identifier: GPL-2.0+
26 */
27
28+/* FIXME: Do not include this */
29+#include <linux/kconfig.h>
30+
31 #include <errno.h>
32 #include <env_flags.h>
33 #include <fcntl.h>
34--
352.2.0
36
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb
index 9a304c8c5d..2b0550cb37 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb
@@ -1,21 +1,24 @@
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=025bf9f768cbcb1a165dbe1a110babfb" 3LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
4SECTION = "bootloader" 4SECTION = "bootloader"
5DEPENDS = "mtd-utils" 5DEPENDS = "mtd-utils"
6 6
7# This revision corresponds to the tag "v2014.07" 7# This revision corresponds to the tag "v2015.01"
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 = "524123a70761110c5cf3ccc5f52f6d4da071b959" 10SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368"
11 11
12PV = "v2014.07+git${SRCPV}" 12PV = "v2015.01+git${SRCPV}"
13 13
14SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" 14SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git \
15 file://0001-tools-env-fix-build-error.patch"
15 16
16S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
17 18
18INSANE_SKIP_${PN} = "already-stripped" 19INSANE_SKIP_${PN} = "already-stripped"
20EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
21EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
19 22
20inherit uboot-config 23inherit uboot-config
21 24
@@ -33,14 +36,14 @@ do_install () {
33} 36}
34 37
35do_install_class-cross () { 38do_install_class-cross () {
36 install -d ${D}${bindir_cross} 39 install -d ${D}${bindir_cross}
37 install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv 40 install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
38 install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv 41 install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
39} 42}
40 43
41SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross" 44SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross"
42uboot_fw_utils_cross() { 45uboot_fw_utils_cross() {
43 sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross} 46 sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
44} 47}
45 48
46PACKAGE_ARCH = "${MACHINE_ARCH}" 49PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2014.07.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2014.07.bb
deleted file mode 100644
index eabf680ec6..0000000000
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2014.07.bb
+++ /dev/null
@@ -1,34 +0,0 @@
1SUMMARY = "U-Boot bootloader image creation tool"
2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
4SECTION = "bootloader"
5
6# This revision corresponds to the tag "v2014.07"
7# We use the revision in order to avoid having to fetch it from the
8# repo during parse
9SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
10
11PV = "v2014.07+git${SRCPV}"
12
13SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
14
15S = "${WORKDIR}/git"
16
17EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTLD="${LD}" HOSTLDFLAGS="${LDFLAGS}" HOSTSTRIP=true'
18
19do_compile () {
20 # Make sure the recompile is OK
21 rm -f ${B}/tools/.depend
22
23 make HOSTCC="${BUILD_CC}" HOSTLD="${BUILD_LD}" HOSTLDFLAGS="${BUILD_LDFLAGS}" HOSTSTRIP=true dot-config=0 scripts_basic
24 sed 's/^tools-only: scripts_basic /tools-only: /' -i Makefile
25 oe_runmake tools-only
26}
27
28do_install () {
29 install -d ${D}${bindir}
30 install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage
31 ln -sf uboot-mkimage ${D}${bindir}/mkimage
32}
33
34BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
new file mode 100644
index 0000000000..57989c785f
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
@@ -0,0 +1,32 @@
1SUMMARY = "U-Boot bootloader image creation tool"
2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
4SECTION = "bootloader"
5
6DEPENDS = "openssl"
7
8# This revision corresponds to the tag "v2015.01"
9# We use the revision in order to avoid having to fetch it from the
10# repo during parse
11SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368"
12
13PV = "v2015.01+git${SRCPV}"
14
15SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
16
17S = "${WORKDIR}/git"
18
19EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1'
20
21do_compile () {
22 oe_runmake sandbox_defconfig
23 oe_runmake cross_tools NO_SDL=1
24}
25
26do_install () {
27 install -d ${D}${bindir}
28 install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage
29 ln -sf uboot-mkimage ${D}${bindir}/mkimage
30}
31
32BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index b898d6a34d..6bdc86ae0c 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -4,7 +4,7 @@ SECTION = "bootloaders"
4PROVIDES = "virtual/bootloader" 4PROVIDES = "virtual/bootloader"
5 5
6LICENSE = "GPLv2+" 6LICENSE = "GPLv2+"
7LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb" 7LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
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 10
@@ -14,7 +14,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
14 14
15inherit uboot-config deploy 15inherit uboot-config deploy
16 16
17EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"' 17EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" V=1'
18 18
19# Allow setting an additional version string that will be picked up by the 19# Allow setting an additional version string that will be picked up by the
20# u-boot build system and appended to the u-boot version. If the .scmversion 20# u-boot build system and appended to the u-boot version. If the .scmversion
diff --git a/meta/recipes-bsp/u-boot/u-boot_2014.07.bb b/meta/recipes-bsp/u-boot/u-boot_2015.01.bb
index 44cc52eb6c..6feac3107d 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2014.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2015.01.bb
@@ -2,8 +2,8 @@ require u-boot.inc
2 2
3DEPENDS += "dtc-native" 3DEPENDS += "dtc-native"
4 4
5# This revision corresponds to the tag "v2014.07" 5# This revision corresponds to the tag "v2015.01"
6# We use the revision in order to avoid having to fetch it from the repo during parse 6# We use the revision in order to avoid having to fetch it from the repo during parse
7SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959" 7SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368"
8 8
9PV = "v2014.07+git${SRCPV}" 9PV = "v2015.01+git${SRCPV}"