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: Quirin Gylstorff 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" + From patchwork Wed Jan 8 14:33:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 11323793 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 E780513A0 for ; Wed, 8 Jan 2020 14:34:44 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id BF9F720692 for ; Wed, 8 Jan 2020 14:34:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF9F720692 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 fraxinus.osuosl.org (Postfix) with ESMTP id 916DB84417; Wed, 8 Jan 2020 14:34:44 +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 l-fkGoT4FqUF; Wed, 8 Jan 2020 14:34:44 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2A86884491; Wed, 8 Jan 2020 14:34:44 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 163FFC0881; Wed, 8 Jan 2020 14:34:44 +0000 (UTC) X-Original-To: cip-dev@lists.cip-project.org Delivered-To: cip-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3A77BC1796 for ; Wed, 8 Jan 2020 14:34:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 25CCD86096 for ; Wed, 8 Jan 2020 14:34:43 +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 UdwMwrYf75gh for ; Wed, 8 Jan 2020 14:34:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from gecko.sbs.de (gecko.sbs.de [194.138.37.40]) by whitealder.osuosl.org (Postfix) with ESMTPS id CEE5586141 for ; Wed, 8 Jan 2020 14:34:41 +0000 (UTC) Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 008EYdSY016953 (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 008EYd2S001552; 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:55 +0100 Message-Id: <20200108143358.26177-3-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 2/5] Use renesas-config for hihope-rzg2m 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 Signed-off-by: Quirin Gylstorff --- conf/machine/hihope-rzg2m.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/hihope-rzg2m.conf b/conf/machine/hihope-rzg2m.conf index 863e20d..8278205 100644 --- a/conf/machine/hihope-rzg2m.conf +++ b/conf/machine/hihope-rzg2m.conf @@ -13,5 +13,7 @@ DISTRO_ARCH = "arm64" IMAGE_TYPE ?= "wic-img" +KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/arm64/renesas_defconfig" +USE_CIP_KERNEL_CONFIG = "1" DTB_FILE = "r8a774a1-hihope-rzg2m-ex.dtb" IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILE}" From patchwork Wed Jan 8 14:33:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 11323803 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 6F849109A for ; Wed, 8 Jan 2020 14:34:47 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 575B2206F0 for ; Wed, 8 Jan 2020 14:34:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 575B2206F0 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 fraxinus.osuosl.org (Postfix) with ESMTP id 39B7A84707; Wed, 8 Jan 2020 14:34:47 +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 261BJsggHx0g; Wed, 8 Jan 2020 14:34:45 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7B613844A8; Wed, 8 Jan 2020 14:34:45 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 64BAFC0881; Wed, 8 Jan 2020 14:34:45 +0000 (UTC) X-Original-To: cip-dev@lists.cip-project.org Delivered-To: cip-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id D486CC0881 for ; Wed, 8 Jan 2020 14:34:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C5AB586096 for ; Wed, 8 Jan 2020 14:34:43 +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 MODltW58jO9I 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 whitealder.osuosl.org (Postfix) with ESMTPS id 27D1186239 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 008EYdPX002835 (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 008EYd2T001552; 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:56 +0100 Message-Id: <20200108143358.26177-4-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 3/5] Use renesas_shmobile_defconfig for iwg20m 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 Signed-off-by: Quirin Gylstorff --- conf/machine/iwg20m.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/iwg20m.conf b/conf/machine/iwg20m.conf index 6c1a227..37f98fa 100644 --- a/conf/machine/iwg20m.conf +++ b/conf/machine/iwg20m.conf @@ -17,6 +17,8 @@ BAUDRATE_TTY = "115200" # kernel version PREFERRED_VERSION_linux-cip ?= "4.4.%" PREFERRED_VERSION_linux-cip-rt ?= "4.4.%" +USE_CIP_KERNEL_CONFIG = "1" +KERNEL_DEFCONFIG = "cip-kernel-config/4.4.y-cip/arm/renesas_shmobile_defconfig" # Boot partition files DTB_FILE = "r8a7743-iwg20d-q7-dbcm-ca.dtb" From patchwork Wed Jan 8 14:33:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 11323799 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 58B48109A for ; Wed, 8 Jan 2020 14:34:46 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (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 3F14620692 for ; Wed, 8 Jan 2020 14:34:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3F14620692 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 silver.osuosl.org (Postfix) with ESMTP id 203262044B; Wed, 8 Jan 2020 14:34:46 +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 6d46TG6DYCCr; Wed, 8 Jan 2020 14:34:45 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id 4761820337; Wed, 8 Jan 2020 14:34:45 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 371E8C0881; Wed, 8 Jan 2020 14:34:45 +0000 (UTC) X-Original-To: cip-dev@lists.cip-project.org Delivered-To: cip-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id BA165C1D89 for ; Wed, 8 Jan 2020 14:34:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A233386096 for ; Wed, 8 Jan 2020 14:34:43 +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 t+d4vtekLcD4 for ; Wed, 8 Jan 2020 14:34:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from lizzard.sbs.de (lizzard.sbs.de [194.138.37.39]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1B03B86224 for ; Wed, 8 Jan 2020 14:34:41 +0000 (UTC) Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 008EYdGO002592 (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 008EYd2U001552; Wed, 8 Jan 2020 15:34:40 +0100 From: "Q. Gylstorff" To: cip-dev@lists.cip-project.org Date: Wed, 8 Jan 2020 15:33:57 +0100 Message-Id: <20200108143358.26177-5-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 4/5] Use siemens_ipc227e_defconfig for simatic-ipc227e 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 Signed-off-by: Quirin Gylstorff --- conf/machine/simatic-ipc227e.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/simatic-ipc227e.conf b/conf/machine/simatic-ipc227e.conf index 473e6c5..3c9638f 100644 --- a/conf/machine/simatic-ipc227e.conf +++ b/conf/machine/simatic-ipc227e.conf @@ -10,3 +10,5 @@ DISTRO_ARCH = "amd64" IMAGE_TYPE ?= "wic-img" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" +USE_CIP_KERNEL_CONFIG = "1" +KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/x86/siemens_ipc227e_defconfig" From patchwork Wed Jan 8 14:33:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 11323801 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 CE6C113A0 for ; Wed, 8 Jan 2020 14:34:46 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B80C3206F0 for ; Wed, 8 Jan 2020 14:34:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B80C3206F0 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 fraxinus.osuosl.org (Postfix) with ESMTP id 529CC85124; Wed, 8 Jan 2020 14:34:46 +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 5DC08ZQCWcFu; Wed, 8 Jan 2020 14:34:45 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id A7A108458C; Wed, 8 Jan 2020 14:34:45 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 971FEC0881; Wed, 8 Jan 2020 14:34:45 +0000 (UTC) X-Original-To: cip-dev@lists.cip-project.org Delivered-To: cip-dev@lists.linuxfoundation.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5DBE5C0881 for ; Wed, 8 Jan 2020 14:34:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4D360844DA for ; Wed, 8 Jan 2020 14:34:44 +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 qNlVkTRmqjyU for ; Wed, 8 Jan 2020 14:34:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from gecko.sbs.de (gecko.sbs.de [194.138.37.40]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 3192784417 for ; Wed, 8 Jan 2020 14:34:41 +0000 (UTC) Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 008EYdpY016960 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 8 Jan 2020 15:34:40 +0100 Received: from md2dvrtc.ad001.siemens.net ([139.25.69.120]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 008EYd2V001552; Wed, 8 Jan 2020 15:34:40 +0100 From: "Q. Gylstorff" To: cip-dev@lists.cip-project.org Date: Wed, 8 Jan 2020 15:33:58 +0100 Message-Id: <20200108143358.26177-6-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 5/5] kas: patch isar for iwg20m with kernel 4.4 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 Signed-off-by: Quirin Gylstorff --- ...d-path-to-image-for-arm-kernels-4.12.patch | 37 +++++++++++++++++++ kas.yml | 5 +++ 2 files changed, 42 insertions(+) create mode 100644 isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch diff --git a/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch b/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch new file mode 100644 index 0000000..3e4e13e --- /dev/null +++ b/isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch @@ -0,0 +1,37 @@ +From 4961476f3affabd2bfb8f12ccc86c0abc6a66200 Mon Sep 17 00:00:00 2001 +From: Quirin Gylstorff +Date: Wed, 8 Jan 2020 14:43:01 +0100 +Subject: [PATCH] linux-custom: add path to image for arm* kernels < 4.12 +To: isar-users@googlegroups.com + +ARM/ARM64 Kernel with a version < 4.12 do not contain the path to +the kernel image in image_name. This was added with commits: +152e6744ebfc8fa6cc9fff4ba36271f5f1ba2821 for arm and +06995804b5762f016c7a80503406da853a8f3785 for arm64. + +Signed-off-by: Quirin Gylstorff +--- + meta/recipes-kernel/linux/files/debian/isar/install.tmpl | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl +index 67b7ce3..ac347aa 100644 +--- a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl ++++ b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl +@@ -56,7 +56,12 @@ EOF + + install_image() { + install -m 755 -d ${deb_img_dir}/$(dirname ${kimage_path}) +- cp ${O}/${kimage} ${deb_img_dir}/${kimage_path} ++ # ARM/ARM64 kernels < 4.12 do not include the path to the kernel ++ if [ -e ${O}/${kimage} ]; then ++ cp ${O}/${kimage} ${deb_img_dir}/${kimage_path} ++ else ++ cp ${O}/arch/$ARCH/boot/${kimage} ${deb_img_dir}/${kimage_path} ++ fi + + # Make sure arm64 kernels are decompressed + if [ "${ARCH}" = "arm64" ]; then +-- +2.20.1 + diff --git a/kas.yml b/kas.yml index 3eb6f03..a157dc9 100644 --- a/kas.yml +++ b/kas.yml @@ -22,6 +22,11 @@ repos: refspec: 619d6d88ac8c745282fd16773d50a466567615b6 layers: meta: + patches: + build-arm-with-4.4: + path: isar-patches/0001-linux-custom-add-path-to-image-for-arm-kernels-4.12.patch + repo: cip-core + bblayers_conf_header: standard: |