* [master][PATCH 1/5] am62xx, j721s2: move "gpu" machine feature from machine to soc config
@ 2022-05-05 17:44 Denys Dmytriyenko
2022-05-05 17:44 ` [master][PATCH 2/5] conf/machine: add preferences for 3D graphics providers Denys Dmytriyenko
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Denys Dmytriyenko @ 2022-05-05 17:44 UTC (permalink / raw)
To: meta-ti; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@konsulko.com>
In most cases machine features should be set in the corresponding SoC config
to be applicable to different machine variants, like GP, HS or custom board.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/am62xx-evm.conf | 2 --
meta-ti-bsp/conf/machine/include/am62xx.inc | 2 +-
meta-ti-bsp/conf/machine/include/j721s2.inc | 2 ++
meta-ti-bsp/conf/machine/j721s2-evm.conf | 2 --
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
index 44f46d78..33b3294e 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
@@ -4,8 +4,6 @@
require conf/machine/include/am62xx.inc
-MACHINE_FEATURES += "gpu"
-
KERNEL_DEVICETREE = " \
ti/k3-am625-sk.dtb \
ti/k3-am625-sk-csi2-ov5640.dtb \
diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
index f3bde639..56cd7c20 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -1,7 +1,7 @@
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}"
diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc
index 113f86c4..06654179 100644
--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -1,2 +1,4 @@
require conf/machine/include/j7.inc
SOC_FAMILY:append = ":j721s2"
+
+MACHINE_FEATURES += "gpu"
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index 5d977776..a2c15f74 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -4,8 +4,6 @@
require conf/machine/include/j721s2.inc
-MACHINE_FEATURES += "gpu"
-
SERIAL_CONSOLES = "115200;ttyS10"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
TFA_K3_USART = "0x8"
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [master][PATCH 2/5] conf/machine: add preferences for 3D graphics providers
2022-05-05 17:44 [master][PATCH 1/5] am62xx, j721s2: move "gpu" machine feature from machine to soc config Denys Dmytriyenko
@ 2022-05-05 17:44 ` Denys Dmytriyenko
2022-05-05 17:44 ` [master][PATCH 3/5] conf/machine: make default PREFERRED_PROVIDERs easy to override Denys Dmytriyenko
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Denys Dmytriyenko @ 2022-05-05 17:44 UTC (permalink / raw)
To: meta-ti; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@konsulko.com>
Specify default 3D GLES/EGL providers for platforms using SGX and Rogue GPUs,
both kernel and user-space components.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
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/omap-a15.inc | 5 +++++
meta-ti-bsp/conf/machine/include/ti33x.inc | 5 +++++
meta-ti-bsp/conf/machine/include/ti43x.inc | 5 +++++
7 files changed, 39 insertions(+)
diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
index 56cd7c20..ce768895 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -6,6 +6,12 @@ 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"
+
# AM62 supports multi-certificate images, use the same
IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
index 111ef96f..b71b4686 100644
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -6,6 +6,12 @@ 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 = " \
ti/k3-am654-base-board.dtb \
ti/k3-am654-base-board-sr1.dtbo \
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
index d965327c..85952d32 100644
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -2,3 +2,9 @@ require conf/machine/include/j7.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"
diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc
index 06654179..65b39118 100644
--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -2,3 +2,9 @@ require conf/machine/include/j7.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"
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc
index 94ecab34..7cff38dc 100644
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -10,6 +10,11 @@ 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"
KERNEL_IMAGETYPES = "zImage uImage"
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc
index 083a24b6..2f493404 100644
--- a/meta-ti-bsp/conf/machine/include/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -20,6 +20,11 @@ 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"
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc
index 8757b545..3d69e453 100644
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -23,6 +23,11 @@ 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"
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [master][PATCH 3/5] conf/machine: make default PREFERRED_PROVIDERs easy to override
2022-05-05 17:44 [master][PATCH 1/5] am62xx, j721s2: move "gpu" machine feature from machine to soc config Denys Dmytriyenko
2022-05-05 17:44 ` [master][PATCH 2/5] conf/machine: add preferences for 3D graphics providers Denys Dmytriyenko
@ 2022-05-05 17:44 ` Denys Dmytriyenko
2022-05-05 17:44 ` [master][PATCH 4/5] conf/machine: remove default setting for xorg Denys Dmytriyenko
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Denys Dmytriyenko @ 2022-05-05 17:44 UTC (permalink / raw)
To: meta-ti; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@konsulko.com>
Use weak assignment for default PREFERRED_PROVIDER values to allow user to
easily overwrite them from local.conf.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/include/am62xx.inc | 10 +++++-----
meta-ti-bsp/conf/machine/include/am65xx.inc | 10 +++++-----
meta-ti-bsp/conf/machine/include/j721e.inc | 10 +++++-----
meta-ti-bsp/conf/machine/include/j721s2.inc | 10 +++++-----
meta-ti-bsp/conf/machine/include/k3.inc | 4 ++--
meta-ti-bsp/conf/machine/include/omap-a15.inc | 14 +++++++-------
meta-ti-bsp/conf/machine/include/ti33x.inc | 14 +++++++-------
meta-ti-bsp/conf/machine/include/ti43x.inc | 14 +++++++-------
8 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
index ce768895..bcf435f5 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -6,11 +6,11 @@ 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"
+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"
# AM62 supports multi-certificate images, use the same
IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
index b71b4686..d6bd9810 100644
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -6,11 +6,11 @@ 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"
+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 = " \
ti/k3-am654-base-board.dtb \
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
index 85952d32..fe260178 100644
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -3,8 +3,8 @@ 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"
+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"
diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc
index 65b39118..5cd74683 100644
--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -3,8 +3,8 @@ 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"
+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"
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index a39ddd2a..7b353129 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -11,8 +11,8 @@ BBMULTICONFIG += "k3r5"
MACHINE_KERNEL_PR = "r0"
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/bootloader ?= "u-boot-ti-staging"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
KERNEL_IMAGETYPE = "Image"
KERNEL_IMAGETYPES = "Image vmlinux.gz"
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc
index 7cff38dc..8ab614f0 100644
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -8,13 +8,13 @@ require conf/machine/include/arm/armv7a/tune-cortexa15.inc
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"
+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"
KERNEL_IMAGETYPES = "zImage uImage"
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc
index 2f493404..06d35f09 100644
--- a/meta-ti-bsp/conf/machine/include/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -18,13 +18,13 @@ MACHINE_KERNEL_PR = "r22"
# Default providers, may need to override for specific machines
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"
+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"
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc
index 3d69e453..98b374a1 100644
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -21,13 +21,13 @@ MACHINE_KERNEL_PR = "r3"
# Default providers, may need to override for specific machines
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"
+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"
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [master][PATCH 4/5] conf/machine: remove default setting for xorg
2022-05-05 17:44 [master][PATCH 1/5] am62xx, j721s2: move "gpu" machine feature from machine to soc config Denys Dmytriyenko
2022-05-05 17:44 ` [master][PATCH 2/5] conf/machine: add preferences for 3D graphics providers Denys Dmytriyenko
2022-05-05 17:44 ` [master][PATCH 3/5] conf/machine: make default PREFERRED_PROVIDERs easy to override Denys Dmytriyenko
@ 2022-05-05 17:44 ` Denys Dmytriyenko
2022-05-05 17:44 ` [master][PATCH 5/5] ti-rtos-firmware: remove duplicate assignment Denys Dmytriyenko
2022-05-05 19:23 ` [meta-ti] [master][PATCH 1/5] am62xx, j721s2: move "gpu" machine feature from machine to soc config Ryan Eatmon
4 siblings, 0 replies; 6+ messages in thread
From: Denys Dmytriyenko @ 2022-05-05 17:44 UTC (permalink / raw)
To: meta-ti; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@konsulko.com>
meta-ti does not provide official X.org support, so no reason to set any
defaults, just assume the ones from OE-Core.
Also, drop setting MACHINE_GUI_CLASS, which is now only used by the kernel
from meta-openembedded to determine the size of the Tux during boot. Keep
those for now in community Beagle machines.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/am335x-evm.conf | 1 -
meta-ti-bsp/conf/machine/am437x-evm.conf | 1 -
meta-ti-bsp/conf/machine/include/k3.inc | 2 --
meta-ti-bsp/conf/machine/include/omap-a15.inc | 7 -------
meta-ti-bsp/conf/machine/include/ti33x.inc | 9 ---------
meta-ti-bsp/conf/machine/include/ti43x.inc | 12 ------------
6 files changed, 32 deletions(-)
diff --git a/meta-ti-bsp/conf/machine/am335x-evm.conf b/meta-ti-bsp/conf/machine/am335x-evm.conf
index 09bd3934..9301406b 100644
--- a/meta-ti-bsp/conf/machine/am335x-evm.conf
+++ b/meta-ti-bsp/conf/machine/am335x-evm.conf
@@ -4,7 +4,6 @@
require conf/machine/include/ti33x.inc
-MACHINE_GUI_CLASS = "smallscreen"
MACHINE_FEATURES += "screen touchscreen"
IMAGE_FSTYPES += "ubifs ubi"
diff --git a/meta-ti-bsp/conf/machine/am437x-evm.conf b/meta-ti-bsp/conf/machine/am437x-evm.conf
index 4e3681d5..98602add 100644
--- a/meta-ti-bsp/conf/machine/am437x-evm.conf
+++ b/meta-ti-bsp/conf/machine/am437x-evm.conf
@@ -4,7 +4,6 @@
require conf/machine/include/ti43x.inc
-MACHINE_GUI_CLASS = "smallscreen"
MACHINE_FEATURES += "touchscreen"
IMAGE_FSTYPES += "ubifs ubi"
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index 7b353129..911b59bd 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -29,8 +29,6 @@ EXTRA_IMAGEDEPENDS += "virtual/bootloader"
TFA_PLATFORM = "k3"
TFA_BOARD = "generic"
-MACHINE_GUI_CLASS = "smallscreen"
-
# Use the expected value of the ubifs filesystem's volume name in the kernel
# and u-boot.
UBI_VOLNAME = "rootfs"
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc
index 8ab614f0..f548f3fd 100644
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -40,13 +40,6 @@ UBOOT_SUFFIX = "img"
EXTRA_IMAGEDEPENDS += "virtual/bootloader"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-XSERVER = "xserver-xorg \
- xf86-input-evdev \
- xf86-video-fbdev"
-
-MACHINE_GUI_CLASS = "smallscreen"
-
# Use the expected value of the ubifs filesystem's volume name in the kernel
# and u-boot.
UBI_VOLNAME = "rootfs"
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc
index 06d35f09..cfacc30d 100644
--- a/meta-ti-bsp/conf/machine/include/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -4,15 +4,6 @@ SOC_FAMILY:append = ":ti33x"
DEFAULTTUNE ?= "armv7athf-neon"
require conf/machine/include/arm/armv7a/tune-cortexa8.inc
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-
-# For built-in LCD, add xf86-input-tslib
-XSERVER = "xserver-xorg \
- xf86-input-evdev \
- xf86-input-mouse \
- xf86-video-fbdev \
- xf86-input-keyboard"
-
# Increase this everytime you change something in the kernel
MACHINE_KERNEL_PR = "r22"
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc
index 98b374a1..0da5f761 100644
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -4,18 +4,6 @@ SOC_FAMILY:append = ":ti43x"
DEFAULTTUNE ?= "armv7athf-neon"
require conf/machine/include/arm/armv7a/tune-cortexa9.inc
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-
-# For built-in LCD, add xf86-input-tslib
-XSERVER = "xserver-xorg \
- xf86-input-evdev \
- xf86-input-mouse \
- xf86-video-fbdev \
- xf86-input-keyboard"
-
-# Default to external video, change to smallscreen for built-in LCD
-MACHINE_GUI_CLASS = "bigscreen"
-
# Increase this everytime you change something in the kernel
MACHINE_KERNEL_PR = "r3"
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [master][PATCH 5/5] ti-rtos-firmware: remove duplicate assignment
2022-05-05 17:44 [master][PATCH 1/5] am62xx, j721s2: move "gpu" machine feature from machine to soc config Denys Dmytriyenko
` (2 preceding siblings ...)
2022-05-05 17:44 ` [master][PATCH 4/5] conf/machine: remove default setting for xorg Denys Dmytriyenko
@ 2022-05-05 17:44 ` Denys Dmytriyenko
2022-05-05 19:23 ` [meta-ti] [master][PATCH 1/5] am62xx, j721s2: move "gpu" machine feature from machine to soc config Ryan Eatmon
4 siblings, 0 replies; 6+ messages in thread
From: Denys Dmytriyenko @ 2022-05-05 17:44 UTC (permalink / raw)
To: meta-ti; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@konsulko.com>
FILES:${PN} is being assigned twice, remove duplicate.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
index f3912784..93429570 100644
--- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
+++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
@@ -33,8 +33,6 @@ PR = "${INC_PR}.0"
# Secure Build
DEPENDS += "openssl-native"
-FILES:${PN} += "${nonarch_base_libdir}"
-
TI_SECURE_DEV_PKG ?= ""
RTOS_ETH_FW_DIR = "${S}/ti-eth/${PLAT_SFX}"
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-ti] [master][PATCH 1/5] am62xx, j721s2: move "gpu" machine feature from machine to soc config
2022-05-05 17:44 [master][PATCH 1/5] am62xx, j721s2: move "gpu" machine feature from machine to soc config Denys Dmytriyenko
` (3 preceding siblings ...)
2022-05-05 17:44 ` [master][PATCH 5/5] ti-rtos-firmware: remove duplicate assignment Denys Dmytriyenko
@ 2022-05-05 19:23 ` Ryan Eatmon
4 siblings, 0 replies; 6+ messages in thread
From: Ryan Eatmon @ 2022-05-05 19:23 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-ti; +Cc: Denys Dmytriyenko
Series applied to master.
On 5/5/2022 12:44, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@konsulko.com>
>
> In most cases machine features should be set in the corresponding SoC config
> to be applicable to different machine variants, like GP, HS or custom board.
>
> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
> meta-ti-bsp/conf/machine/am62xx-evm.conf | 2 --
> meta-ti-bsp/conf/machine/include/am62xx.inc | 2 +-
> meta-ti-bsp/conf/machine/include/j721s2.inc | 2 ++
> meta-ti-bsp/conf/machine/j721s2-evm.conf | 2 --
> 4 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
> index 44f46d78..33b3294e 100644
> --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
> +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
> @@ -4,8 +4,6 @@
>
> require conf/machine/include/am62xx.inc
>
> -MACHINE_FEATURES += "gpu"
> -
> KERNEL_DEVICETREE = " \
> ti/k3-am625-sk.dtb \
> ti/k3-am625-sk-csi2-ov5640.dtb \
> diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
> index f3bde639..56cd7c20 100644
> --- a/meta-ti-bsp/conf/machine/include/am62xx.inc
> +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
> @@ -1,7 +1,7 @@
> 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}"
> diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc
> index 113f86c4..06654179 100644
> --- a/meta-ti-bsp/conf/machine/include/j721s2.inc
> +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
> @@ -1,2 +1,4 @@
> require conf/machine/include/j7.inc
> SOC_FAMILY:append = ":j721s2"
> +
> +MACHINE_FEATURES += "gpu"
> diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
> index 5d977776..a2c15f74 100644
> --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
> +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
> @@ -4,8 +4,6 @@
>
> require conf/machine/include/j721s2.inc
>
> -MACHINE_FEATURES += "gpu"
> -
> SERIAL_CONSOLES = "115200;ttyS10"
> SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> TFA_K3_USART = "0x8"
>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#14706): https://lists.yoctoproject.org/g/meta-ti/message/14706
> Mute This Topic: https://lists.yoctoproject.org/mt/90916827/6551054
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Ryan Eatmon reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-05-05 19:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-05 17:44 [master][PATCH 1/5] am62xx, j721s2: move "gpu" machine feature from machine to soc config Denys Dmytriyenko
2022-05-05 17:44 ` [master][PATCH 2/5] conf/machine: add preferences for 3D graphics providers Denys Dmytriyenko
2022-05-05 17:44 ` [master][PATCH 3/5] conf/machine: make default PREFERRED_PROVIDERs easy to override Denys Dmytriyenko
2022-05-05 17:44 ` [master][PATCH 4/5] conf/machine: remove default setting for xorg Denys Dmytriyenko
2022-05-05 17:44 ` [master][PATCH 5/5] ti-rtos-firmware: remove duplicate assignment Denys Dmytriyenko
2022-05-05 19:23 ` [meta-ti] [master][PATCH 1/5] am62xx, j721s2: move "gpu" machine feature from machine to soc config Ryan Eatmon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).