Commit Graph

31 Commits

Author SHA1 Message Date
Richard Purdie c8dee9b92d Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata:

sed \
-e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \
-e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-i `grep -ril bb.data *`

(From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-10 11:51:19 +00:00
Saul Wold 4a6109fc36 Patches: Fix Upstream-Status info
(From OE-Core rev: f2a5b2d143fff8337d2f0d024bc593c55f56a3a3)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-13 12:29:20 +01:00
Saul Wold 0d029ba065 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>
2011-07-07 11:13:59 +01:00
Richard Purdie 52e42f09db u-boot: Drop INSANE_SKIP since it insane no longer trips up on this recipe
(From OE-Core rev: 8dadc0d09fded88425e88d0fa6d1897099db3c18)

Signed-off-by: Richard  Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-05 11:39:09 +01:00
Richard Purdie 8511d1ec1b Drop PRIORITY variable
As discussed on the mailing list, this variable isn't useful and if wanted
would be better implemented by distros using pn-X overrides.

This patch executes:

find . -regex ".*\.\(bb\|inc\)$" | xargs sed -i '/^PRIORITY = ".*"$/d'

against the tree removing the referenced. Thanks to Phil Blundell for
the command.

(From OE-Core rev: d122343362669c683acc4af295971a62cbc823fc)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-01 23:27:29 +01:00
Ilya Yanok a4f3e006e1 u-boot-mkimage: bump version to 2011.03
This patch changes u-boot-mkimage version to 2011.03. Unfortunately
U-Boot 2011.03 release has some problems building tools from
unconfigured tree, so this patch aslo includes the backported fixes.

(From OE-Core rev: 8a5c20417d4d6bee6dd0bcdbeb8d4f9e0696a216)

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-28 17:13:19 +01:00
Paul Eggleton 3b79156be8 u-boot: set SRCREV to a git revision instead of a tag reference
If we use a tag here then bitbake has to connect to the repository to find
out the corresponding revision (so it can expand SRCPV which is part of PV,
which amongst other things is needed to determine whether or not the
package has to be rebuilt.) This occurs at parse time; on machines behind a
firewall or with no network access this can be a problem.

We wish to avoid unnecessary network accesses and network access in our
default configuration during parse time is even worse. Substituting the
git revision corresponding to the tag prevents bitbake from having to
contact the remote repository in order to expand PV.

Addresses [YOCTO #1186]

(From OE-Core rev: 04fe616bec7416b5aea55dad6896700652796239)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-22 16:20:26 +01:00
Koen Kooi d8f87522b6 u-boot: package up u-boot.bin for field upgrades
(From OE-Core rev: 4089a58253f69eff5eb7d97a67f1b61ee08057f4)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-02 14:55:54 +01:00
Darren Hart 3a454781df u-boot: rename u-boot_git.bb to u-boot_${PV}.bb
In order to facilitate reuse of the oe-core u-boot recipe, there needs to be
some assurance that the oe-core version won't change without a clear indicator
to people extending it.

By renaming the recipe to include its version string instead of "git", BSP
layers can extend a specific base version of u-boot, ie.
u-boot_2011.03.bbappend. When 2011.06 becomes available, we can create that file
without instantly breaking all the BSPs depending on oe-core version of the
recipe.

As a matter of policy I would recommend we not carry more than 2 versioned
u-boot recipess at any given time. This will provide BSP layers time to migrate
to the newer version, without cluttering oe-core with numerous stale versions of
u-boot. We may decide later to resurrect u-boot_git.bb as an AUTOREV recipe to
faciliate upstream development on u-boot in the oe environment.

(From OE-Core rev: f788d4b503ecc6600612746c4936dfb9393e237c)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Koen Kooi <koen@dominion.thruhere.net>
Cc: Jason Kridner <jkridner@beagleboard.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-27 16:38:53 +01:00
Darren Hart 7f75045371 u-boot: remove UBOOT_MACHINE and COMPATIBLE_MACHINES
oe-core does not define any machines, so it does not make sense to
add machine specific information in the oe-core u-boot recipe and
infrastructure. Also note that COMPATIBLE_MACHINES is not easily extended due to
its regex syntax: "(machine_a|machine_b)", making it difficult to extend the
u-boot recipe in bbappend files without resorting to machine specific overrides.

Remove COMPATIBLE_MACHINES and the default UBOOT_MACHINE from the recipe and
insert some anonymous python into u-boot.inc to raise SkipPackage if
UBOOT_MACHINE is not set (this ensures 'world' still works for machines that
can't build u-boot).

UBOOT_MACHINE must now be specified in each machine config that requires u-boot.
This is an improvement over requiring machine specific overrides in every BSP
layer's u-boot_git.bbappend file. For example, a beagleboard machine config
currently contains:

UBOOT_ENTRYPOINT = "0x80008000"
UBOOT_LOADADDRESS = "0x80008000"

With this change, it must now contain:

UBOOT_MACHINE = "omap3_beagle_config"
UBOOT_ENTRYPOINT = "0x80008000"
UBOOT_LOADADDRESS = "0x80008000"

So long as the SRC_URI in the base recipe can build a working u-boot for a given
machine, there is no need to create a u-boot_git.bbappend file. If additional
patches are deemed necessary, a BSP layer creates a u-boot_git.bbappend file and
extends the SRC_URI to include general or machine specific backports.

Note: I used bb.note() instead of bb.debug() to ensure the message at least
      makes it to the console. From what I could gather, bb.debug() doesn't
      go anywhere during recipe parsing.

(From OE-Core rev: c7a198d7472b4767047dbbfeecb4d941055262b3)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Koen Kooi <koen@dominion.thruhere.net>
Cc: Jason Kridner <jkridner@beagleboard.org>
Cc: Chris Larson <clarson@kergoth.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-27 16:38:53 +01:00
Richard Purdie 2f4c803427 Revert "u-boot: fix LIC_FILE_CHKSUM"
This reverts commit 2d2563a7b0.

Saul discovered this change was incorrect.
2011-05-20 17:08:51 +01:00
Saul Wold 2d2563a7b0 u-boot: fix LIC_FILE_CHKSUM
(From OE-Core rev: bbdd81fcd25d2d5aa730a1ea99eecf50a2111989)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-20 12:40:44 +01:00
Darren Hart c6dde3245e u-boot: update SRCREV to 2011.03
Fixes [YOCTO 1029]

u-boot 2010.12 fails to run on the Beagleboard C4 and xM Rev A boards.  Commit
55aacbc30e suggests there was a mixup during
development, as the MD5SUM change is from the 2011.03 SRCREV back to the
2010.12. Chances are a patch was never sent to update the SRCREV, leaving the
MD5SUM in a bad state.

Update the SRCREV and COPYING MD5SUM to use the 2011.03 version. Built
and tested on Beagleboard xM Rev A and Beagleboard Rev C4.

(From OE-Core rev: 68d301e950c06eda8c8a73db1ed299c45dee7b9f)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Tested-by: Jeff Osier-Mixon <jefro@jefro.net>
Cc: Jeff Osier-Mixon <jefro@jefro.net>
Cc: Yi Zhao <yi.zhao@windriver.com>
Cc: Robert Berger <pokylinux@reliableembeddedsystems.com>
Cc: Gary Thomas <gary@mlbassoc.com>

Merged Richard's removal of PR from PV

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-19 20:51:38 +01:00
Richard Purdie 1ef9f107f0 u-boot: Don't add PR in PV, its pointless
(From OE-Core rev: 2f597ad74d7ed383365dba10e61010e8f82ab6b1)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-19 20:48:29 +01:00
Darren Hart 55aacbc30e u-boot: correct COPYING MD5SUM
(From OE-Core rev: d0dc2b5bb02ef55a41e7a97b6831c72391ae7f36)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-09 14:09:10 +01:00
Yu Ke 61018fda65 poky-default-revisions: move the SRCREV to recipe file
in this case, those non poky distro can also use these recipe normally

(From OE-Core rev: 0a57bd226cdb8332707fa0f46fcf0b067f03701a)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-04 15:06:36 +01:00
Chase Maupin c6d6e49d07 u-boot.inc: allow variable make targets
* Later versions of u-boot sometimes have top level make targets
  such as u-boot.imx, u-boot.kwb, and for upcoming TI devices
  u-boot.ti.
* These targets define different calls to the mkimage tool to
  change the images created, such as changing the load address.
* This change allows recipes to change the default make target
  of "all" to something like u-boot.ti or u-boot.imx by setting
  the UBOOT_MAKE_TARGET variable.

(From OE-Core rev: 1e675fac4f7f22028700d7c5bc376d029af592e0)

Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-16 13:54:17 +00:00
Bruce Ashfield 0f44acfd04 u-boot: remove do_install from u-boot.inc
Fixes [BUGID #777]

The do_install rule in u-boot.inc was installing a host
tool into the target ${bindir}, which is subsequently
stripped with target strip during packaging, and the
obvious error ensues.

The native u-boot recipe has its own install rule, and
the machine specific u-boot doesn't require mkimage or
anything else in the do_install function. So we remove
it completely until it is needed again.

[sgw: PR bump]
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2011-03-01 09:59:55 -08:00
Darren Hart 27b3f0813b uboot: move license data into recipe with SRC_URI
The LIC_CHKSUM_FILES are specific to the source determined by SRC_URI. As such,
keep all the license information together with the SRC_URI. This also avoids
confusion from having these defined in both the .inc and the .bb files. The
CHKSUM got out of date in u-boot_git.bb, so update it while we're at it.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Ilya Yanok <yanok@emcraft.com>
CC: Gary Thomas <gary@mlbassoc.com>
CC: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-02-09 22:44:52 +00:00
Darren Hart 6b76ceed14 uboot: build with -O2 on all architectures
The -Os option was disabled due to a bug in gcc building bad binaries for ARM
in an earlier commit:

f2dc7fadd8

This caused problems for powerpc which was resolved by replacing -Os with
-O2 for that architecture:

d0eb6794d9

Using -O2 also works for ARM, so there is no need to condition using -O2 on
powerpc. Remove the condition and use -O2 on all architectures.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Ilya Yanok <yanok@emcraft.com>
CC: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-02-09 22:44:52 +00:00
Ilya Yanok d0eb6794d9 u-boot: compile with -O2 on PowerPC
gcc on PowerPC is currently compiled with -Os optimization disabled so
we have to use -O2 on PowerPC instead.

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-02-09 11:25:04 +00:00
Ilya Yanok 8bf1bf2189 u-boot: add LIC_FILES_CHKSUM
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-02-09 11:24:58 +00:00
Richard Purdie 5f2cf65e65 linux/u-boot: Update LICENSE fields to specify GPL version
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-02-09 11:23:51 +00:00
Darren Hart 5da38d224e u-boot-omap3: remove in favor of upstream u-boot
This repository is stale, the u-boot_git.bb recipe uses the upstream
repository. Remaining machines using this recipe have already been
converted to using u-boot_git.bb.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Tom Zanussi <tom.zanussi@intel.com>
CC: Bruce Ashfield <bruce.ashfield@windriver.com>
2011-01-21 11:18:36 +00:00
Darren Hart f2dc7fadd8 u-boot: Add a new upstream u-boot recipe
uboot-omap3 appears to be fairly stale (last commit in April 2010) while
the upstream u-boot is making regular tagged releases. Add a new recipe
using the upstream u-boot repository.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Tom Zanussi <tom.zanussi@intel.com>
CC: Bruce Ashfield <bruce.ashfield@windriver.com>
2011-01-21 11:18:36 +00:00
Yu Ke 9b5c770cbd recpies: use SRCPV instead of SRCREV for PV
SRCPV is intended being used by PV, some recipes still use
SRCREV for PV, which is not correct. This patch fix all the
misusage.

Signed-off-by: Yu Ke <ke.yu@intel.com>
2011-01-06 10:37:30 +00:00
Saul Wold 9951a44e6d u-boot: add LIC_FILES_CHKSUM
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-25 00:11:36 -08:00
Saul Wold 3d08b9f2c6 SRC_URI Checksums Additionals
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-09 08:18:17 -08:00
Qing He b9e40013b1 u-boot-mkimage: update license info
Signed-off-by: Qing He <qing.he@intel.com>
2010-12-01 20:47:05 -08:00
Richard Purdie 02445fca7b poky-default-revisions.inc: Move SRCREV settings into this file
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-10-07 21:24:11 +01:00
Richard Purdie d62ee7eaf2 packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-09-01 19:09:57 +01:00