From patchwork Fri Apr 28 21:32:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Eatmon X-Patchwork-Id: 23159 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 88148C77B61 for ; Fri, 28 Apr 2023 21:33:01 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web10.34068.1682717579327161501 for ; Fri, 28 Apr 2023 14:32:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=YtBsw55e; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: reatmon@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 33SLWvDf123051; Fri, 28 Apr 2023 16:32:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682717577; bh=223g3whcgKk18h04aOo9dZDyGjI1s4sc+oxlc1oGBDk=; h=From:To:Subject:Date; b=YtBsw55ei9KNNxjLQ+mgsqedwQZOXsjmkK2d6ZdXXcMPrUvdTvk2d8itiKo5DSfCI qbWPIM/9JuReAtxRlLEhIRYRCyUVgJfQp5LsqyYNkQ71i+ifoA2rJP4XrRwZUjy4KX fw2SISU8dYqwqooij/GVgqmJ6XOtjrfsauNxqcHo= Received: from DFLE112.ent.ti.com (dfle112.ent.ti.com [10.64.6.33]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33SLWvji083773 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 28 Apr 2023 16:32:57 -0500 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE112.ent.ti.com (10.64.6.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 28 Apr 2023 16:32:57 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Fri, 28 Apr 2023 16:32:57 -0500 Received: from uda0214219 (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33SLWvBH021586; Fri, 28 Apr 2023 16:32:57 -0500 Received: from reatmon by uda0214219 with local (Exim 4.90_1) (envelope-from ) id 1psVi5-0003Po-CG; Fri, 28 Apr 2023 16:32:57 -0500 From: Ryan Eatmon To: Praneeth Bajjuri , Denys Dmytriyenko , Subject: [meta-ti][kirkstone][PATCH] ti-ipc: Stop looking for rpmsg_rpc.h in the kernel Date: Fri, 28 Apr 2023 16:32:57 -0500 Message-ID: <20230428213257.13088-1-reatmon@ti.com> X-Mailer: git-send-email 2.17.1 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 ; Fri, 28 Apr 2023 21:33:01 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16460 Stop looking for the rpmsg_rpc.h in the kernel. While we are doing the LTS migration for kirkstone, this file is not going to be in the kernel for a bit. This patch works in conjunction with a recipe change that downloads the header and adds a -I to the CFLAGS to pick it up. This will be removed once the 6.1 kernel has been updated. Signed-off-by: Ryan Eatmon --- ...ooking-for-rpmsg_rpc.h-in-the-kernel.patch | 35 +++++++++++++++++++ meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb | 6 ++++ 2 files changed, 41 insertions(+) create mode 100644 meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch b/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch new file mode 100644 index 00000000..ef12af88 --- /dev/null +++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch @@ -0,0 +1,35 @@ +From 66ca0e732c2e287814d4fc5082b818554ee42398 Mon Sep 17 00:00:00 2001 +From: Ryan Eatmon +Date: Fri, 28 Apr 2023 14:30:59 -0500 +Subject: [PATCH] MmRpc: Stop looking for rpmsg_rpc.h in the kernel + +Stop looking for the rpmsg_rpc.h in the kernel. While we are doing the +LTS migration for kirkstone, this file is not going to be in the kernel +for a bit. This patch works in conjunction with a recipe change that +downloads the header and adds a -I to the CFLAGS to pick it up. This +will be removed once the 6.1 kernel has been updated. + +Signed-off-by: Ryan Eatmon + +Upstream-Status: Inappropriate [other] + +--- + packages/ti/ipc/mm/MmRpc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/packages/ti/ipc/mm/MmRpc.c b/packages/ti/ipc/mm/MmRpc.c +index 2df7420..10f496b 100644 +--- a/packages/ti/ipc/mm/MmRpc.c ++++ b/packages/ti/ipc/mm/MmRpc.c +@@ -64,7 +64,7 @@ + #define linux_include(kd,m) + #endif + +-#include linux_include(KERNEL_INSTALL_DIR,rpmsg_rpc) ++#include "linux/rpmsg_rpc.h" + + #ifdef _linux_ + #define linux _linux +-- +2.17.1 + diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb index 01b857c2..1782f02a 100644 --- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb +++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb @@ -8,12 +8,18 @@ PR = "${INC_PR}.2" DEPENDS += "virtual/kernel" +SRC_URI:append = "https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/plain/include/uapi/linux/rpmsg_rpc.h?h=ti-linux-5.10.y;name=rpmsg_rpc;subdir=linux;downloadfilename=rpmsg_rpc.h" +SRC_URI[rpmsg_rpc.sha256sum] = "cd237f40a37520a1f2df19fbfeefd00c0a5ad68efeaba9ba0fba60ca16ea09be" + SRC_URI += "file://tiipclad-daemon.sh \ file://omap_remoteproc.conf \ file://tiipclad-daemon.service \ file://0001-Add-kernel-build-dir.patch \ + file://0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch \ " +CFLAGS += "-I${WORKDIR}" + DAEMON = "UNKNOWN" DAEMON:dra7xx = "lad_dra7xx" DAEMON:omapl138 = "lad_omapl138"