mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
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>
This commit is contained in:
Denys Dmytriyenko
committed by
Richard Purdie
Richard Purdie
parent
1993237a90
commit
34a4413ef7
@@ -0,0 +1,36 @@
|
||||
From ee2d75513452aa6d5306fd380104adc8a2f6d8f2 Mon Sep 17 00:00:00 2001
|
||||
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
||||
Date: Wed, 3 Dec 2014 10:22:50 +0900
|
||||
Subject: [PATCH] tools: env: fix build error
|
||||
|
||||
Since CONFIG_SYS_ARCH, CONFIG_SYS_CPU, ... were moved to Kconfig,
|
||||
tools/env/fw_printenv fails to build if CONFIG_ENV_VARS_UBOOT_CONFIG
|
||||
is defined.
|
||||
(I do not think this is the right way to fix the problem, but
|
||||
for now I do not have enough time to take a close look.)
|
||||
|
||||
Upstream-Status: Submitted [http://patchwork.ozlabs.org/patch/417192/]
|
||||
|
||||
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
||||
Reported-by: Denys Dmytriyenko <denys@ti.com>
|
||||
---
|
||||
tools/env/fw_env.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
|
||||
index 1173eea..698fe51 100644
|
||||
--- a/tools/env/fw_env.c
|
||||
+++ b/tools/env/fw_env.c
|
||||
@@ -8,6 +8,9 @@
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
+/* FIXME: Do not include this */
|
||||
+#include <linux/kconfig.h>
|
||||
+
|
||||
#include <errno.h>
|
||||
#include <env_flags.h>
|
||||
#include <fcntl.h>
|
||||
--
|
||||
2.2.0
|
||||
|
||||
+12
-9
@@ -1,21 +1,24 @@
|
||||
SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
|
||||
LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
|
||||
SECTION = "bootloader"
|
||||
DEPENDS = "mtd-utils"
|
||||
|
||||
# This revision corresponds to the tag "v2014.07"
|
||||
# This revision corresponds to the tag "v2015.01"
|
||||
# We use the revision in order to avoid having to fetch it from the
|
||||
# repo during parse
|
||||
SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
|
||||
SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368"
|
||||
|
||||
PV = "v2014.07+git${SRCPV}"
|
||||
PV = "v2015.01+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
|
||||
SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git \
|
||||
file://0001-tools-env-fix-build-error.patch"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
INSANE_SKIP_${PN} = "already-stripped"
|
||||
EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
|
||||
EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
|
||||
|
||||
inherit uboot-config
|
||||
|
||||
@@ -33,14 +36,14 @@ do_install () {
|
||||
}
|
||||
|
||||
do_install_class-cross () {
|
||||
install -d ${D}${bindir_cross}
|
||||
install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
|
||||
install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
|
||||
install -d ${D}${bindir_cross}
|
||||
install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
|
||||
install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
|
||||
}
|
||||
|
||||
SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross"
|
||||
uboot_fw_utils_cross() {
|
||||
sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
|
||||
sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
|
||||
}
|
||||
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
@@ -1,34 +0,0 @@
|
||||
SUMMARY = "U-Boot bootloader image creation tool"
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
|
||||
SECTION = "bootloader"
|
||||
|
||||
# This revision corresponds to the tag "v2014.07"
|
||||
# We use the revision in order to avoid having to fetch it from the
|
||||
# repo during parse
|
||||
SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
|
||||
|
||||
PV = "v2014.07+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTLD="${LD}" HOSTLDFLAGS="${LDFLAGS}" HOSTSTRIP=true'
|
||||
|
||||
do_compile () {
|
||||
# Make sure the recompile is OK
|
||||
rm -f ${B}/tools/.depend
|
||||
|
||||
make HOSTCC="${BUILD_CC}" HOSTLD="${BUILD_LD}" HOSTLDFLAGS="${BUILD_LDFLAGS}" HOSTSTRIP=true dot-config=0 scripts_basic
|
||||
sed 's/^tools-only: scripts_basic /tools-only: /' -i Makefile
|
||||
oe_runmake tools-only
|
||||
}
|
||||
|
||||
do_install () {
|
||||
install -d ${D}${bindir}
|
||||
install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage
|
||||
ln -sf uboot-mkimage ${D}${bindir}/mkimage
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
@@ -0,0 +1,32 @@
|
||||
SUMMARY = "U-Boot bootloader image creation tool"
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
|
||||
SECTION = "bootloader"
|
||||
|
||||
DEPENDS = "openssl"
|
||||
|
||||
# This revision corresponds to the tag "v2015.01"
|
||||
# We use the revision in order to avoid having to fetch it from the
|
||||
# repo during parse
|
||||
SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368"
|
||||
|
||||
PV = "v2015.01+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1'
|
||||
|
||||
do_compile () {
|
||||
oe_runmake sandbox_defconfig
|
||||
oe_runmake cross_tools NO_SDL=1
|
||||
}
|
||||
|
||||
do_install () {
|
||||
install -d ${D}${bindir}
|
||||
install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage
|
||||
ln -sf uboot-mkimage ${D}${bindir}/mkimage
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
@@ -4,7 +4,7 @@ SECTION = "bootloaders"
|
||||
PROVIDES = "virtual/bootloader"
|
||||
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
|
||||
LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
|
||||
|
||||
SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
|
||||
|
||||
@@ -14,7 +14,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
|
||||
inherit uboot-config deploy
|
||||
|
||||
EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
|
||||
EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" V=1'
|
||||
|
||||
# Allow setting an additional version string that will be picked up by the
|
||||
# u-boot build system and appended to the u-boot version. If the .scmversion
|
||||
|
||||
+3
-3
@@ -2,8 +2,8 @@ require u-boot.inc
|
||||
|
||||
DEPENDS += "dtc-native"
|
||||
|
||||
# This revision corresponds to the tag "v2014.07"
|
||||
# This revision corresponds to the tag "v2015.01"
|
||||
# We use the revision in order to avoid having to fetch it from the repo during parse
|
||||
SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
|
||||
SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368"
|
||||
|
||||
PV = "v2014.07+git${SRCPV}"
|
||||
PV = "v2015.01+git${SRCPV}"
|
||||
Reference in New Issue
Block a user