From b6938016f45863e7100b78972c4558178fd369a5 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 21 Oct 2020 10:19:30 +0100 Subject: [PATCH] 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 Signed-off-by: Naveen Saini --- conf/distro/zephyr.conf | 7 +------ recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc | 5 +---- 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"