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>
The Kas container needs to use the entrypoint as that is where the user
changes from root to a normal user.
Also set the KUBERNETES_CPU_REQUEST to the variable CPU_REQUEST as this
needs to be tuned per-deployment.
CPU_REQUEST has no value outside of Arm Corp. Gitlab CI allows for
variables to be overridden by default. So, we can give it a default
value of NULL/empty and have everything work internally and externally
by default.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
zephyr-philosophers no longer fits within the defined SRAM space, and
fails to compile based on a check for this during building. Currently,
qemu-cortex-m0.yml inherits the targets from base.yml. So, we must
redefine the targets in qemu-cortex-m0.yml to be able to remove this.
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Install the Zephyr binaries to ${D}/firmware prior to copying them to
${DEPLOYDIR}.
Implementing do_install has three advantages:
* In use-cases when the Zephyr application is not the final artifact
(e.g. when signing or using additional firmware), other recipes can
pick up the Zephyr binary from the sysroot instead of
DEPLOY_DIR_IMAGE.
* It may sometimes make sense to install the binaries in a Linux
filesystem (e.g. to be run by a hypervisor).
* OE-core's QA checks run on the packaged binaries.
There are currently two QA checks that fail, so add these to INSANE_SKIP
for now.
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
At the moment:
* zephyr-image.inc depends on zephyr-sample.inc, which doesn't really
make sense.
* zephyr-image.inc inherits testimage, even though it may not be
required.
* Out-of-tree Zephyr apps have to include zephyr-sample.inc in order to
deploy the binaries, which is confusingly named if your application
isn't a "sample".
Do some minor refactoring to untangle the above. Now:
* zephyr-sample.inc depends on zephyr-image.inc
* zephyrtest.bbclass inherits testimage.
* Out-of-tree Zephyr apps can include zephyr-image.inc
Additionally, remove QEMU_BIN_PATH, as recent Zephyr versions now pick
up the QEMU binary automatically from PATH.
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
zephyr-openthread-rcp support was recently added to
nrf52840-mdk-usb-dongle and nrf52840dk-nrf52840. Add this to the
targets for both machines, which necessitates adding a target entry
for nrf52840-mdk-usb-dongle.
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Update the machines using cortex m4s to use the OE tune file, and remove
the duplicate one locally.
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Update the qemu-cortex-m3 machine to use the OE tune file, and remove
the duplicate one locally.
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Update the parameters being run in qemu to get more stable results.
Values taken from zephyr qemu. Also, use QB_GRAPHICS instead of
QB_OPT_APPEND for the relevant places.
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Make the changes necessary to get testimage working and run it as part
of CI
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
For a given release tag, ZEPHYR_MODULES is constant. It is therefore now
populated by the generate-version.py script, the output of which is
stored in the repository, so the build-time logic to populate
ZEPHYR_MODULES is no longer needed.
Remove the do_get_zmods task, but retain the Python dependencies which
are still required by Python scripts in the Zephyr repository that are
trigerred by CMake.
The above means that West is now only required as a host dependency to
run generate-version.py, so remove the West Yocto recipe.
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Tested-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
This commit uses the output of
meta-zephyr-core/scripts/generate-version.py for both the 2.7.3 and
3.1.0 versions.
Rename a patch for for v2.7.3 to match the filename expected by the
generated configuration.
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Tested-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Add a Python script which can be used to automatically generate
configuration for new Zephyr versions. This script:
* Takes the Zephyr version as a single argument
* Uses the Github API to find the version tag's SHA1
* Uses West as a library to parse the version's manifest file
* Uses a Jinja template to generate a .inc file for the version
* Outputs the .inc file directly into the zephyr-kernel directory
The generated .inc file includes:
* SRCREVs for all modules
* Separate SRC_URI_x variables for each module, to make it easier to
swap out a specific URL for a fork or mirror
* A version-specific SRC_URI, containing only the modules defined in
the release
* A list of the ZEPHYR_MODULES
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Tested-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
