[master,1/5] am62xx, j721s2: move "gpu" machine feature from machine to soc config

Message ID 20220505174422.334666-1-denis@denix.org
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [master,1/5] am62xx, j721s2: move "gpu" machine feature from machine to soc config | expand

Commit Message

Denys Dmytriyenko May 5, 2022, 5:44 p.m. UTC
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(-)

Comments

Ryan Eatmon May 5, 2022, 7:23 p.m. UTC | #1
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]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Patch

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"