getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The u-boot recipes share a couple of common variables, which makes
updating of the recipes error prone and a toil. Factor those common
bits into u-boot-common_${PV}.inc so that they are in one place.
The u-boot_${PV}.bb now explicitly require u-boot-common_${PV}.inc
before require u-boot.inc , as doing require u-boot-common_${PV}.inc
from u-boot.inc would fail due to ${PV} not being set. This is a
functional change.
(From OE-Core rev: b36056af20e981433f143556d511dec5644930fc)
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use uboot-extlinux-config class to create extlinux.conf file and then
install inside /boot/extlinux directory and also put file to deploy
dir. This file will be only create if UBOOT_EXTLINUX is set to 1.
You can use DEPLOYDIR/extlinux.conf file to install into final image
using wic setting:
IMAGE_BOOT_FILES_append = " extlinux.conf;extlinux/extlinux.conf"
(From OE-Core rev: 33df3a65f3e8e136811da715d0cc247ce66ae0ea)
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The U-Boot binary is not an executable, it is a binary file,
set it's permissions to 0644 instead of 0755.
(From OE-Core rev: b75ef17a7cba1791b077968893ebd4a297547fd1)
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Need to reference config.mk file in source tree which is no longer
the current directory when using out of tree builds.
(From OE-Core rev: 32ba805e4ffbfcb17380ed6b5164e5b25a62f330)
Signed-off-by: Andrew Goodbody <andrew.goodbody@cambrionix.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch enabled out-of-tree builds for u-boot. This also helps building
u-boot using EXTERNALSRC flow
(From OE-Core rev: 36f110594506fbee5dc18de3a04981f019f2024d)
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When using UBOOT_CONFIG format, the final u-boot binary for each config
may have different names. Extend UBOOT_CONFIG format to support different
binary to be copied.
The new format is supposed to be compatible with old one as ${UBOOT_BINARY}
is copied by default, and images,binary can be empty.
An example format to specify it, in the machine, is:
UBOOT_CONFIG ??= "sdcard-ifc sdcard-qspi lpuart qspi secure-boot nor"
UBOOT_CONFIG[nor] = "ls1021atwr_nor_config,,u-boot-dtb.bin"
UBOOT_CONFIG[sdcard-ifc] = "ls1021atwr_sdcard_ifc_config,,u-boot-with-spl-pbl.bin"
UBOOT_CONFIG[sdcard-qspi] = "ls1021atwr_sdcard_qspi_config,,u-boot-with-spl-pbl.bin"
UBOOT_CONFIG[lpuart] = "ls1021atwr_nor_lpuart_config,,u-boot-dtb.bin"
UBOOT_CONFIG[qspi] = "ls1021atwr_qspi_config,,u-boot-dtb.bin"
UBOOT_CONFIG[secure-boot] = "ls1021atwr_nor_SECURE_BOOT_config"
(From OE-Core rev: 2a5c484f314ddc75cab5f0d01b0215d7fc405b6b)
Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use "-n" operation instead of comparing with an "x"-ed empty string,
use $(...) notation instead of the deprecated backticks.
(From OE-Core rev: b8436a9c470f1e27ff7fdd952b2743eaf97cadf8)
Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This introduces a new uboot-sign.class to support U-Boot verified boot.
This part delivers the new class file, with related environment variables, and
a new task intended to run before do_install task and which performs the
concatenation of the u-boot-nodtb.bin and the device tree blob. The 'cat'
command used overrides the u-boot.bin in both DEPLOYDIR & build dir to
propagate the changes in later tasks (do_install, do_package, etc.)
(From OE-Core rev: 27e21c50ada2f5fb6296cce680da4350a229977c)
Signed-off-by: Yannick Gicquel <yannick.gicquel@iot.bzh>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add support for the SPL_BINARY variable to handle sub directories. In
some cases the SPL binary that needs to be deployed is only built to the
spl/ directory in U-Boot. So that a sub directory can be specified in
the SPL_BINARY variable, handle the case so that the deploy code uses
the basename of the path specified in SPL_BINARY.
(From OE-Core rev: eb90d1c8fc7b82ca2593185930b3bf175f40ae13)
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The 2016.03 release has been announced in March 14th. This
incorporates a lot of bug fixes and improvements which are useful for
any new embedded development.
Along with the upgrade of U-Boot and its related recipes, this patch
also drops the AM335x environment fix which has been merged into the
release.
(From OE-Core rev: 15130f7bad0f0a1894c34bbb34a547722552c69e)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Beaglebone Black boot started failing after upstream patch 755324c432f, and was
fixed in 7205442e6. Unfortunately, the u-boot upgrade from 2015.10 to 2016.01
only includes the former patch. The latter patch is backported to fix this.
(From OE-Core rev: 68d02c54342c8146ec89dfeadedd733cb59fc7d8)
Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In some recipes overly-split -dbg packages were merged into PN-dbg. Unless
there's a very good reason, recipes should have a single -dev and -dbg package.
(From OE-Core rev: a3b000643898d7402b9e57c02e8d10e677cc9722)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
U-Boot will compile its own tools during the build, with specific
configurations (aka when CONFIG_FIT_SIGNATURE is enabled) the host tools
require openssl. This patch adds 'openssl' as a PACKAGECONFIG that
enables the use of openssl-native as a dependency and also adds the
HOSTCC flags that U-Boot uses when compiling the host tools.
(From OE-Core rev: 7d0edf5d04fba0b642bfb08a1de28fbc8e480209)
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add support for U-Boot recipes to install and deploy the generated ELF
files for each config. The U-Boot ELF's are useful for debugging, and
booting (directly booting, e.g. by JTAG or using QEMU) and complement
the generated binary image.
This additional feature is disabled by default, machines/etc that want
to use it need to set UBOOT_ELF to the corresponding ELF file (generally
u-boot or u-boot.elf depending on the architecture)
(From OE-Core rev: fae697dedf6ab04b7c123ea5615b1003a79c2422)
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
An additional use case of UBOOT_CONFIG is when a machine has applicability
to boards of the same architecture but different in other ways
to require a different UBOOT_BINARY build.
The UBOOT_CONFIG default value can be a list of these board types.
For example:
UBOOT_CONFIG ??= "boardA boardB"
UBOOT_CONFIG[boardA] = "boardA_defconfig"
UBOOT_CONFIG[boardB] = "boardB_defconfig"
Change do_install and do_deploy sections which process a UBOOT_CONFIG list
to create short symbolic links to each of the config types for UBOOT_BINARY.
This is similar to the links currently being created for
SPL_BINARY when it is defined with a UBOOT_CONFIG list.
For the above example, and UBOOT_BINARY as u-boot.bin,
the additional symbolic links created in the DEPLOYDIR would be
u-boot.bin-boardA
u-boot.bin-boardB
(From OE-Core rev: 12551f4ca214cfc2528b42da8574a6622228ce0b)
Signed-off-by: Lee Nipper <lee.nipper@linux.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This upgrades the U-Boot and its related recipes for the 2015.07
release.
The following recipes has been upgraded:
- u-boot
- u-boot-mkimage
- u-boot-fw-utils
The patches which were applied on top of the 2015.01 release are
dropped as those are not needed in this release.
The license checksum update was due minimal changes in the text, those
have no impact in the license terms.
(From OE-Core rev: 3157f8995e24f8a70492a261815be3a6fe51dcbd)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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 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>
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>
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>
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>
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>
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>
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>
* 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>
* 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>
* 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>
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>
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>
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>
* 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>
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>
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>
Peter Kjellerstedt
Joshua Lock
Marek Vasut
Fabio Berton
Andrew Goodbody
Manjukumar Matha
Ting Liu
Andrew Shadura
Yannick Gicquel
Nathan Rossi
Otavio Salvador
Erkka Kääriä
Ross Burton
Lee Nipper
Carlos Rafael Giani
Chunrong Guo
Denys Dmytriyenko
Andreas Müller
Ash Charles
Petter Mabäcker
Paul Eggleton
Chase Maupin
Franklin S. Cooper Jr
Martin Jansa
Matthew McClintock
Paul Gortmaker
Stefan Herbrechtsmeier
Frans Meulenbroeks