Commit Graph

31 Commits

Author SHA1 Message Date
Otavio Salvador 14c6a82c84 u-boot, u-boot-fw-utils, u-boot-fw-utils-cross: Use uboot-config class
The U-Boot configuration has been consolidates into a single class to
avoid code duplication. This is now done by uboot-config class, so we
now use it.

(From OE-Core rev: d0bc7a53b1e61283fb155b4dcb67bc2ab3b1d7f0)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-22 12:19:42 +01:00
Otavio Salvador 63cd03b80c u-boot-fw-utils: Skip package if UBOOT_MACHINE is unset
The UBOOT_MACHINE variable needs to be set so the firmware utils can
know about some configuration settings which are board dependent. This
patch ensures the package is skipped in case UBOOT_MACHINE is unset
thus avoid its build in 'bitbake world' builds for incompatible
machines.

Fixes [YOCTO: #5223]

(From OE-Core rev: d9abcc0a2a691ca60cc1cb2f48f1748b0de73ac8)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-18 14:18:08 +01:00
Anders Darander 9a4169a465 u-boot-fw-utils: reinstate target recipe for fw_printenv
The latest upgrade changed u-boot-fw-utils to u-boot-fw-utils-cross, which
removed the on-target fw_printenv (and fw_setenv).

Re-create the updated version of the u-boot-fw-utils recipe.

U-Boot does try to strip the fw_printenv binary by default now. To avoid
this, without patching the Makefile, we add HOSTSTRIP=true to EXTRA_OEMAKE.

The new U-Boot do also require us to configure the build for a specific
machine, thus we change the package arch.§

(From OE-Core rev: 83cb07047658e2e2b2d721e1b01553d4df3d8636)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-17 19:34:56 +01:00
Otavio Salvador 4acfbb1bb0 u-boot, u-boot-fw-utils-cross, u-boot-mkimage: Upgrade to 2013.07
This upgrades the U-Boot based recipes for 2013.07 release.

This removes the 2011.03, 2011.06 and 2013.01.01 versions so we keep a
single one in core. The following recipes has been upgraded:

 - u-boot (remove old versions)
 - u-boot-mkimage (remove old versions)
 - u-boot-fw-utils -> u-boot-fw-utils-cross (renamed and reworked)

The u-boot-fw-utils-cross recipe has been reworked as it uses the
UBOOT_MACHINE to find default environment for use so it is indeed a
cross binary and not a native one.

(From OE-Core rev: c5fff5748e0aaf7e135fdd464c2104b1d3cbfd5a)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-10 16:02:23 +01:00
Jackie Huang 88c5e10d62 remove the unnecessary protocol parameters
It's not necessary to specify the protocol parameter when it's the
default protocol for the fetcher, e.g. the default protocol for
git fetcher it git, "protocol=git" isn't needed.

(From OE-Core rev: a2bab241c64428d5109c3c5ac5de4463fbad70c5)

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-30 16:23:46 +01:00
Laszlo Papp 355a781662 u-boot: update to 2013.07
(From OE-Core rev: b2d6f08ff4f03079973eab76a790bf4555e32236)

Signed-off-by: Laszlo Papp <lpapp-RoXCvvDuEio@public.gmane.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-26 16:29:18 +01:00
Ross Burton a326594597 u-boot: state the MACHINE when skipping u-boot
If the user accidently tries building u-boot on a machine doesn't use u-boot
(such as qemuarm) the error message doesn't make it clear why u-boot was
skipped.  To help, state the machine that was being built for again.

[ YOCTO #4945 ]

(From OE-Core rev: beef66beaee926ec3d3640b79133fdb2ccc404f0)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-03 10:33:11 +01:00
Chase Maupin 5af9ca580f u-boot: Add UBOOT_LOCALVERSION to control version string
* Add a variable called UBOOT_LOCALVERSION which when set will
  place a version string in the .scmversion file of the u-boot
  sources.  This string will be picked up by the u-boot Makefile
  and will be appended to the u-boot version.  This is done to
  make it easier to identify what revision of the u-boot sources
  are being run.  For example you can use a setting like the
  following to add the short commit id to the u-boot version
  string:

UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"

(From OE-Core rev: 566298409408c6103f7a9871bb13ae5449c4fd64)

Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-22 14:45:03 +01:00
Radu Moisan 228cced04d u-boot: Upgrade to v2013.01.01
(From OE-Core rev: ecdca4350a27708105692b6927f356ba0917422c)

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-18 13:18:22 +00:00
Radu Moisan c28dd9b99d u-boot-mkimage: Upgrade to v2013.01.01
(From OE-Core rev: 8b44f27730d8d58923bf94dd3e06ce2cb733c974)

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-18 13:18:22 +00:00
Radu Moisan c50fdf5575 u-boo-fw-utils: Upgrade to v2013.01.01
(From OE-Core rev: ad48b2e32b640c1ca264c0b3b0038484facfd867)

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-18 13:18:21 +00:00
Franklin S. Cooper Jr 23a6f63f74 u-boot: Use fw_env.config if available.
* Add support for board specific fw_env.config file if available.

(From OE-Core rev: 5b6a8e987f9039aca63d97bc42421b78acab8a3d)

Signed-off-by: Franklin S. Cooper Jr <fcooper27jr@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-10 13:01:52 +01:00
Martin Jansa c1fb312974 u-boot.inc: fix regexp used when ld-is-gold
* with old regexp it wasn't reentrant, causing stuff like this:
  -LD     = $(CROSS_COMPILE)ld
  +LD     = $(CROSS_COMPILE)ld.bfd.bfd
  -LDR    = $(CROSS_COMPILE)ldr
  +LDR    = $(CROSS_COMPILE)ld.bfd.bfdr
  when do_compile was reexecuted, also breaking LDR variable and
  http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/tree/recipes-bsp/u-boot/u-boot/0001-config-Always-use-GNU-ld.patch
  when it was used together with u-boot.inc from oe-core (meta-ti is using own u-boot.inc)

* This patch is also better solution to ld-is-gold problem then regexp in metadata.

(From OE-Core rev: f78044f85ab1a0acce852a7032fc0c81285cd4c1)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-02 15:28:37 +01:00
Matthew McClintock a35f60a829 u-boot.inc: update linker arguments to pass --sysroot arg
If we are building from sstate-cache it's possible to be building
from another folder on another machine, therefore the linker requires
that a proper --sysroot is passed too it so it can find things like
libgcc.a and avoid errors such as:

| arm-poky-linux-gnueabi-gcc  -g  -O2  -fno-common -ffixed-r8 -msoft-float   -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0x80008000 -I/local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/work/beagleboard-poky-linux-gnueabi/u-boot-v2011.06+git5+b1af6f532e0d348b153d5c148369229d24af361a-r0/git/include -fno-builtin -ffreestanding -nostdinc -isystem /local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/sysroots/x86_64-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/../../lib/armv7a-vfp-neon-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/4.6.3/include -pipe  -DCONFIG_ARM -D__ARM__ -marm  -mabi=aapcs-linux -mno-thumb-interwork -march=armv5 -Wall -Wstrict-prototypes -fno-stack-protector -fno-toplevel-reorder   -o hello_world.o hello_world.c -c
| arm-poky-linux-gnueabi-gcc  -g  -O2  -fno-common -ffixed-r8 -msoft-float   -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0x80008000 -I/local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/work/beagleboard-poky-linux-gnueabi/u-boot-v2011.06+git5+b1af6f532e0d348b153d5c148369229d24af361a-r0/git/include -fno-builtin -ffreestanding -nostdinc -isystem /local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/sysroots/x86_64-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/../../lib/armv7a-vfp-neon-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/4.6.3/include -pipe  -DCONFIG_ARM -D__ARM__ -marm  -mabi=aapcs-linux -mno-thumb-interwork -march=armv5 -Wall -Wstrict-prototypes -fno-stack-protector -fno-toplevel-reorder   -o stubs.o stubs.c -c
| arm-poky-linux-gnueabi-ld  -r -o libstubs.o  stubs.o
| arm-poky-linux-gnueabi-ld -g -Ttext 0x80300000 \
| 			-o hello_world -e hello_world hello_world.o libstubs.o \
| 			-L. -lgcc
| arm-poky-linux-gnueabi-ld: cannot find -lgcc
| make[1]: *** [hello_world] Error 1

(From OE-Core rev: 923eb657f24a1feaa93172eda8f87252e86bfea2)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-28 09:20:52 +01:00
Paul Gortmaker 9d64d83e2b u-boot: make FILESDIR a shared setting via FILESPATH
The setting is the same in all recipes, so move it to
the shared settings in u-boot.inc

Since FILESDIR is also being phased out, use the FILESPATH
setting as suggested by Richard Purdie.

Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: 1b78904b115b50172cf82948d8a68dc3a98005ce)

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-05 14:21:56 +01:00
Paul Gortmaker b6cf8f9023 u-boot: do not clobber PARALLEL_MAKE setting
The u-boot tree is fully capable of parallel builds, so this
setting should not exist as a blanket setting for all of the
recipes.  Going forward, if there is a parallelism issue
in u-boot, it needs to be reported and fixed there, and not
with the "make -j1" band-aid approach.

(From OE-Core rev: 7fdd1f82803df9752e908f01f7643d66b82a690e)

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-03 14:54:59 +01:00
Paul Gortmaker feb06a0a2d u-boot: Don't make the -Os removal part of global settings.
We don't want to force everyone to be stripping the -Os
flags from their u-boot builds.  Remove it, since it pertains
to an old toolchain issue that is no longer relevant, and it
breaks the powerpc mpc8315.

(From OE-Core rev: 5e3f777f9fcc986ae66203651830b5765bca49fd)

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-03 14:54:59 +01:00
Otavio Salvador cc34134e71 u-boot: update 2012.04 to 2012.04.01 release
(From OE-Core rev: 90b7227f48c8250851d4c1a298364062a79403e6)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-26 10:05:18 +01:00
Otavio Salvador 1b6cba6969 u-boot-mkimage: update 2012.04 to 2012.04.01 release
(From OE-Core rev: bf8819a1aafeeaa3ce4c8eeda09f882bd9e18600)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-26 10:05:18 +01:00
Otavio Salvador 967bd67c37 u-boot-fw-utils: update 2012.04 to 2012.04.01 release
(From OE-Core rev: e6a6f2fb4bae146fc3077f782090e91904e00a08)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-26 10:05:18 +01:00
Otavio Salvador fb65e5b73d u-boot: add 2012.04 release
(From OE-Core rev: 146439ca1ef1da55769363cde012ed8b279e79dd)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-26 10:05:14 +01:00
Otavio Salvador 8545bea9a0 u-boot-mkimage: add 2012.04 release
(From OE-Core rev: e1b1b6313b57d069ef77bc6e1e1ebbb8f6fdda4e)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-26 10:05:13 +01:00
Otavio Salvador 79591eb7d2 u-boot-fw-utils: add 2012.04 release
(From OE-Core rev: 0f4552cde971a0de247b865b25136b03be91dc39)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-26 10:05:13 +01:00
Otavio Salvador 01d57e6548 u-boot.inc: fix compilation when using 'gold' as linker
(From OE-Core rev: 2e79fcd673dadeab6358fe22d47c8534c14de03e)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-26 10:05:13 +01:00
Stefan Herbrechtsmeier df21414331 u-boot: add machine name to spl image name
(From OE-Core rev: 794225ed3b6fe7878595b7452259cc9bf1973213)

Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-06 01:12:46 +01:00
Saul Wold 63b680ed05 u-boot-fw-utils: Add DEPEND on mtd-utils
(From OE-Core rev: 47d8444edb644a92d3bae524c8a2a42a1cdf740c)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-21 17:59:35 +00:00
Tom Rini c56792ce08 u-boot-fw-utils: Add for v2011.06
This provides the 'fw_setenv' and 'fw_getenv' programs for the target
so that the U-Boot environment can be modified from Linux.  These
programs are system-agnostic and rely on a config file that a given BSP
would provide and potentially RRECOMMEND this be installed.

(From OE-Core rev: 4a2543c0641f1df6d74c18cfe0c3ac3cfd50e60c)

Signed-off-by: Tom Rini <trini@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-10 14:38:41 +00:00
Chase Maupin ce0740fbb5 u-boot inc: update inc file for newer u-boot versions
* Add support for different suffixes found with later u-boot
  versions which have switched from .bin to .img
* Allow recipes that include u-boot.inc to also package an
  SPL if they build one.
    * Minimum requirement is to set the SPL_BINARY value to add
      the SPL to the u-boot package as well as into the deploy
      directory.

(From OE-Core rev: 2965aa2faaccce43f6c3e451c0a2ded3734766e4)

Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-08 00:50:24 +00:00
Frans Meulenbroeks 8a77467fe8 u-boot: improved DESCRIPTION, fixed HOMEPAGE
HOMEPAGE pointed to an sf.net page that said that the
page did not exist any more and after that it redirected
to the denx.de page; updated HOMEPAGE to point to that page
Also improved the description to use the official capitalisation

(From OE-Core rev: e0ebe12541a6628b7629a9be5918d0e7ea92aa33)

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-03 12:14:26 +00:00
Saul Wold 6036845d1c Patch Upstream Status Updates
(From OE-Core rev: 0eb139619301d0efee330932eba3617dcb39284e)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-15 14:36:26 +00:00
Frans Meulenbroeks 3994ad0c34 u-boot: renamed dir from uboot to the more appropriate u-boot
recipe dirs normally have the name of the (main) package and the official name is u-boot

(From OE-Core rev: e9899d52ade2181bd97dcf79bec64650e8b0f718)

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-13 12:28:12 +00:00