summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2020-10-21 10:19:30 +0100
committerNaveen Saini <naveen.kumar.saini@intel.com>2020-10-21 18:47:20 +0800
commitb6938016f45863e7100b78972c4558178fd369a5 (patch)
treefef5183d963848d7fcadfab9af7b90b72dba96be
parent4df23ca31f6f2586ca6ff522010837b8279b793f (diff)
downloadmeta-zephyr-b6938016f45863e7100b78972c4558178fd369a5.tar.gz
meta-zephyr-b6938016f45863e7100b78972c4558178fd369a5.tar.bz2
meta-zephyr-b6938016f45863e7100b78972c4558178fd369a5.zip
zephyr: use TCLIBC=newlib directly
Instead of setting TCLIBC=baremetal and then adding newlib in various places, just set TCLIBC=newlib directly. This also means we can use the standard DEPENDS instead of reinventing them. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
-rw-r--r--conf/distro/zephyr.conf7
-rw-r--r--recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc5
2 files changed, 2 insertions, 10 deletions
diff --git a/conf/distro/zephyr.conf b/conf/distro/zephyr.conf
index 44448af..a98da32 100644
--- a/conf/distro/zephyr.conf
+++ b/conf/distro/zephyr.conf
@@ -5,16 +5,11 @@ DISTRO_VERSION = "1.0"
TARGET_VENDOR = "-yocto"
-TCLIBC = "baremetal"
-TCLIBCAPPEND = ""
+TCLIBC = "newlib"
TEST_TARGET = "QemuTargetZephyr"
TEST_SUITES = "zephyr"
-PREFERRED_PROVIDER_virtual/libc = "newlib"
-PREFERRED_PROVIDER_virtual/libiconv = "newlib"
-
-TOOLCHAIN_TARGET_TASK += " newlib"
INHERIT += "siteinfo-zephyr"
INHERIT += "uninative"
diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc
index 7fa4b25..3f82c20 100644
--- a/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc
+++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc
@@ -19,10 +19,7 @@ EXTRA_OECMAKE_append_arm = " -DZEPHYR_MODULES=${S}/modules/cmsis"
export ZEPHYR_BASE="${S}"
-# We always need a toolchain to cross-compile.
-INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS += "gcc-cross-${TARGET_ARCH} libgcc ${TOOLCHAIN_TARGET_TASK} gperf-native"
-DEPENDS += " python3-pyelftools-native python3-pyyaml-native python3-pykwalify-native"
+DEPENDS += "gperf-native python3-pyelftools-native python3-pyyaml-native python3-pykwalify-native"
CROSS_COMPILE = "${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}"
DEPENDS_append_qemuall = " qemu-native qemu-helper-native"