From: Peter Hoyes <Peter.Hoyes@...>
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@...>
---
.../0001-3.3-cmake-add-yocto-toolchain.patch | 63 -------------------
.../zephyr-kernel/zephyr-kernel-src-3.3.0.inc | 1 -
.../zephyr-kernel/zephyr-toolchain-yocto.inc | 16 -----
.../scripts/zephyr-kernel-src.inc.jinja | 1 -
4 files changed, 81 deletions(-)
delete mode 100644 meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0=
001-3.3-cmake-add-yocto-toolchain.patch
delete mode 100644 meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-=
toolchain-yocto.inc
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
deleted file mode 100644
index a16eabf..0000000
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-3.3-cmake-=
add-yocto-toolchain.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 39f1dd116d00b6c2135c4ccd216341dcd2f2917e Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@...>
-Date: Tue, 26 Jul 2022 14:12:18 +0200
-Subject: [PATCH] cmake: add yocto toolchain
-
-Upstream status: inappropriate [OE specific]
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@...>
----
- cmake/compiler/gcc/target.cmake | 7 -------
- cmake/toolchain/yocto/generic.cmake | 13 +++++++++++++
- cmake/toolchain/yocto/target.cmake | 1 +
- 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/compiler/gcc/target.cmake b/cmake/compiler/gcc/target=
.cmake
-index 014447e67e..b510f47d59 100644
---- a/cmake/compiler/gcc/target.cmake
-+++ b/cmake/compiler/gcc/target.cmake
-@@ -94,13 +94,6 @@ execute_process(
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
-=20
--assert_exists(LIBGCC_FILE_NAME)
--
--get_filename_component(LIBGCC_DIR ${LIBGCC_FILE_NAME} DIRECTORY)
--
--assert_exists(LIBGCC_DIR)
--
--LIST(APPEND LIB_INCLUDE_DIR "-L\"${LIBGCC_DIR}\"")
- LIST(APPEND TOOLCHAIN_LIBS gcc)
-=20
- # For CMake to be able to test if a compiler flag is supported by the
-diff --git a/cmake/toolchain/yocto/generic.cmake b/cmake/toolchain/yocto=
/generic.cmake
-new file mode 100644
-index 0000000000..45e5777e2a
---- /dev/null
-+++ b/cmake/toolchain/yocto/generic.cmake
-@@ -0,0 +1,13 @@
-+set(COMPILER gcc)
-+set(LINKER ld)
-+set(BINTOOLS gnu)
-+
-+set(ZEPHYR_SYSROOT ${ZEPHYR_SYSROOT})
-+set(SYSROOT_DIR ${ZEPHYR_SYSROOT})
-+set(LIBC_LIBRARY_DIR "\"${SYSROOT_DIR}\"/")
-+set(LIBC_INCLUDE_DIR ${SYSROOT_DIR}/include)
-+LIST(APPEND TOOLCHAIN_LIBS gcc)
-+
-+LIST(APPEND LIB_INCLUDE_DIR "-L\"${STAGING_LIBDIR}\"")
-+
-+set(TOOLCHAIN_LIBS gcc)
-diff --git a/cmake/toolchain/yocto/target.cmake b/cmake/toolchain/yocto/=
target.cmake
-new file mode 100644
-index 0000000000..9881313609
---- /dev/null
-+++ b/cmake/toolchain/yocto/target.cmake
-@@ -0,0 +1 @@
-+# SPDX-License-Identifier: Apache-2.0
---=20
-2.34.1
-
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-kern=
el-src-3.3.0.inc
index c7614a7..245ba81 100644
--- 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 ?=3D "git://github.com/zephyrp=
roject-rtos/zscilib;protocol=3D
SRC_URI_ZEPHYR_THRIFT ?=3D "git://github.com/zephyrproject-rtos/thrift;p=
rotocol=3Dhttps"
=20
SRC_URI_PATCHES ?=3D "\
- file://0001-3.3-cmake-add-yocto-toolchain.patch;patchdir=3Dzephyr \
file://0001-3.3-x86-fix-efi-binary-generation-issue-in-cross-compila=
.patch;patchdir=3Dzephyr \
"
=20
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-toolcha=
in-yocto.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-toolc=
hain-yocto.inc
deleted file mode 100644
index b167695..0000000
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-toolchain-yoct=
o.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-# Additional definitions to use the Yocto toolchain
-
-ZEPHYR_GCC_VARIANT=3D"yocto"
-ZEPHYR_SYSROOT=3D"${STAGING_DIR_TARGET}"
-CROSS_COMPILE =3D "${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}"
-
-EXTRA_OECMAKE:append =3D " \
- -DZEPHYR_GCC_VARIANT=3D${ZEPHYR_GCC_VARIANT} \
- -DCROSS_COMPILE=3D${CROSS_COMPILE} \
- -DZEPHYR_SYSROOT=3D${ZEPHYR_SYSROOT} \
- -DEXTRA_CPPFLAGS=3D${CPPFLAGS} \
- "
-
-OE_TERMINAL_EXPORTS +=3D "CROSS_COMPILE"
-OE_TERMINAL_EXPORTS +=3D "ZEPHYR_SYSROOT"
-OE_TERMINAL_EXPORTS +=3D "ZEPHYR_GCC_VARIANT"
diff --git a/meta-zephyr-core/scripts/zephyr-kernel-src.inc.jinja b/meta-=
zephyr-core/scripts/zephyr-kernel-src.inc.jinja
index 1723b88..a2d2232 100644
--- 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 }} ?=3D "{=
{ project.url | git_url_to_
{%- endfor %}
=20
SRC_URI_PATCHES ?=3D "\
- file://0001-{{ short_version }}-cmake-add-yocto-toolchain.patch;patc=
hdir=3Dzephyr \
file://0001-{{ short_version }}-x86-fix-efi-binary-generation-issue-=
in-cross-compila.patch;patchdir=3Dzephyr \
"
=20
--=20
2.34.1
