If building for nativesdk the wrong rss sysroot is used leading the
following error message.
| ERROR: oe_runmake failed
| In file included from tools/imximage.c:13:0:
| include/image.h:1024:27: fatal error: openssl/evp.h: No such file or directory
| # include <openssl/evp.h>
Tools needed on the build host (script/basic/fixdep) and code compiled
for the SDK machine are both built with the build host's compiler,
leading to additinal errors.
Adding CROSS_COMPILE="${HOST_PREFIX}" and using the cross-compiler for
the SDK_ARCH fixes the build error.
The resulting binary in the SDK is working.
(From OE-Core rev: aab5311f3ad9fb9f9e26b18b5fe5e54d8ec14798)
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
After discussions with upstream this version of the patch was proposed
and is being submitted to upstream u-boot. Update to that version
(which is better than my workaround).
(From OE-Core rev: 048af2455aa65b25fd74bfe0e6d3a0af7562b42f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There was a race condition in the uboot-extlinux bbclass where
only a half written extlinux.conf would be put in the deploy
directory. Fix this by adding the deploy task after the do_install
rather than after the do_compile.
(From OE-Core rev: 60c90398580998b2379bb438f0f75b29285135a5)
Signed-off-by: Jack Mitchell <jack@embed.me.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
OE needs to be able to change the default compiler. If we pass in HOSTCC
through the make command, it overwrites not only this setting but also the
setting in tools/Makefile wrapped in ifneq ($(CROSS_BUILD_TOOLS),) which
breaks the build.
We therefore add a way of changing the default in the top level Makefile
without interfering with the other setting.
I've emailed this workaround to Masahiro Yamada for discussion.
(From OE-Core rev: e777d6873ce9a8a80288ecbcfc86239e0ed0e2f9)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Only ever change the CMD_LICENSE in the u-boot config if it is enabled
to prevent corruption of the config file. In case the CMD_LICENSE was
already disabled, the sed substitution inserted another "# " in front
of the CMD_LICENSE which triggered a restart of Kconfig oldconfig and
failed the build.
(From OE-Core rev: f7d4375146af22c72e2bdc9426329cd37f610a47)
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>
Upgrade U-Boot to the latest version.
(From OE-Core rev: d151d86d18127ae63be3cddde605e7953bd812d9)
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>
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>
Upgrade U-Boot to the latest version.
(From OE-Core rev: 34f1d3824fd45cd0bb28b3cbc33907cfd885f841)
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Denys Dmytriyenko <denis@denix.org>
Cc: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The build failed in multiple configurations. First, the native and
nativesdk was using the host compiler and was pulling host libraries
into the build. Second, the target configuration was attempting to
execute tools/bin2header tool on host, which is compiled for target,
to generate license header file that is not used by tools.
This patch changes the EXTRA_OEMAKE to address these issues, to build
both native and target builds with the correct compilers and correct
sysroots. Moreover, this patch removes the CONFIG_CMD_LICENSE from
tools build, thus disabling the execution of target tools/bin2header.
(From OE-Core rev: c2980c1d2fe127d56d4c1b797df5a1047d0e2db0)
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: 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>
Upgrade U-Boot to latest version and drop upstreamed patches.
(From OE-Core rev: fd0a8923638217dfa0a61ee63f2013229429808c)
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Ross Burton <ross.burton@intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
The U-Boot 2015.10 has been released at October 20th 2015. This also
removes the GCC workaround, for the inline behavior, as this version
properlu supports the GCC 5.2 as compiler.
(From OE-Core rev: aebd1a87bbf960e69301bd29137aabb5dfab05fc)
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>
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>
The gcc 5 change its default standard from gnu89 to gnu11. These two
standards do have different semantics for inline functions. And the
gcc 5 will emit the following errors on the "extern inline" functions:
arch/powerpc/cpu/mpc8xxx/fsl_lbc.o: In function `ld_le16':
./arch/powerpc/include/asm/byteorder.h:12: multiple definition of `ld_le16'
arch/powerpc/cpu/mpc8xxx/fdt.o:./arch/powerpc/include/asm/byteorder.h:12: first defined here
Fix these build errors by using "-fgnu89-inline" to enforce the gnu89
inline semantics as suggested in [1].
[1] https://gcc.gnu.org/gcc-5/porting_to.html
(From OE-Core rev: a1c83bb5556837d31d934b9af130cdbac19d5e97)
Signed-off-by: Kevin Hao <kexin.hao@windriver.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>
Add a patch based on one from Zhenhua Luo <zhenhua.luo@freescale.com>
in the meta-fsl-ppc layer to avoid build failures for u-boot with the
mpc8315e-rdb machine with binutils 2.25.
(From OE-Core rev: 81449a31b57ecda52ef8741f59afc26b4d4022e9)
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>
(From OE-Core rev: c1e5fff3017860feb5fb77ba05afd13e1ec34c50)
Signed-off-by: Maxin B. John <maxin.john@enea.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: 1a2b67c44b78582668d69e23f7f43835b34fe803)
Signed-off-by: Maxin B. John <maxin.john@enea.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This merges the u-boot-fw-utils-cross into the main u-boot-fw-utils
recipe and fixes the build failure seen since 2014.07 update.
The cross package now is handled using an extended class instead of a
duplicated recipe.
(From OE-Core rev: e9e0235f64250614c79f1749843f5559be32fefd)
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>
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>
Fixed:
make: *** No rule to make target `/path/to/sysroot/4.9.0/include/stddef.h', needed by `crc32.o'. Stop.
make: *** Waiting for unfinished jobs....
ERROR: oe_runmake failed
This happens when upgrade gcc from 4.9.0 to 4.9.1, and the .depend isn't
regenerated when recompile, the content of it are:
[snip]
crc32.o: /path/to/sysroot/4.9.0/include/stddef.h
[snip]
And Makefile includes the .depend file if it exists, so there would be
errors when /path/to/sysroot/4.9.0/include/stddef.h doesn't exist.
Remove .*.d (a few .d files, its Makefile uses this wildcard) will fix
the problem.
(From OE-Core rev: b31dd7d1fbdd9165872a31c11c6627549609fcb3)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The on-target fw_printenv and fw_setenv needs configuration file
(fw_env.config) to be present in the target.
(From OE-Core rev: b4cd268cf7506a521d7800112cb775bd49e1ef09)
Signed-off-by: Maxin B. John <maxin.john@enea.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>
Max Krummenacher
Philip Balister
Denys Dmytriyenko
Richard Purdie
Jack Mitchell
Marek Vasut
Peter Kjellerstedt
Joshua Lock
Fabio Berton
Andrew Goodbody
Manjukumar Matha
Ting Liu
Andrew Shadura
Yannick Gicquel
Nathan Rossi
Otavio Salvador
Erkka Kääriä
Ross Burton
Lee Nipper
Kevin Hao
Khem Raj
Carlos Rafael Giani
Chunrong Guo
Maxin B. John
Andreas Müller
Robert Yang
Ash Charles
Petter Mabäcker