From patchwork Tue Apr 11 17:40:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 22543 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 2B654C76196 for ; Tue, 11 Apr 2023 17:40:43 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web11.21255.1681234839950384791 for ; Tue, 11 Apr 2023 10:40:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=FyRlMGVc; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: afd@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33BHecdA104230; 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=MKKu6b3FrANdK8OjCq8jUP5unpI8VuVgdfPLz0wpI1c=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=FyRlMGVcSqH/3gY0lA7L70A3Lzi5sEIbyLzIuEbgdCY73hcwjpk+gD59wgFGRhamd XCGpNLagaxyHbYPYZSeaTCmFDkjNAGxbJJggSIvp6lZE9dzsrr4IvpDzbM4thPzcS3 XgxDr4+NDqew3s6GKDbcBopcRBiuA5EIeNQ3KX4A= Received: from DFLE109.ent.ti.com (dfle109.ent.ti.com [10.64.6.30]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33BHecpN046238 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 11 Apr 2023 12:40:38 -0500 Received: from DFLE115.ent.ti.com (10.64.6.36) by DFLE109.ent.ti.com (10.64.6.30) 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 DFLE115.ent.ti.com (10.64.6.36) 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 33BHebbq083128; 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 2/5] linux-ti-mainline: Remove ti-upstream-tools Date: Tue, 11 Apr 2023 12:40:34 -0500 Message-ID: <20230411174037.32244-2-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230411174037.32244-1-afd@ti.com> References: <20230411174037.32244-1-afd@ti.com> 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/16346 Mainline should test the mainline kernel as it is, not with out-of-tree changes like new DTB/DTBOs. Use only upstream DTB/DTBOs. As that was the last thing provided by ti-upstream-tools, remove it here. Signed-off-by: Andrew Davis --- .../recipes-kernel/linux/linux-ti-mainline_git.bb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) 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 7d948a85..d0f1b4e2 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 @@ -1,5 +1,5 @@ SECTION = "kernel" -SUMMARY = "Mainline Linux kernel for TI devices (with ti-upstream-tools)" +SUMMARY = "Mainline Linux kernel for TI devices" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" @@ -15,9 +15,6 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ S = "${WORKDIR}/git" -BRANCH = "master" -TOOLS_BRANCH = "master" - # 5.15 Mainline version SRCREV = "8bb7eca972ad531c9b149c0a51ab43a417385813" PV = "5.15+git${SRCPV}" @@ -28,12 +25,11 @@ PR = "${MACHINE_KERNEL_PR}" KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" KERNEL_GIT_PROTOCOL = "https" +KERNEL_GIT_BRANCH = "master" 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 \ + ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${KERNEL_GIT_BRANCH};name=linux \ " -SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95" SRCREV_FORMAT = "linux" DEFCONFIG_NAME = "multi_v7_defconfig" @@ -43,7 +39,6 @@ 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} } do_shared_workdir:prepend() {