layer.conf: update LAYERSERIES_COMPAT to dunfell
PATCH 1/5 layer.conf: update LAYERSERIES_COMPAT to dunfell
Signed-off-by Naveen Saini <[email protected]>
--- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
conf/layer.conf +1 -1
@@ -15,4 +15,4 @@ LAYERVERSION_zephyr = "1" LAYERDEPENDS_zephyr = "core" -LAYERSERIES_COMPAT_zephyr = "warrior zeus" +LAYERSERIES_COMPAT_zephyr = "dunfell"
Signature · 1 line
2.17.1
PATCH 2/5 qemu: update recipe version
Signed-off-by Naveen Saini <[email protected]>
---
.../qemu/{qemu_4.1.%.bbappend => qemu_4.2.%.bbappend} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename recipes-devtools/qemu/{qemu_4.1.%.bbappend => qemu_4.2.%.bbappend} (100%)recipes-devtools/qemu/qemu_4.2.%.bbappend renamed from recipes-devtools/qemu/qemu_4.1.%.bbappend +0 -0
Signature · 1 line
2.17.1
PATCH 3/5 zephyr-kernel: add Zephyr RTOS version 2.2.0 support
In reply to Naveen SainiRelease notes:
https://github.com/zephyrproject-rtos/zephyr/releases/tag/zephyr-v2.2.0
Signed-off-by Naveen Saini <[email protected]>
---
classes/zephyr-kernel-src.bbclass | 10 ++++----
.../0001-cmake-add-yocto-toolchain.patch | 23 ++++---------------
...el-src_2.0.bb => zephyr-kernel-src_2.2.bb} | 8 +++----
3 files changed, 14 insertions(+), 27 deletions(-)
rename recipes-kernel/zephyr-kernel/{zephyr-kernel-src_2.0.bb => zephyr-kernel-src_2.2.bb} (84%)classes/zephyr-kernel-src.bbclass +5 -5
@@ -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")
recipes-kernel/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch +5 -18
@@ -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 <[email protected]> -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 <[email protected]> --- - 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 )
recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.2.bb renamed from recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.0.bb +4 -4
@@ -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"
Signature · 1 line
2.17.1
PATCH 4/5 zephyr-kernel-test.inc: remove 'boot_page_table' kernel test
In reply to Naveen Saini'boot_page_table' moved from kernel tests.
Signed-off-by Naveen Saini <[email protected]>
--- recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc | 1 - 1 file changed, 1 deletion(-)
recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc +0 -1
@@ -21,7 +21,6 @@ ZEPHYRTESTS_remove = "gen_isr_table spinlock smp mp" # List of all available kernel tests ZEPHYRTESTS = " \ - boot_page_table \ common \ context \ critical \
Signature · 1 line
2.17.1
PATCH 5/5 newlib: instead of carry locally use from oe-core
In reply to Naveen SainiDrop local newlib recipe and use it from oe-core
TODO: enable arc support
Signed-off-by Naveen Saini <[email protected]>
---
conf/distro/zephyr.conf | 3 +
.../newlib/newlib/assert-fiprintf.patch | 23 -
.../newlib/gettimeofday-header-fix.patch | 20 -
.../newlib/newlib/iamcu-commit-5d3ad3b.patch | 399 ------------------
...{newlib_2.%.bbappend => newlib_%.bbappend} | 1 -
recipes-core/newlib/newlib_2.%.bb | 83 ----
6 files changed, 3 insertions(+), 526 deletions(-)
delete mode 100644 recipes-core/newlib/newlib/assert-fiprintf.patch
delete mode 100644 recipes-core/newlib/newlib/gettimeofday-header-fix.patch
delete mode 100644 recipes-core/newlib/newlib/iamcu-commit-5d3ad3b.patch
rename recipes-core/newlib/{newlib_2.%.bbappend => newlib_%.bbappend} (95%)
delete mode 100644 recipes-core/newlib/newlib_2.%.bbconf/distro/zephyr.conf +3 -0
@@ -11,6 +11,9 @@ TCLIBCAPPEND = "" TEST_TARGET = "QemuTargetZephyr" TEST_SUITES = "zephyr" +PREFERRED_PROVIDER_virtual/libc = "newlib" +PREFERRED_PROVIDER_virtual/libiconv = "newlib" + TOOLCHAIN_TARGET_TASK += " newlib" INHERIT += "siteinfo-zephyr"
recipes-core/newlib/newlib/assert-fiprintf.patch deleted +0 -23
@@ -1,23 +0,0 @@ - -Fix unresolved external "fiprintf". -When newlib is configured with: - - --enable-newlib-nano-formatted-io - -"fiprintf" should be an alias of "fprintf". However the alias does -not seem to work properly, as we encounter unresolved external -error if we uses "assert" in code. So we patch the code directly. - -Signed-off-by: Juro Bystricky <[email protected]> - ---- a/newlib/libc/stdlib/assert.c 2016-11-08 08:04:45.669248139 -0800 -+++ b/newlib/libc/stdlib/assert.c 2016-11-08 08:05:47.357554034 -0800 -@@ -56,7 +56,7 @@ - const char *func _AND - const char *failedexpr) - { -- fiprintf(stderr, -+ fprintf(stderr, - "assertion \"%s\" failed: file \"%s\", line %d%s%s\n", - failedexpr, file, line, - func ? ", function: " : "", func ? func : "");
recipes-core/newlib/newlib/gettimeofday-header-fix.patch deleted +0 -20
@@ -1,20 +0,0 @@ - -newlib-2.4.0 regression. -Export the prototype of gettimeofday - -Signed-off-by: Juro Bystricky <[email protected]> - ---- a/newlib/libc/include/sys/time.h 2016-03-29 14:33:42.000000000 -0700 -+++ b/newlib/libc/include/sys/time.h 2016-10-12 09:48:03.873642589 -0700 -@@ -429,9 +429,10 @@ - int _EXFUN(getitimer, (int __which, struct itimerval *__value)); - int _EXFUN(setitimer, (int __which, const struct itimerval *__restrict __value, - struct itimerval *__restrict __ovalue)); -+#endif -+ - int _EXFUN(gettimeofday, (struct timeval *__restrict __p, - void *__restrict __tz)); --#endif - - #if __GNU_VISIBLE - int _EXFUN(futimesat, (int, const char *, const struct timeval [2]));
recipes-core/newlib/newlib/iamcu-commit-5d3ad3b.patch deleted +0 -399
399 lines not on this page · raw message
recipes-core/newlib/newlib_%.bbappend renamed from recipes-core/newlib/newlib_2.%.bbappend +0 -1
@@ -14,7 +14,6 @@ LIC_FILES_CHKSUM_arc = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ #Tag arc-2016.03 SRCREV_arc = "e4da0f88abe8dd2a0b947bcf7cb8b3736ab94f33" SRC_URI_arc = "git://github.com/foss-for-synopsys-dwc-arc-processors/newlib.git;branch=arc-2.3" -SRC_URI_arc += "file://assert-fiprintf.patch" S_arc = "${WORKDIR}/git" # ERROR: QA Issue: Architecture did not match (195 to 93)
recipes-core/newlib/newlib_2.%.bb deleted +0 -83
83 lines not on this page · raw message
Signature · 1 line
2.17.1