summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-07-06 16:11:27 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-07 10:13:59 (GMT)
commit0d029ba065be7242f110db4a7303b3cb465318ac (patch)
treef6a5e9f365465a9dca2025cf54477505fc22dcf8 /meta
parent7fefee42de485beb24aaa604e6eda61753645567 (diff)
downloadpoky-0d029ba065be7242f110db4a7303b3cb465318ac.tar.gz
uboot: Add 2011.06 Version
[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. (From OE-Core rev: 8aec526820f9b7d3a32142ae6849d67dc273c1a6) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch39
-rw-r--r--meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch82
-rw-r--r--meta/recipes-bsp/uboot/u-boot-mkimage_2011.06.bb29
-rw-r--r--meta/recipes-bsp/uboot/u-boot_2011.06.bb26
4 files changed, 176 insertions, 0 deletions
diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch b/meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch
new file mode 100644
index 0000000..f4b12ac
--- /dev/null
+++ b/meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch
@@ -0,0 +1,39 @@
1From ce56e089ddb51dbd81bb2c86b1646d77447afe39 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <loic.minier@linaro.org>
3Date: Thu, 3 Feb 2011 15:07:01 +0100
4Subject: Drop config.h include in tools/imximage.h
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Applied
10
11"make tools-all" should allow building tools such as mkimage and the new
12imximage without any config, but imximage.c currently fails to build
13with:
14imximage.h:27:20: error: config.h: No such file or directory
15
16config.h is not needed in imximage.h nor in imximage.c, and imximage.h
17is only included from imximage.c, so drop this include to fix the build.
18
19Signed-off-by: Loc Minier <loic.minier@linaro.org>
20---
21 tools/imximage.h | 2 --
22 1 files changed, 0 insertions(+), 2 deletions(-)
23
24diff --git a/tools/imximage.h b/tools/imximage.h
25index 38ca6be..d126a46 100644
26--- a/tools/imximage.h
27+++ b/tools/imximage.h
28@@ -24,8 +24,6 @@
29 #ifndef _IMXIMAGE_H_
30 #define _IMXIMAGE_H_
31
32-#include <config.h>
33-
34 #define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set for v2 */
35 #define MAX_HW_CFG_SIZE_V1 60 /* Max number of registers imx can set for v1 */
36 #define APP_CODE_BARKER 0xB1
37--
381.7.4.4
39
diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch b/meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
new file mode 100644
index 0000000..c102691
--- /dev/null
+++ b/meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
@@ -0,0 +1,82 @@
1From fd1b50c5ff9c288040abf5e78815151327d32e0e Mon Sep 17 00:00:00 2001
2From: Ilya Yanok <yanok@emcraft.com>
3Date: Mon, 20 Jun 2011 12:45:37 +0000
4Subject: config.mk: move LDSCRIPT processing to the top-level Makefile
5
6Upstream-Status: Applied
7
8LDSCRIPT is used only from the top-level Makefile and only when the
9system is configured so we can move LDSCRIPT and CONFIG_SYS_LDSCRIPT
10related logic into the top level Makefile and under configured condition
11to avoid errors when building tools from unconfigured tree.
12
13Signed-off-by: Ilya Yanok <yanok@emcraft.com>
14Acked-by: Mike Frysinger <vapier@gentoo.org>
15---
16 Makefile | 30 ++++++++++++++++++++++++++++++
17 config.mk | 8 --------
18 2 files changed, 30 insertions(+), 8 deletions(-)
19
20diff --git a/Makefile b/Makefile
21index ece91ab..358c410 100644
22--- a/Makefile
23+++ b/Makefile
24@@ -163,6 +163,36 @@ endif
25 # load other configuration
26 include $(TOPDIR)/config.mk
27
28+# If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use
29+# that (or fail if absent). Otherwise, search for a linker script in a
30+# standard location.
31+
32+ifndef LDSCRIPT
33+ #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug
34+ ifdef CONFIG_SYS_LDSCRIPT
35+ # need to strip off double quotes
36+ LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT))
37+ endif
38+endif
39+
40+ifndef LDSCRIPT
41+ ifeq ($(CONFIG_NAND_U_BOOT),y)
42+ LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
43+ ifeq ($(wildcard $(LDSCRIPT)),)
44+ LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
45+ endif
46+ endif
47+ ifeq ($(wildcard $(LDSCRIPT)),)
48+ LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds
49+ endif
50+ ifeq ($(wildcard $(LDSCRIPT)),)
51+ LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot.lds
52+ endif
53+ ifeq ($(wildcard $(LDSCRIPT)),)
54+$(error could not find linker script)
55+ endif
56+endif
57+
58 #########################################################################
59 # U-Boot objects....order is important (i.e. start must be first)
60
61diff --git a/config.mk b/config.mk
62index fa46ff1..59c4c93 100644
63--- a/config.mk
64+++ b/config.mk
65@@ -153,14 +153,6 @@ endif
66 RELFLAGS= $(PLATFORM_RELFLAGS)
67 DBGFLAGS= -g # -DDEBUG
68 OPTFLAGS= -Os #-fomit-frame-pointer
69-ifndef LDSCRIPT
70-#LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug
71-ifeq ($(CONFIG_NAND_U_BOOT),y)
72-LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
73-else
74-LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds
75-endif
76-endif
77 OBJCFLAGS += --gap-fill=0xff
78
79 gccincdir := $(shell $(CC) -print-file-name=include)
80--
811.7.5.4
82
diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage_2011.06.bb b/meta/recipes-bsp/uboot/u-boot-mkimage_2011.06.bb
new file mode 100644
index 0000000..3ca0c2c
--- /dev/null
+++ b/meta/recipes-bsp/uboot/u-boot-mkimage_2011.06.bb
@@ -0,0 +1,29 @@
1DESCRIPTION = "U-boot bootloader mkimage tool"
2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
4 file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90"
5SECTION = "bootloader"
6
7PR = "r0"
8
9SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
10
11SRC_URI[md5sum] = "0cc5026aad02f218a9b9ac56b301c97a"
12SRC_URI[sha256sum] = "362ddb935885da98cf461eba08f31e3e59d0c4ada6cb2fa15596f43af310ba8b"
13
14S = "${WORKDIR}/u-boot-${PV}"
15
16BBCLASSEXTEND = "native nativesdk"
17
18EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTLD="${LD}" HOSTLDFLAGS="${LDFLAGS}" HOSTSTRIP=true'
19
20do_compile () {
21 oe_runmake tools
22}
23
24do_install () {
25 install -d ${D}${bindir}
26 install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage
27 ln -sf uboot-mkimage ${D}${bindir}/mkimage
28}
29
diff --git a/meta/recipes-bsp/uboot/u-boot_2011.06.bb b/meta/recipes-bsp/uboot/u-boot_2011.06.bb
new file mode 100644
index 0000000..acd0944
--- /dev/null
+++ b/meta/recipes-bsp/uboot/u-boot_2011.06.bb
@@ -0,0 +1,26 @@
1require u-boot.inc
2
3# To build u-boot for your machine, provide the following lines in your machine
4# config, replacing the assignments as appropriate for your machine.
5# UBOOT_MACHINE = "omap3_beagle_config"
6# UBOOT_ENTRYPOINT = "0x80008000"
7# UBOOT_LOADADDRESS = "0x80008000"
8
9LICENSE = "GPLv2+"
10LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
11 file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90"
12
13FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE}"
14
15# This revision corresponds to the tag "v2011.06"
16# We use the revision in order to avoid having to fetch it from the repo during parse
17SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a"
18
19PV = "v2011.06+git${SRCPV}"
20PR = "r0"
21
22SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
23
24S = "${WORKDIR}/git"
25
26PACKAGE_ARCH = "${MACHINE_ARCH}"