zepto-mirrors/meta-zephyr
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-zephyr synced 2026-09-12 18:49:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

zephyr-kernel: add Zephyr RTOS version 2.2.0 support

Browse Source 
Release notes:
https://github.com/zephyrproject-rtos/zephyr/releases/tag/zephyr-v2.2.0

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
This commit is contained in:
Naveen Saini
2020-03-31 15:22:43 +08:00
parent a8d73dba49
commit 5d3bbae52d
3 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
classes/zephyr-kernel-src.bbclass
View File

@@ -1,13 +1,13 @@
#Set relevant variables based on Zephyr kernel version
PREFERRED_VERSION_zephyr-kernel ??= "2.0.0"
PREFERRED_VERSION_zephyr-kernel ??= "2.2.0"
SRCREV = "ca3eb0eb31d134be41aefc952f696f7d9c356b7a"
SRCREV = "d39cb42d0920d5658fad358ad5b91de75d747a20"
SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v2.0-branch \
SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v2.2-branch \
file://0001-cmake-add-yocto-toolchain.patch \
"
PV = "2.0.0"
PV = "2.2.0"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
@@ -15,7 +15,7 @@ ZEPHYR_TEST_SRCDIR = "tests/legacy/kernel/"
python () {
src_pn = d.getVar('PREFERRED_VERSION_zephyr-kernel', True)
if src_pn == '2.0.0':
if src_pn == '2.2.0':
return
else:
bb.error("Unsupported Zephyr kernel version requested")

23
recipes-kernel/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch
View File

@@ -1,37 +1,24 @@
From 7dffe6c78e6799a3dfd3910876b29645305a55db Mon Sep 17 00:00:00 2001
From 511745625637da0effca13c5489a392e15d32271 Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Tue, 19 Nov 2019 14:36:19 +0800
Date: Tue, 31 Mar 2020 13:22:17 +0800
Subject: [PATCH] cmake: add yocto toolchain
Upstream status: inappropriate [OE specific]
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
cmake/app/boilerplate.cmake | 1 +
cmake/compiler/gcc/target.cmake | 7 -------
cmake/toolchain/yocto/generic.cmake | 13 +++++++++++++
cmake/toolchain/yocto/target.cmake | 1 +
4 files changed, 15 insertions(+), 7 deletions(-)
3 files changed, 14 insertions(+), 7 deletions(-)
create mode 100644 cmake/toolchain/yocto/generic.cmake
create mode 100644 cmake/toolchain/yocto/target.cmake
diff --git a/cmake/app/boilerplate.cmake b/cmake/app/boilerplate.cmake
index b0920b1d95..2dceead6c0 100644
--- a/cmake/app/boilerplate.cmake
+++ b/cmake/app/boilerplate.cmake
@@ -441,6 +441,7 @@ else()
set(SOC_PATH ${SOC_FAMILY}/${SOC_SERIES})
endif()
+#include(${ZEPHYR_BASE}/cmake/toolchain-yocto.cmake)
include(${ZEPHYR_BASE}/cmake/target_toolchain.cmake)
set(KERNEL_NAME ${CONFIG_KERNEL_BIN_NAME})
diff --git a/cmake/compiler/gcc/target.cmake b/cmake/compiler/gcc/target.cmake
index accd4ff19f..1d4018f5e6 100644
index 401cc28db8..5a026f4559 100644
--- a/cmake/compiler/gcc/target.cmake
+++ b/cmake/compiler/gcc/target.cmake
@@ -85,13 +85,6 @@ if(NOT no_libgcc)
@@ -66,13 +66,6 @@ if(NOT no_libgcc)
OUTPUT_STRIP_TRAILING_WHITESPACE
)

8
recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.0.bb → recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.2.bb
View File

@@ -2,13 +2,13 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
# tag v2.0
SRCREV="ca3eb0eb31d134be41aefc952f696f7d9c356b7a"
SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v2.0-branch \
# tag v2.2
SRCREV="d39cb42d0920d5658fad358ad5b91de75d747a20"
SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v2.2-branch \
file://0001-cmake-add-yocto-toolchain.patch \
"
inherit cmake
PV = "2.0.0"
PV = "2.2.0"
S = "${WORKDIR}/git"
IMAGE_NO_MANIFEST = "1"