summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot/u-boot.inc
Commit message (Collapse)AuthorAgeFilesLines
* u-boot.inc: make sure all counter variables are properly unsetCarlos Rafael Giani2015-04-241-0/+5
| | | | | | | | | | | | | | The script does "i == j" checks to retrieve the config <-> type pairs from the UBOOT_MACHINE and UBOOT_CONFIG lists. This check however requires both j and i to be initially unset. Ensure this by explicitely unsetting i. This fixes broken u-boot SPL installations with SolidRun machines (the SPL wasn't being installed and deployed.) (From OE-Core rev: 50233dc2544fe8eeee69a5dc07f505db29fc9e0e) Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot.inc: fix rename image errorChunrong Guo2015-03-311-58/+43
| | | | | | | | | | | Resolve mismatch between U-Boot configs and uboot image name. The ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} may alway be false and repeat compile or install so we need to check if ${type} match ${config} (From OE-Core rev: c3c7265aa3931d47af53433f3c2d25f0e447d52e) Signed-off-by: Chunrong Guo <B40290@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: update to version 2015.01Denys Dmytriyenko2015-02-141-2/+2
| | | | | | | | (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>
* u-boot.inc: unbreakAndreas Müller2015-02-131-5/+5
| | | | | | | | | | | fix multiple: | run.do_deploy.7526: line 107: [: missing `]' (From OE-Core rev: 71fa7c263cdb410f463f2c17a257ee02ecf2fa69) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot.inc : add compile multiple u-boot featureChunrong Guo2015-02-081-21/+129
| | | | | | | | (From OE-Core rev: ab126dcca85d6a335212b07a1ca37d5e045a59cf) Signed-off-by: Chunrong Guo <B40290@freescale.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: update to version 2014.07Denys Dmytriyenko2014-11-121-3/+2
| | | | | | | | | | | | | u-boot doesn't really support building its tools for the target, as they are built with HOSTCC compiler, which is also used to compile fixdep utility that gets executed during the build. Since it might be beneficial to have a target version of mkimage, let's hack it to build fixdep in a separate step. (From OE-Core rev: a8692184d25cb7d8cb3b617e1dfb901fe1b0ca3d) 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>
* u-boot: cleanup indentation and consolidate .inc fileDenys Dmytriyenko2014-09-221-0/+10
| | | | | | | (From OE-Core rev: 71525643909ac765e6b6a4b419cddae7d5812a8d) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Optionally deploy an environment or script fileAsh Charles2014-06-251-0/+25
| | | | | | | | | | | | | | | | Some boards are configured to read a script or environment file as part of the u-boot boot sequence. This file, typically called 'uEnv.txt' or 'boot.scr', would be deployed alongside the u-boot binary. If a recipe uses this u-boot.inc, such a file can be deployed by setting the optional UBOOT_ENV parameter and including the file in the SRC_URI. For example: SRC_URI_append_overo = "file://uEnv.txt" UBOOT_ENV_overo = "uEnv" (From OE-Core rev: 1506c40c93651356b9fe2f7184b5e26f99e22686) Signed-off-by: Ash Charles <ashcharles@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: remove unused FILESPATHPetter Mabäcker2014-05-131-1/+0
| | | | | | | | | | | | | | Fixes [YOCTO #4497] Usage of FILESPATH is discouraged, since it can make recipes harder to bbappend. Instead FILESEXTRAPATHS should be used to extend the path. However in u-boot no FILESPATH additions are currently needed so instead it should be removed. (From OE-Core rev: f8675ffa3f90d4e411a82d33ac8319f2c4c19235) Signed-off-by: Petter Mabäcker <petter@technux.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Globally replace 'base_contains' calls with 'bb.utils.contains'Otavio Salvador2014-04-251-1/+1
| | | | | | | | | | | The base_contains is kept as a compatibility method and we ought to not use it in OE-Core so we can remove it from base metadata in future. (From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Replace one-line DESCRIPTION with SUMMARYPaul Eggleton2014-01-021-1/+1
| | | | | | | | | | | | | | A lot of our recipes had short one-line DESCRIPTION values and no SUMMARY value set. In this case it's much better to just set SUMMARY since DESCRIPTION is defaulted from SUMMARY anyway and then the SUMMARY is at least useful. I also took the opportunity to fix up a lot of the new SUMMARY values, making them concisely explain the function of the recipe / package where possible. (From OE-Core rev: b8feee3cf21f70ba4ec3b822d2f596d4fc02a292) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot, u-boot-fw-utils, u-boot-fw-utils-cross: Use uboot-config classOtavio Salvador2013-09-221-10/+1
| | | | | | | | | | | 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>
* u-boot: state the MACHINE when skipping u-bootRoss Burton2013-08-031-1/+1
| | | | | | | | | | | | | | 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>
* u-boot: Add UBOOT_LOCALVERSION to control version stringChase Maupin2013-04-221-0/+12
| | | | | | | | | | | | | | | | | | | * 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>
* u-boot: Use fw_env.config if available.Franklin S. Cooper Jr2012-09-101-5/+11
| | | | | | | | | | * 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>
* u-boot.inc: fix regexp used when ld-is-goldMartin Jansa2012-08-021-1/+1
| | | | | | | | | | | | | | | | | | * 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>
* u-boot.inc: update linker arguments to pass --sysroot argMatthew McClintock2012-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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>
* u-boot: make FILESDIR a shared setting via FILESPATHPaul Gortmaker2012-07-051-0/+1
| | | | | | | | | | | | | | 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>
* u-boot: do not clobber PARALLEL_MAKE settingPaul Gortmaker2012-07-031-2/+0
| | | | | | | | | | | | | 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>
* u-boot: Don't make the -Os removal part of global settings.Paul Gortmaker2012-07-031-2/+1
| | | | | | | | | | | | 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>
* u-boot.inc: fix compilation when using 'gold' as linkerOtavio Salvador2012-04-261-0/+4
| | | | | | | (From OE-Core rev: 2e79fcd673dadeab6358fe22d47c8534c14de03e) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: add machine name to spl image nameStefan Herbrechtsmeier2012-04-061-1/+1
| | | | | | | (From OE-Core rev: 794225ed3b6fe7878595b7452259cc9bf1973213) Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot inc: update inc file for newer u-boot versionsChase Maupin2012-02-081-4/+31
| | | | | | | | | | | | | | | * 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>
* u-boot: improved DESCRIPTION, fixed HOMEPAGEFrans Meulenbroeks2012-01-031-2/+2
| | | | | | | | | | | | 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>
* u-boot: renamed dir from uboot to the more appropriate u-bootFrans Meulenbroeks2011-12-131-0/+50
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>