diff options
Diffstat (limited to 'recipes-kernel/zephyr-kernel/files')
| -rw-r--r-- | recipes-kernel/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch | 24 | ||||
| -rw-r--r-- | recipes-kernel/zephyr-kernel/files/0001-zephyr-2.5.0-cmake-add-yocto-toolchain.patch | 63 |
2 files changed, 75 insertions, 12 deletions
diff --git a/recipes-kernel/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch b/recipes-kernel/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch index caab16f..563af7d 100644 --- a/recipes-kernel/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch +++ b/recipes-kernel/zephyr-kernel/files/0001-cmake-add-yocto-toolchain.patch @@ -1,6 +1,6 @@ -From 511745625637da0effca13c5489a392e15d32271 Mon Sep 17 00:00:00 2001 +From bfab268c870548e3e7a24ea67ebed2a0513b2307 Mon Sep 17 00:00:00 2001 From: Naveen Saini <naveen.kumar.saini@intel.com> -Date: Tue, 31 Mar 2020 13:22:17 +0800 +Date: Wed, 7 Jul 2021 13:53:05 +0800 Subject: [PATCH] cmake: add yocto toolchain Upstream status: inappropriate [OE specific] @@ -15,23 +15,23 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> 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 +index 2b90c5d2ef..b6f28b2f87 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 - ) +@@ -68,13 +68,6 @@ execute_process( + OUTPUT_STRIP_TRAILING_WHITESPACE + ) -- assert_exists(LIBGCC_FILE_NAME) +-assert_exists(LIBGCC_FILE_NAME) - -- get_filename_component(LIBGCC_DIR ${LIBGCC_FILE_NAME} DIRECTORY) +-get_filename_component(LIBGCC_DIR ${LIBGCC_FILE_NAME} DIRECTORY) - -- assert_exists(LIBGCC_DIR) +-assert_exists(LIBGCC_DIR) - -- LIST(APPEND LIB_INCLUDE_DIR "-L\"${LIBGCC_DIR}\"") - LIST(APPEND TOOLCHAIN_LIBS gcc) - endif() +-LIST(APPEND LIB_INCLUDE_DIR "-L\"${LIBGCC_DIR}\"") + LIST(APPEND TOOLCHAIN_LIBS gcc) + if(SYSROOT_DIR) diff --git a/cmake/toolchain/yocto/generic.cmake b/cmake/toolchain/yocto/generic.cmake new file mode 100644 index 0000000000..45e5777e2a 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 new file mode 100644 index 0000000..caab16f --- /dev/null +++ b/recipes-kernel/zephyr-kernel/files/0001-zephyr-2.5.0-cmake-add-yocto-toolchain.patch @@ -0,0 +1,63 @@ +From 511745625637da0effca13c5489a392e15d32271 Mon Sep 17 00:00:00 2001 +From: Naveen Saini <naveen.kumar.saini@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.saini@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 + |