From patchwork Mon Jan 21 19:50:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 1028905 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="G/dB1BBw"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43k29w2wMBz9s4s for ; Tue, 22 Jan 2019 06:46:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A121A84EEB; Mon, 21 Jan 2019 19:46:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aW6S6yqxe3PL; Mon, 21 Jan 2019 19:46:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id D93C184E6B; Mon, 21 Jan 2019 19:46:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 31D2E1BF5F4 for ; Mon, 21 Jan 2019 19:46:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2EB4A8462F for ; Mon, 21 Jan 2019 19:46:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id llFItjdPI5YP for ; Mon, 21 Jan 2019 19:46:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 442F184627 for ; Mon, 21 Jan 2019 19:46:38 +0000 (UTC) Received: by mail-ed1-f68.google.com with SMTP id y56so17437775edd.11 for ; Mon, 21 Jan 2019 11:46:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/jMlUmyWzjHyoYec+TcR+voenoLYMHl/xaqH+j8kRsE=; b=G/dB1BBwgfxnNf1sClLhusRHMnBd6bkndPCv/mESe5DdpbTkVu6xz7/kVSwIdfwZ73 pSQ/60uy+zXEsLCHVmpFnSHSAVpFJqd7kkLAb3HDXw/vf7OtK7J6Z7D63/3xjMpo63RN 52mksxKaCHsc1x+EPtH2+k+vbXfjuhhUQf6JucmD+NIjxc/kKkNz/XjXqUGZe02k4bh0 44tdGHoF9/7HAJJ9VSu43n9ID+gWybpMgm1aKVGFYjohtTiocijHgPmpahvHDawC0uRh 8ujV+l9r2MjFvMu8VHK8Dm99XYRwwy0cgbDv/uJU+nC0nTOQeh/PTX4a+cEz7T9e6W33 KCXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/jMlUmyWzjHyoYec+TcR+voenoLYMHl/xaqH+j8kRsE=; b=itrk2QkndeQRIYxHwzLOc9T43znPbivTHiLiSRbkyA54IFbeAdmVwjw7zL0bnyge+d DP3WFPjNdTfg38+hiCq4DBaT+dnGL3shAPgJYI3h03zDEKmLObJPonZKaXGrIREMVMAe bcRWcN3bcoHm5cxDwCEyMgOYSXvKPTEKaGgpi7diXtCv9jjPIlaIOiVBDrvDURBqJYqt umABDqirI5wr76HOaM/Jv0mKWOFAIIju3meXlpEnRO45eQ8pYoz26Ge4AX+S6mQuMkjW 3oy9nULi6NI1vOulEkdAfhsYrK4xvtfKj7708K7Hv4wtd329HkyPAjs94zYq4HAMmcVZ POlQ== X-Gm-Message-State: AJcUukdJDzVCF6uuE3La1X6mH2RfuUWlEtelBULtMU4MfCMCoCeO8wy3 ZpO8Apo2q9ZMWQa9ak+diwd2jbGvgYs= X-Google-Smtp-Source: ALg8bN7Xs2W3UDHESerFSxJnXqUiI1D8x51zPHTL+XSiKlR1TBIcX9nrwFEZVBs1K0a81AIoLm6fug== X-Received: by 2002:a17:906:6b99:: with SMTP id l25-v6mr25748830ejr.154.1548099996299; Mon, 21 Jan 2019 11:46:36 -0800 (PST) Received: from localhost.localdomain (d54c493b0.access.telenet.be. [84.196.147.176]) by smtp.gmail.com with ESMTPSA id w31sm9358158edw.82.2019.01.21.11.46.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 11:46:35 -0800 (PST) From: Thomas De Schampheleire To: buildroot@buildroot.org Date: Mon, 21 Jan 2019 20:50:04 +0100 Message-Id: <20190121195005.17768-1-patrickdepinguin@gmail.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] xenomai: move arch restriction to Cobalt core, no restriction for Mercury X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Thomas De Schampheleire Xenomai has two mutually exclusive cores: - Cobalt: dual-kernel approach: patched kernel + userland - Mercury: only userland In the Cobalt core, not all architectures are supported. This is the source of the existing ARCH_SUPPORTS variable. In the Mercury core, there is no imposed architecture restriction. Rename the XENOMAI_ARCH_SUPPORTS flag to XENOMAI_COBALT_ARCH_SUPPORTS and move its check from the Xenomai package to the Cobalt core. Signed-off-by: Thomas De Schampheleire --- linux/Config.ext.in | 4 ++-- package/xenomai/Config.in | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/linux/Config.ext.in b/linux/Config.ext.in index acc8a04742..71d8e07c25 100644 --- a/linux/Config.ext.in +++ b/linux/Config.ext.in @@ -4,7 +4,7 @@ menu "Linux Kernel Extensions" # Xenomai config BR2_LINUX_KERNEL_EXT_XENOMAI bool "Adeos/Xenomai Real-time patch" - depends on BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS + depends on BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_XENOMAI @@ -34,7 +34,7 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH and verify that your kernel version in buildroot matches. comment "xenomai needs a uClibc or glibc toolchain w/ threads" - depends on BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS + depends on BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL #------------------------------------------------------------------------------- diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in index f3d8ea4baf..a2bb1ab679 100644 --- a/package/xenomai/Config.in +++ b/package/xenomai/Config.in @@ -1,4 +1,4 @@ -config BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS +config BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS bool default y depends on BR2_i386 || BR2_x86_64 || (BR2_arm && !BR2_ARM_CPU_ARMV7M) || \ @@ -6,11 +6,9 @@ config BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS comment "xenomai needs an glibc or uClibc toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL - depends on BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS config BR2_PACKAGE_XENOMAI bool "Xenomai Userspace" - depends on BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS # uses , __WORDSIZE and bits/local_lim.h depends on !BR2_TOOLCHAIN_USES_MUSL @@ -67,6 +65,7 @@ config BR2_PACKAGE_XENOMAI_MERCURY config BR2_PACKAGE_XENOMAI_COBALT bool "Cobalt" + depends on BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS help Select Cobalt core (dual kernel) for the Xenomai userspace. Use this if you use a Xenomai-patched