Currently the work dir generated by the zephyr toolchain is incorrect
Setting it to correctly reflect the arch and zephyr stage
Signed-off-by: Ben Cownley <ben.cownley@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
meta-zephyr current passes an ARCH variable to the CMake build
It's widely believed this is no longer necessary as it is
inferred from the BOARD variable
Signed-off-by: Ben Cownley <ben.cownley@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
In the previous design, it only deployed zephyr.elf,
zephyr.bin and zephyr.efi.
If users want to deploy their customize images, they should update do_install task.
Add to check "ZEPHYR_MAKE_OUTPUT" to deploy users customize images and zephyr images.
Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Include fix for generating efi binary file for the up_squared board, which
was missed in v3.5 upgrade.
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Retested the zephyr kernel tests to verify which ones are now building
and which ones are now passing CI on qemu machines. They are organized
as follows:
* Any test that fails to be configured is added to a list in
zephyr-kernel-test.inc
* Any test that fails to compile for all machines is added to a list in
zephyr-kernel-test.inc
* Any test that fails to compile for a specific machine is added to a
machine specific list in zephyr-kernel-test.inc
* Any test that fails CI is added to a list in the relevant machine yml
file
Hopefully by making this way of doing things uniform, it will enable
better testing and CI.
It is worth noting that with this version of zephyr, gen_isr_table and
other tests are now working for a number of machines.
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Configuration error:
| -- Configuring done (4.9s)
| CMake Error in CMakeLists.txt:
| Target "zephyr_interface" contains relative path in its
| INTERFACE_INCLUDE_DIRECTORIES:
|
| "include-fixed"
With GCC-13, limits.h and syslimits.h header files
are always being installed to include folder.
https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=be9dd80f933480
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Update do_menuconfig to run ninja menuconfig as the default
CMake generator is ninja.
Also fix directory path for .config.
[YOCTO #15040]
Signed-off-by: Tan Wen Yan <wen.yan.tan@intel.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Armv7 boards are currently failing with binutils 2.40 if certain
statements are combined on the same line without a semicolon. Introduce
a patch to fix this by inserting a semicolon.
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Re-run the generate-version.py script for 3.3.0 to convert the tag for
zcbor to a SHA.
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
To simplify the logic to resolve Git tags to SHAs, and so that it works
with non-Github repositories, use git ls-remote instead of the Github
API.
Make the resolve_revision function available as a Jinja filter and move
the version resolution to the template.
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
The "yocto" toolchain requires a downstream patch to be carried and
maintained. The upstream "cross-compile" toolchain is equivalent so this
is no longer needed.
Remove the toolchain-specific inc file and the downstream patch.
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Zephyr upstream contains CMake configuration for a "cross-compile"
toolchain for "other cross compilers" which works with the Yocto-built
toolchain out-of-the-box, so use this instead of the "yocto" toolchain,
which requires a downstream patch to be carried.
The Yocto-built toolchain does not support --print-sysroot so that
toolchains can be shared between multiple builds with different
sysroots, so manually set SYSROOT_DIR to the staging directory.
Use the "cross-compile" toolchain by default.
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Now that v3.3.0 is available, drop support for previous versions.
Rename the downstream patches and drop the backport.
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
For some reason the kas 3.2.1 container fails:
No such file or directory: '/builds/engineering/yocto/meta-zephyr/ci/ci/base.yml'
Note the repeated /ci/, which is wrong.
Pin the kas container to 3.2 for now until this is resolved.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Certain SRC_URI_* variables may collide with other recipes, e.g.
SRC_URI_TRUSTED_FIRMWARE_A. Namespace these variables under
SRC_URI_ZEPHYR so that the SRC_URIs of Zephyr modules can be
independently tweaked from local.conf or the environment.
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
OE-core 4901c9d471cab99d52876842980222ce271b66e4 "base: Switch to use
addpylib directive and BB_GLOBAL_PYMODULES" means that ${LAYERDIR}/lib
is no longer searched by default when loading test controllers.
meta-zephyr-core defines some custom test controllers for testing FVPs,
so add an addpylib directive to meta-zephyr-core/conf/layer.conf to fix
testimage.
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
The packaging step includes post-processing of elf files using objcopy
and strip from the Yocto toolchain. When using the Zephyr SDK, the Yocto
toolchain is explicitly not built so it is not possible to run these
steps. Therefore, inhibit them in zephyr-toolchain-zephyr.inc
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
The inclusion of the Zephyr version-specific .inc file is currently
using a local include. Change to be layer-relative to support including
files in other layers.
Change to use 'require' instead of 'include' so that an earlier error is
printed if the file does not exist.
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
