From patchwork Tue Apr 11 17:40:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 22542 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 396CBC77B73 for ; Tue, 11 Apr 2023 17:40:43 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web11.21257.1681234841161799907 for ; Tue, 11 Apr 2023 10:40:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=vPN79ugi; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: afd@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33BHec26081728; Tue, 11 Apr 2023 12:40:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1681234838; bh=EaseqY8nI5K2l9kuKvu1xwOwQZS1YCaIdC3G/Ij4+LE=; h=From:To:CC:Subject:Date; b=vPN79ugihyj5gLN+iODkCxcUvp7XqHdogFDdtBfHCiwqOhAHhZtJ7OsbfyaVYcKay ziGA5PmiJiAx+w2en58gwWjSi5lYMKFoau63Vsb4BE2hcelgpfKzRRHG5ZxLUyoKBS 8FGyU2Shmm5TjgopXDYjqZmSTjT8R80muvmpPs7I= Received: from DLEE105.ent.ti.com (dlee105.ent.ti.com [157.170.170.35]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33BHecpH046229 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 11 Apr 2023 12:40:38 -0500 Received: from DLEE109.ent.ti.com (157.170.170.41) by DLEE105.ent.ti.com (157.170.170.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Tue, 11 Apr 2023 12:40:38 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Tue, 11 Apr 2023 12:40:38 -0500 Received: from ula0226330.dal.design.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33BHebbp083128; Tue, 11 Apr 2023 12:40:38 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][PATCH v2 1/5] linux-ti-mainline: Use upstream configs with upstream kernel Date: Tue, 11 Apr 2023 12:40:33 -0500 Message-ID: <20230411174037.32244-1-afd@ti.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 11 Apr 2023 17:40:43 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16347 Mainline should test the mainline kernel as it is, not with out-of-tree changes like to the default configuration that one would get when using a stock distro. Use only upstream configuration. Signed-off-by: Andrew Davis Reviewed-by: Denys Dmytriyenko --- .../recipes-kernel/linux/linux-ti-mainline/defconfig | 1 - .../linux/linux-ti-mainline/dra7xx/defconfig | 1 - .../recipes-kernel/linux/linux-ti-mainline/k3/defconfig | 1 - .../linux/linux-ti-mainline/omapl138/defconfig | 1 - .../linux/linux-ti-mainline/ti33x/defconfig | 1 - .../linux/linux-ti-mainline/ti43x/defconfig | 1 - meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 8 +++++--- 7 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig deleted file mode 100644 index d083d182..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omap2_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig deleted file mode 100644 index dcb53bab..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_dra7x_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig deleted file mode 100644 index b9bc6137..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_arm64_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig deleted file mode 100644 index b3467853..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omapl138_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig deleted file mode 100644 index 88f80fa9..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am3x_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig deleted file mode 100644 index 4b9daaf9..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am4x_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb index be278d73..7d948a85 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" inherit kernel -DEFCONFIG_BUILDER = "${S}/ti-upstream-tools/config/defconfig_builder.sh" -require recipes-kernel/linux/setup-defconfig.inc require recipes-kernel/linux/kernel-rdepends.inc require recipes-kernel/linux/ti-kernel.inc @@ -33,12 +31,16 @@ KERNEL_GIT_PROTOCOL = "https" SRC_URI += " \ ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH};name=linux \ git://git.ti.com/git/ti-linux-kernel/ti-upstream-tools.git;branch=${TOOLS_BRANCH};protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=git/ti-upstream-tools \ - file://defconfig \ " SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95" SRCREV_FORMAT = "linux" +DEFCONFIG_NAME = "multi_v7_defconfig" +DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig" +DEFCONFIG_NAME:k3 = "defconfig" +KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}" + kernel_do_compile:append() { oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} oe_runmake -C ${S}/ti-upstream-tools LINUX=${S} DTC=${B}/scripts/dtc/dtc O=${B} CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}