As v2.7.0 is being added, drop this version support Signed-off-by: Naveen Saini <naveen.kumar.sa...@intel.com> --- ...phyr-2.5.0-cmake-add-yocto-toolchain.patch | 63 ------------------- .../zephyr-kernel/zephyr-kernel-src-2.5.0.inc | 17 ----- 2 files changed, 80 deletions(-) delete mode 100644 recipes-kernel/zephyr-kernel/files/0001-zephyr-2.5.0-cmake-add-yocto-toolchain.patch delete mode 100644 recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.5.0.inc
diff --git a/recipes-kernel/zephyr-kernel/files/0001-zephyr-2.5.0-cmake-add-yocto-toolchain.patch b/recipes-kernel/zephyr-kernel/files/0001-zephyr-2.5.0-cmake-add-yocto-toolchain.patch deleted file mode 100644 index caab16f..0000000 --- a/recipes-kernel/zephyr-kernel/files/0001-zephyr-2.5.0-cmake-add-yocto-toolchain.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 511745625637da0effca13c5489a392e15d32271 Mon Sep 17 00:00:00 2001 -From: Naveen Saini <naveen.kumar.sa...@intel.com> -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.sa...@intel.com> ---- - 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 401cc28db8..5a026f4559 100644 ---- a/cmake/compiler/gcc/target.cmake -+++ b/cmake/compiler/gcc/target.cmake -@@ -66,13 +66,6 @@ if(NOT no_libgcc) - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - -- 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) - endif() - -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 --- -2.17.1 - diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.5.0.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.5.0.inc deleted file mode 100644 index be75362..0000000 --- a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.5.0.inc +++ /dev/null @@ -1,17 +0,0 @@ -SRCREV_FORMAT = "default_cmsis" -SRCREV_default = "fe7c2efca800a0cf1bccf23aefe08b3c4beb88bf" -SRCREV_cmsis = "c3bd2094f92d574377f7af2aec147ae181aa5f8e" -SRCREV_nordic = "f3434da6446380fcdd426dbe2866af21d0d549b6" -SRCREV_stm32 = "cc8731dba4fd9c57d7fe8ea6149828b89c2bd635" -SRCREV_open-amp = "de1b85a13032a2de1d8b6695ae5f800b613e739d" -SRCREV_openthread = "385e19da1ae15f27872c2543b97276a42f102ead" -SRCREV_libmetal = "9d4ee2c3cfd5f49861939447990f3b7d7bf9bf94" -SRCREV_tinycrypt = "3e9a49d2672ec01435ffbf0d788db6d95ef28de0" -SRCREV_mbedtls = "24d84ecff195fb15c889d9046e44e4804d626c67" - -ZEPHYR_BRANCH = "main" -PV = "2.5.0+git${SRCPV}" - -SRC_URI:append = " file://0001-zephyr-2.5.0-cmake-add-yocto-toolchain.patch \ - file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \ - " -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#55017): https://lists.yoctoproject.org/g/yocto/message/55017 Mute This Topic: https://lists.yoctoproject.org/mt/86232347/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-