Skip to contentSkip to conversation

Add uboot 2011.06

PATCH Applied Saul Wold 2 participants 3 messages Jul 6, 2011 – Jul 7, 2011 Arm i.MX and Layerscape

lore
Share & tools
lore
author
#1 lore raw

PATCH 1/1 uboot: Add 2011.06 Version

In reply to Saul Wold

[YOCTO #1198]

Addes the 2011.06 version, while keeping the older 2011.03 version since other layers might be using it still. This will need to be fixed in the future as oe-core should only be keeping the current versions and layer management addresses this somehow.

---
 ...Drop-config.h-include-in-tools-imximage.h.patch |   39 +++++++++
 ...ove-LDSCRIPT-processing-to-the-top-level-.patch |   82 ++++++++++++++++++++
 meta/recipes-bsp/uboot/u-boot-mkimage_2011.06.bb   |   29 +++++++
 meta/recipes-bsp/uboot/u-boot_2011.06.bb           |   26 ++++++
 4 files changed, 176 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch
 create mode 100644 meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
 create mode 100644 meta/recipes-bsp/uboot/u-boot-mkimage_2011.06.bb
 create mode 100644 meta/recipes-bsp/uboot/u-boot_2011.06.bb
meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch new file +39 -0
new file mode 100644
index 0000000..f4b12ac
@@ -0,0 +1,39 @@
+From ce56e089ddb51dbd81bb2c86b1646d77447afe39 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <[email protected]>
+Date: Thu, 3 Feb 2011 15:07:01 +0100
+Subject: Drop config.h include in tools/imximage.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Applied
+
+"make tools-all" should allow building tools such as mkimage and the new
+imximage without any config, but imximage.c currently fails to build
+with:
+imximage.h:27:20: error: config.h: No such file or directory
+
+config.h is not needed in imximage.h nor in imximage.c, and imximage.h
+is only included from imximage.c, so drop this include to fix the build.
+
+Signed-off-by: Lo�c Minier <[email protected]>
+---
+ tools/imximage.h |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/tools/imximage.h b/tools/imximage.h
+index 38ca6be..d126a46 100644
+--- a/tools/imximage.h
++++ b/tools/imximage.h
+@@ -24,8 +24,6 @@
+ #ifndef _IMXIMAGE_H_
+ #define _IMXIMAGE_H_
+ 
+-#include <config.h>
+-
+ #define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set for v2 */
+ #define MAX_HW_CFG_SIZE_V1 60  /* Max number of registers imx can set for v1 */
+ #define APP_CODE_BARKER	0xB1
+-- 
+1.7.4.4
+
meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch new file +82 -0

82 lines not on this page · raw message

meta/recipes-bsp/uboot/u-boot-mkimage_2011.06.bb new file +29 -0
new file mode 100644
index 0000000..3ca0c2c
@@ -0,0 +1,29 @@
+DESCRIPTION = "U-boot bootloader mkimage tool"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
+                    file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90"
+SECTION = "bootloader"
+
+PR = "r0"
+
+SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "0cc5026aad02f218a9b9ac56b301c97a"
+SRC_URI[sha256sum] = "362ddb935885da98cf461eba08f31e3e59d0c4ada6cb2fa15596f43af310ba8b"
+
+S = "${WORKDIR}/u-boot-${PV}"
+
+BBCLASSEXTEND = "native nativesdk"
+
+EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTLD="${LD}" HOSTLDFLAGS="${LDFLAGS}" HOSTSTRIP=true'
+
+do_compile () {
+  oe_runmake tools
+}
+
+do_install () {
+  install -d ${D}${bindir}
+  install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage
+  ln -sf uboot-mkimage ${D}${bindir}/mkimage
+}
+
meta/recipes-bsp/uboot/u-boot_2011.06.bb new file +26 -0
new file mode 100644
index 0000000..acd0944
@@ -0,0 +1,26 @@
+require u-boot.inc
+
+# To build u-boot for your machine, provide the following lines in your machine
+# config, replacing the assignments as appropriate for your machine.
+# UBOOT_MACHINE = "omap3_beagle_config"
+# UBOOT_ENTRYPOINT = "0x80008000"
+# UBOOT_LOADADDRESS = "0x80008000"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
+                    file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE}"
+
+# This revision corresponds to the tag "v2011.06"
+# We use the revision in order to avoid having to fetch it from the repo during parse
+SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a"
+
+PV = "v2011.06+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
+
+S = "${WORKDIR}/git"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
Signature · 1 line
1.7.3.4

Saul Wold

author
#0 lore raw

cover Add uboot 2011.06

This adds the 2011.06 version of uboot

thanks
Sau!

The following changes since commit f05b7ee7716d1e5cc1ba0bbab57e91c3a0569e9e:

x-load: Update to 1.5.0 (2011-07-05 14:16:33 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix

Saul Wold (1):
uboot: Add 2011.06 Version

 ...Drop-config.h-include-in-tools-imximage.h.patch |   39 +++++++++
 ...ove-LDSCRIPT-processing-to-the-top-level-.patch |   82 ++++++++++++++++++++
 meta/recipes-bsp/uboot/u-boot-mkimage_2011.06.bb   |   29 +++++++
 meta/recipes-bsp/uboot/u-boot_2011.06.bb           |   26 ++++++
 4 files changed, 176 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch
 create mode 100644 meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
 create mode 100644 meta/recipes-bsp/uboot/u-boot-mkimage_2011.06.bb
 create mode 100644 meta/recipes-bsp/uboot/u-boot_2011.06.bb
Signature · 1 line
1.7.3.4
#2 lore raw
Quoted 7 lines · Saul Wold

This adds the 2011.06 version of uboot

thanks
Sau!

The following changes since commit f05b7ee7716d1e5cc1ba0bbab57e91c3a0569e9e:

Quoted 8 lines

x-load: Update to 1.5.0 (2011-07-05 14:16:33 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix

Saul Wold (1):
uboot: Add 2011.06 Version

Merged to master, thanks.

Richard