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 <[email protected]> Signed-off-by: Naveen Saini <[email protected]>
saininav · Feb 24, 2023 · 74fa040 · 74fa040
1 parent 155bf06
commit 74fa040
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 81 deletions.
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-3.3-cmake-add-yocto-toolchain.patch b/meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-3.3-cmake-add-yocto-toolchain.patch
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.3.0.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.3.0.inc
@@ -115,7 +115,6 @@ SRC_URI_ZEPHYR_ZSCILIB ?= "git://github.com/zephyrproject-rtos/zscilib;protocol=
 SRC_URI_ZEPHYR_THRIFT ?= "git://github.com/zephyrproject-rtos/thrift;protocol=https"
 
 SRC_URI_PATCHES ?= "\
-    file://0001-3.3-cmake-add-yocto-toolchain.patch;patchdir=zephyr \
     file://0001-3.3-x86-fix-efi-binary-generation-issue-in-cross-compila.patch;patchdir=zephyr \
 "
 

diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-toolchain-yocto.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-toolchain-yocto.inc
diff --git a/meta-zephyr-core/scripts/zephyr-kernel-src.inc.jinja b/meta-zephyr-core/scripts/zephyr-kernel-src.inc.jinja
@@ -13,7 +13,6 @@ SRC_URI_ZEPHYR_{{ project.name | bitbake_var }} ?= "{{ project.url | git_url_to_
 {%- endfor %}
 
 SRC_URI_PATCHES ?= "\
-    file://0001-{{ short_version }}-cmake-add-yocto-toolchain.patch;patchdir=zephyr \
     file://0001-{{ short_version }}-x86-fix-efi-binary-generation-issue-in-cross-compila.patch;patchdir=zephyr \
 "