From patchwork Tue Feb 21 01:02:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 19889 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 9F0A9C6379F for ; Tue, 21 Feb 2023 01:03:03 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.31803.1676941379394118140 for ; Mon, 20 Feb 2023 17:03:00 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id C321D40C30; Tue, 21 Feb 2023 01:02:58 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xSeD5jp5aWGo; Tue, 21 Feb 2023 01:02:58 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 99DD740C53; Tue, 21 Feb 2023 01:02:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 2AAC6163763; Mon, 20 Feb 2023 20:02:33 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master/kirkstone][PATCH 3/4] Revert "meta-ti-bsp: machine: Remove all gpu features" Date: Tue, 21 Feb 2023 01:02:41 +0000 Message-Id: <20230221010242.3690-4-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230221010242.3690-1-denis@denix.org> References: <20230221010242.3690-1-denis@denix.org> MIME-Version: 1.0 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, 21 Feb 2023 01:03:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15892 From: Denys Dmytriyenko Merged by accident. This reverts commit 51bb56b74cd2e7f7e922cce84a023f669291ef00. Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 2 ++ meta-ti-bsp/conf/machine/include/am62xx.inc | 6 +++++- meta-ti-bsp/conf/machine/include/am65xx.inc | 6 +++++- meta-ti-bsp/conf/machine/include/j721e.inc | 6 ++++++ meta-ti-bsp/conf/machine/include/j721s2.inc | 6 ++++++ meta-ti-bsp/conf/machine/include/j784s4.inc | 6 ++++++ meta-ti-bsp/conf/machine/include/omap-a15.inc | 6 +++++- meta-ti-bsp/conf/machine/include/ti33x.inc | 6 +++++- meta-ti-bsp/conf/machine/include/ti43x.inc | 6 +++++- 9 files changed, 45 insertions(+), 5 deletions(-) diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf index ec9ce596..ef8e8692 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf @@ -4,6 +4,8 @@ require conf/machine/include/am62xx.inc +MACHINE_FEATURES += "gpu" + KERNEL_DEVICETREE = " \ ti/k3-am62x-lp-sk.dtb \ ti/k3-am625-skeleton.dtb \ diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index 35f3f071..411e5265 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -1,11 +1,15 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":am62xx" -MACHINE_FEATURES += "screen touchscreen" +MACHINE_FEATURES += "screen touchscreen gpu" SERIAL_CONSOLES = "115200;ttyS2" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" TFA_BOARD = "lite" diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 385bb164..424864d3 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -1,11 +1,15 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":am65xx" -MACHINE_FEATURES += "screen touchscreen" +MACHINE_FEATURES += "screen touchscreen gpu" SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" KERNEL_DEVICETREE = " \ diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index 67f5fe0f..eba10d8d 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -1,6 +1,12 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":j721e" +MACHINE_FEATURES += "gpu" + +PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" # On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index f33a3aba..fc6493b8 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc @@ -1,6 +1,12 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":j721s2" +MACHINE_FEATURES += "gpu" + +PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" TFA_BOARD = "generic" diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc index df0faede..d268b810 100644 --- a/meta-ti-bsp/conf/machine/include/j784s4.inc +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc @@ -1,6 +1,12 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":j784s4" +MACHINE_FEATURES += "gpu" + +PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" TFA_BOARD = "j784s4" diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc index efa33a10..0843fb28 100644 --- a/meta-ti-bsp/conf/machine/include/omap-a15.inc +++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc @@ -10,6 +10,10 @@ MACHINE_KERNEL_PR = "r7" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" +PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" KERNEL_IMAGETYPE = "zImage" @@ -41,7 +45,7 @@ EXTRA_IMAGEDEPENDS += "virtual/bootloader" UBI_VOLNAME = "rootfs" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet mmip dsp gc320" +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" WKS_FILE ?= "sdimage-2part.wks" diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index e2f75359..cfacc30d 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc @@ -11,6 +11,10 @@ MACHINE_KERNEL_PR = "r22" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" +PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" KERNEL_IMAGETYPE = "zImage" @@ -51,7 +55,7 @@ UBI_VOLNAME = "rootfs" EXTRA_IMAGEDEPENDS += "virtual/bootloader" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet" +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet gpu" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" WKS_FILE ?= "sdimage-2part.wks" diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc index e9999910..74a964db 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc @@ -11,6 +11,10 @@ MACHINE_KERNEL_PR = "r3" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" +PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" KERNEL_IMAGETYPE = "zImage" @@ -50,7 +54,7 @@ UBI_VOLNAME = "rootfs" EXTRA_IMAGEDEPENDS += "u-boot" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet" +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" WKS_FILE ?= "sdimage-2part.wks"