From patchwork Wed Jan 8 14:33:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gylstorff Quirin X-Patchwork-Id: 11323795 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EA767109A for ; Wed, 8 Jan 2020 14:34:44 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D24C42075D for ; Wed, 8 Jan 2020 14:34:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D24C42075D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=cip-dev-bounces@lists.cip-project.org Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A763886254; Wed, 8 Jan 2020 14:34:44 +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 9owxknJnf2xK; Wed, 8 Jan 2020 14:34:43 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id C64D786141; Wed, 8 Jan 2020 14:34:43 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9D199C0881; Wed, 8 Jan 2020 14:34:43 +0000 (UTC) X-Original-To: cip-dev@lists.cip-project.org Delivered-To: cip-dev@lists.linuxfoundation.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id DA554C0881 for ; Wed, 8 Jan 2020 14:34:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D0B5D20366 for ; Wed, 8 Jan 2020 14:34:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GddMREXy+EgN for ; Wed, 8 Jan 2020 14:34:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from goliath.siemens.de (goliath.siemens.de [192.35.17.28]) by silver.osuosl.org (Postfix) with ESMTPS id EE01620337 for ; Wed, 8 Jan 2020 14:34:41 +0000 (UTC) Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 008EYdIx002830 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 8 Jan 2020 15:34:39 +0100 Received: from md2dvrtc.ad001.siemens.net ([139.25.69.120]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 008EYd2R001552; Wed, 8 Jan 2020 15:34:39 +0100 From: "Q. Gylstorff" To: cip-dev@lists.cip-project.org Date: Wed, 8 Jan 2020 15:33:54 +0100 Message-Id: <20200108143358.26177-2-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108143358.26177-1-Quirin.Gylstorff@siemens.com> References: <20200108143358.26177-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 Cc: Quirin Gylstorff Subject: [cip-dev] [isar-cip-core PATCH 1/5] recipes-kernel/linux: allow the usage of the cip-kernel-config X-BeenThere: cip-dev@lists.cip-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: cip-dev-bounces@lists.cip-project.org Sender: "cip-dev" From: Quirin Gylstorff To avoid the duplication of the linux cip kernel configuration add the option USE_CIP_KERNEL_CONFIG. If this option is set to 1 the KERNEL_DEFCONFIG from the cip project is used. The KERNEL_DEFCONFIG is contains the explicit path to the defconfig in gitlab.com/cip-project/cip-kernel-config.git. SRCREV_cip-kernel-config sets the commit sha for checkout. Signed-off-by: Quirin Gylstorff --- conf/machine/hihope-rzg2m.conf | 1 - kas.yml | 4 ++-- recipes-kernel/linux/linux-cip-common.inc | 18 +++++++++++++++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/conf/machine/hihope-rzg2m.conf b/conf/machine/hihope-rzg2m.conf index 8b8849f..863e20d 100644 --- a/conf/machine/hihope-rzg2m.conf +++ b/conf/machine/hihope-rzg2m.conf @@ -13,6 +13,5 @@ DISTRO_ARCH = "arm64" IMAGE_TYPE ?= "wic-img" -KERNEL_DEFCONFIG = "https://gitlab.com/cip-project/cip-kernel/cip-kernel-config/raw/693be1bfb92e6c0ef813cf29431ac49eab0e15be/4.19.y-cip/arm64/renesas_defconfig" DTB_FILE = "r8a774a1-hihope-rzg2m-ex.dtb" IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILE}" diff --git a/kas.yml b/kas.yml index aa7ddda..3eb6f03 100644 --- a/kas.yml +++ b/kas.yml @@ -18,8 +18,8 @@ repos: cip-core: isar: - url: https://github.com/ilbers/isar - refspec: 20a5e368021d988d8f0dcd1951b395d194a37ebb + url: https://github.com/ilbers/isar.git + refspec: 619d6d88ac8c745282fd16773d50a466567615b6 layers: meta: diff --git a/recipes-kernel/linux/linux-cip-common.inc b/recipes-kernel/linux/linux-cip-common.inc index d65cfa3..3fae2fe 100644 --- a/recipes-kernel/linux/linux-cip-common.inc +++ b/recipes-kernel/linux/linux-cip-common.inc @@ -9,10 +9,22 @@ # SPDX-License-Identifier: MIT # -require recipes-kernel/linux/linux-custom.inc +KERNEL_DEFCONFIG ?= "${MACHINE}_defconfig" + +def conditional(variable, checkvalue, truevalue, falsevalue, d): + if d.getVar(variable) == checkvalue: + return truevalue + else: + return falsevalue -KERNEL_DEFCONFIG = "${MACHINE}_defconfig" +require recipes-kernel/linux/linux-custom.inc SRC_URI += " \ https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot/linux-cip-${PV}.tar.gz \ - file://${KERNEL_DEFCONFIG}" +" + +SRC_URI_append = "${@conditional("USE_CIP_KERNEL_CONFIG","1", \ +" git://gitlab.com/cip-project/cip-kernel/cip-kernel-config.git;destsuffix=cip-kernel-config;name=cip-kernel-config" \ +," file://${KERNEL_DEFCONFIG}",d)}" +SRCREV_cip-kernel-config ?= "f88ee1e75253104f975263cf4d0bddd557388197" +