Commit Graph

323 Commits

Author SHA1 Message Date
Naveen Saini
51d1063859 intel-x86-64.conf: add intel_ prefix to x86 board names
Use newly added naming convention (intel_).

03905f7e55
2b757f1eca

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Tested-by: Jon Mason <jon.mason@arm.com>
2023-11-06 09:51:48 +08:00
Naveen Saini
62b6d7e43b zephyr-sdk: Upgrade to version 0.16.3
https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.16.3

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Tested-by: Jon Mason <jon.mason@arm.com>
2023-11-06 09:51:48 +08:00
Naveen Saini
af3fa206c8 zephyr-kernel: Drop support for v3.4.0
v3.5.0 is available, now drop support for old version.

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Tested-by: Jon Mason <jon.mason@arm.com>
2023-11-06 09:51:48 +08:00
Naveen Saini
8bc1b8e811 zephyr-kernel: Add support for v3.5.0
https://github.com/zephyrproject-rtos/zephyr/releases/tag/v3.5.0

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Tested-by: Jon Mason <jon.mason@arm.com>
2023-11-06 09:51:48 +08:00
Jon Mason
39cbc2eec9 zephyr-core/zephyr-kernel-tests: remove now passing tests from exclude list
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>
2023-11-06 09:42:52 +08:00
Jon Mason
11c2ab756f CI: Update to the latest kas version
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2023-11-06 09:42:39 +08:00
Naveen Saini
fa76b75bd6 layer.conf: update LAYERSERIES_COMPAT to use nanbield
Drop langdale and mickledore.

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2023-09-13 10:32:11 +08:00
Naveen Saini
a29a29f32a zephyr-sdk: Upgrade to version 0.16.1
https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.16.1

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Tested-by: Jon Mason <jon.mason@arm.com>
2023-06-26 10:15:14 +08:00
Naveen Saini
5af99cadbf zephyr-kernel: Drop support for v3.3.0
v3.4.0 is available, now drop support for old version.

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Tested-by: Jon Mason <jon.mason@arm.com>
2023-06-26 10:15:14 +08:00
Naveen Saini
1b0236a573 zephyr-kernel: Add support for v3.4.0
https://github.com/zephyrproject-rtos/zephyr/releases/tag/v3.4.0

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Tested-by: Jon Mason <jon.mason@arm.com>
2023-06-26 10:15:14 +08:00
Naveen Saini
00ae4c13c0 zephyr-kernel-src-3.3.0: fix build with gcc-13
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>
2023-05-31 13:50:16 +08:00
Tan Wen Yan
953fbe1238 zephyr-core/zephyr.bbclass: Fix do_menuconfig
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>
2023-05-31 13:50:03 +08:00
Naveen Saini
b0173e045c zephyr-kernel: Include efi binary generation fix for Raptor Lake too
Extend patch to include efi binary generation issue fix
for x86 Raptor Lake board too.

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2023-05-15 11:00:25 +08:00
Peter Hoyes
5fde315017 zephyr-core/zephyr-kernel: Fix arm32 binutils 2.40 incompatibility
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>
2023-04-20 15:02:55 +08:00
Peter Hoyes
ffd9279d0d zephyr-core/zephyr-kernel: Use SHA for zcbor module
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>
2023-04-20 15:02:55 +08:00
Peter Hoyes
81babac06d zephyr-core/scripts: Resolve West revisions to SHAs
The West manifest in  Zephyr 3.3 contains a tag (instead of a SHA) for
zcbor [1]. OE standard practice is to always specifiy revisions using
SHAs, so in the Jinja template, use the new resolve_revision filter to
resolve any tags.

[1] https://github.com/zephyrproject-rtos/zephyr/pull/51219#discussion_r998123145

Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2023-04-20 15:02:55 +08:00
Peter Hoyes
0a05d27d14 zephyr-core/scripts: Resolve Zephyr tag using git ls-remote
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>
2023-04-20 15:02:55 +08:00
Peter Hoyes
6ead6ee94c CI: Update Kas version to 3.2.3
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2023-04-20 15:02:55 +08:00
Peter Hoyes
d075b06ade zephyr-core/zephyr-kernel: Remove the downstream "yocto" toolchain
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>
2023-02-24 16:24:35 +08:00
Peter Hoyes
871979b4d1 zephyr-core/zephyr-kernel: Use the upstream "cross-compile" toolchain
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>
2023-02-24 16:24:35 +08:00
Peter Hoyes
c2d10c62c7 zephyr-sdk: Upgrade to version 0.15.2
https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.15.2

Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2023-02-23 17:11:16 +08:00
Peter Hoyes
50c97ab5c6 zephyr-kernel: Drop support for v3.1.0 and v3.2.0
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>
2023-02-23 17:11:16 +08:00
Peter Hoyes
6d3072540c zephyr-kernel: Add support for v3.3.0
https://github.com/zephyrproject-rtos/zephyr/releases/tag/v3.3.0

Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2023-02-23 17:11:16 +08:00
Jon Mason
a63dfe0aac zephyr-bsp/v2m-beetle: add support
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2023-02-14 15:51:06 +08:00
Ross Burton
793a4b339c CI: pin to kas 3.2 as 3.2.1 fails
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>
2023-02-14 15:51:05 +08:00
Peter Hoyes
1312cb2a19 zephyr-core/zephyr-kernel: Add ZEPHYR namespace to SRC_URI variables
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>
2023-01-26 16:45:44 +08:00
Naveen Saini
174c3187a7 layer.conf: update LAYERSERIES_COMPAT for mickledore
oe-core switched to mickedore in:
https://git.openembedded.org/openembedded-core/commit/?id=57239d66b933c4313cf331d35d13ec2d0661c38f

Drop support for old releases.

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2023-01-05 10:12:12 +08:00
Naveen Saini
226b88118b zephyr-kernel/3.1: update to latest commit
Recent commits have CVE-2022-2741 fixed.

Also backported CVE-2022-2993 fix.

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2022-12-21 09:54:36 +08:00
Peter Hoyes
e989f89265 zephyr-core: Add addpylib declaration
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>
2022-12-19 17:29:57 +08:00
Peter Hoyes
c91fda796b zephyr-core/zephyr-kernel: Inhibit packaging steps with the Zephyr SDK
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>
2022-12-19 17:29:57 +08:00
Peter Hoyes
63a8fdc41c zephyr-core/zephyr-kernel: Use layer-relative require for version file
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>
2022-12-19 17:29:57 +08:00
Peter Hoyes
64e1fbbaa9 CI: add tags to all jobs
Tag all jobs with the DEFAULT_TAG variable so each instance can control
what tags the jobs have.

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>
2022-12-19 17:29:57 +08:00
Peter Hoyes
c4458d6534 CI: Add variables needed for k8s runners
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>
2022-12-19 17:29:57 +08:00
Jon Mason
c2b0f9d0ca CI/qemu-cortex-m0: remove zephyr-philosophers test
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>
2022-11-14 18:01:00 +08:00
Naveen Saini
ac53222255 newlib: add bbappend
Build newlib library to be thread-safe in multithreaded environment.

https://github.com/zephyrproject-rtos/zephyr/pull/21518
https://github.com/zephyrproject-rtos/zephyr/issues/21519
https://github.com/zephyrproject-rtos/zephyr/pull/36201

https://sourceware.org/legacy-ml/newlib/2016/msg01165.html
https://sourceware.org/git/?p=newlib-cygwin.git;a=commit;h=bd54749095ee45d7136b6e7c8a1e5218749c87b6

Error log:
newlib/libc-hooks.c:310:1: note: in expansion of macro 'BUILD_ASSERT'
BUILD_ASSERT(IS_ENABLED(_RETARGETABLE_LOCKING), "Retargetable locking must be enabled");

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Tested-by: Jon Mason <jon.mason@arm.com>
2022-11-14 18:01:00 +08:00
Naveen Saini
b917a0f551 arc: drop obsolete recipes and bbappends
Remove recipes and bbappends which are not being used.

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Tested-by: Jon Mason <jon.mason@arm.com>
2022-11-14 18:01:00 +08:00
Naveen Saini
6caaebea63 zephyr-sdk: upgrade 0.14.2 -> 0.15.1
https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.15.1

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Tested-by: Jon Mason <jon.mason@arm.com>
2022-11-14 18:00:59 +08:00
Naveen Saini
ad2b13ccb5 zephyr-kernel-src: drop support for v2.7.3
Support for zephyr v3.2.0 is already being added. So time to drop it.

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Tested-by: Jon Mason <jon.mason@arm.com>
2022-11-14 18:00:59 +08:00
Naveen Saini
fae74ca74d zephyr-kernel-src: add support for v3.2.0
https://github.com/zephyrproject-rtos/zephyr/releases/tag/v3.2.0

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Tested-by: Jon Mason <jon.mason@arm.com>
2022-11-14 18:00:59 +08:00
Jon Mason
030c1e2d89 zephyr-bsp: add support for v2m-musca-s1
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2022-10-11 14:55:32 +08:00
Jon Mason
a3dda6da2d zephyr-bsp: add support for v2m-musca-b1
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2022-10-11 14:55:32 +08:00
Jon Mason
68424901c6 zephyr-bsp: add support for mps3-an547
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2022-10-11 14:55:32 +08:00
Jon Mason
8511091467 zephyr-bsp: add support for mps2-an521
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2022-10-11 14:55:32 +08:00
Jon Mason
dc18d0ba26 zephyr-bsp: add support for mps2-an385
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2022-10-11 14:55:32 +08:00
Jon Mason
eba9a96732 zephyr-bsp: add support for qemu-cortex-a9
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2022-10-11 14:55:32 +08:00
Peter Hoyes
775f6de08a zephyr-core/zephyr-kernel: Implement do_install
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>
2022-10-04 10:23:08 +08:00
Peter Hoyes
6cf57189bf zephyr-core/zephyr-kernel: Refactor zephyr-image and zephyr-sample
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>
2022-10-04 10:23:08 +08:00
Peter Hoyes
7d2cd41521 zephyr-core/qemu: Remove bbappend
This looks historical and is no longer required for the tested builds.

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>
2022-10-04 10:23:08 +08:00
Jon Mason
5611bbb46a layers: add langdale compatibility
Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2022-10-04 10:23:08 +08:00
Jon Mason
315109f967 ci: add zephyr-openthread-rcp test
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>
2022-10-04 10:23:08 +08:00