* [meta-ti][master/kirkstone][PATCH] conf: machine: Set common default SERIAL_CONSOLES for all K3
@ 2023-04-05 18:50 Andrew Davis
2023-04-05 23:49 ` Denys Dmytriyenko
0 siblings, 1 reply; 5+ messages in thread
From: Andrew Davis @ 2023-04-05 18:50 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis
The traditional order of serial consoles for K3 has ttyS2 being the
primary UART attached console. ttyS0 is also a common choice for
distros and the TI kernel may switch at some point. To prepare
we check both UARTs on all K3 devices. Move this common check
to a K3 common location.
Signed-off-by: Andrew Davis <afd@ti.com>
---
meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 ---
meta-ti-bsp/conf/machine/include/am62axx.inc | 3 ---
meta-ti-bsp/conf/machine/include/am62xx-lp.inc | 3 ---
meta-ti-bsp/conf/machine/include/am62xx.inc | 3 ---
meta-ti-bsp/conf/machine/include/am64xx.inc | 3 ---
meta-ti-bsp/conf/machine/include/am65xx.inc | 3 ---
meta-ti-bsp/conf/machine/include/k3.inc | 3 +++
meta-ti-bsp/conf/machine/j7200-evm.conf | 3 ---
meta-ti-bsp/conf/machine/j721e-evm.conf | 3 ---
meta-ti-bsp/conf/machine/j721s2-evm.conf | 2 --
meta-ti-bsp/conf/machine/j721s2-hs-evm.conf | 3 ---
meta-ti-bsp/conf/machine/j784s4-evm.conf | 2 --
meta-ti-bsp/conf/machine/j784s4-hs-evm.conf | 2 --
13 files changed, 3 insertions(+), 33 deletions(-)
diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
index 6e8c863c..e6cba3df 100644
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
@@ -4,9 +4,6 @@
require conf/machine/include/j721e.inc
-SERIAL_CONSOLES = "115200;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
UBOOT_MACHINE = "j721e_evm_a72_config"
PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc
index d0970948..0c6b8503 100644
--- a/meta-ti-bsp/conf/machine/include/am62axx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
@@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am62axx"
MACHINE_FEATURES += "screen touchscreen"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
TFA_K3_SYSTEM_SUSPEND = "1"
# Default tiboot3.bin on AM62A is for HS-FS
diff --git a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
index d37d4673..4601603c 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
@@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am62xx"
MACHINE_FEATURES += "screen touchscreen"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
TFA_K3_SYSTEM_SUSPEND = "1"
# Default tiboot3.bin on AM62x LP is for HS-FS
diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
index af6a6db4..953128cc 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am62xx"
MACHINE_FEATURES += "screen gpu"
-SERIAL_CONSOLES = "115200;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
# Default tiboot3.bin on AM62x is for HS-FS
diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc
index 157bf5d5..c486f3c1 100644
--- a/meta-ti-bsp/conf/machine/include/am64xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
@@ -1,9 +1,6 @@
require conf/machine/include/k3.inc
SOC_FAMILY:append = ":am64xx"
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
KERNEL_DEVICETREE_PREFIX = "ti/k3-am642"
KERNEL_DEVICETREE = " \
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
index 564d61b0..b848881c 100644
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am65xx"
MACHINE_FEATURES += "screen touchscreen gpu"
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
PREFERRED_PROVIDER_virtual/gpudriver ?= ""
KERNEL_DEVICETREE_PREFIX = "ti/k3-am654"
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index 93bcea76..5c3c771a 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -53,3 +53,6 @@ MACHINE_FEATURES += "efi"
WKS_FILE ?= "sdimage-2part-efi.wks"
do_image_wic[depends] += "virtual/bootloader:do_deploy"
do_image_wic[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"
+
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf
index b17b65b7..dff1da69 100644
--- a/meta-ti-bsp/conf/machine/j7200-evm.conf
+++ b/meta-ti-bsp/conf/machine/j7200-evm.conf
@@ -4,9 +4,6 @@
require conf/machine/include/j7200.inc
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
KERNEL_DEVICETREE_PREFIX = "ti/k3-j7200"
KERNEL_DEVICETREE = " \
diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf
index f602a77b..8682ad60 100644
--- a/meta-ti-bsp/conf/machine/j721e-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721e-evm.conf
@@ -4,9 +4,6 @@
require conf/machine/include/j721e.inc
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
KERNEL_DEVICETREE_PREFIX = " \
ti/k3-j721e \
ti/k3-j7200-mcspi-loopback \
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index 1f54c7b1..a16e744d 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
-SERIAL_CONSOLES = "115200;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
TFA_K3_USART = "0x8"
OPTEE_K3_USART = "0x8"
diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
index 8fa98440..085c91e7 100644
--- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
@@ -4,9 +4,6 @@
require conf/machine/include/j721s2.inc
-SERIAL_CONSOLES = "115200;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
TFA_K3_USART = "0x8"
OPTEE_K3_USART = "0x8"
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
index 53bb4e4f..c0483505 100644
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -4,8 +4,6 @@
require conf/machine/include/j784s4.inc
-SERIAL_CONSOLES = "115200;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
TFA_K3_USART = "0x8"
OPTEE_K3_USART = "0x8"
diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
index 1c56f55a..4deb0f8b 100644
--- a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
@@ -4,8 +4,6 @@
require conf/machine/include/j784s4.inc
-SERIAL_CONSOLES = "115200;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
TFA_K3_USART = "0x8"
OPTEEMACHINE = "k3-j784s4"
OPTEE_K3_USART = "0x8"
--
2.39.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH] conf: machine: Set common default SERIAL_CONSOLES for all K3
2023-04-05 18:50 [meta-ti][master/kirkstone][PATCH] conf: machine: Set common default SERIAL_CONSOLES for all K3 Andrew Davis
@ 2023-04-05 23:49 ` Denys Dmytriyenko
2023-04-11 17:27 ` Andrew Davis
0 siblings, 1 reply; 5+ messages in thread
From: Denys Dmytriyenko @ 2023-04-05 23:49 UTC (permalink / raw)
To: afd; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
On Wed, Apr 05, 2023 at 01:50:27PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> The traditional order of serial consoles for K3 has ttyS2 being the
> primary UART attached console. ttyS0 is also a common choice for
> distros and the TI kernel may switch at some point. To prepare
> we check both UARTs on all K3 devices. Move this common check
> to a K3 common location.
I see different K3 platforms use ttyS0, ttyS1, ttyS2 and ttyS3.
Were others just mis-used as MCU UARTs or some other leftovers?
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
> meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 ---
> meta-ti-bsp/conf/machine/include/am62axx.inc | 3 ---
> meta-ti-bsp/conf/machine/include/am62xx-lp.inc | 3 ---
> meta-ti-bsp/conf/machine/include/am62xx.inc | 3 ---
> meta-ti-bsp/conf/machine/include/am64xx.inc | 3 ---
> meta-ti-bsp/conf/machine/include/am65xx.inc | 3 ---
> meta-ti-bsp/conf/machine/include/k3.inc | 3 +++
> meta-ti-bsp/conf/machine/j7200-evm.conf | 3 ---
> meta-ti-bsp/conf/machine/j721e-evm.conf | 3 ---
> meta-ti-bsp/conf/machine/j721s2-evm.conf | 2 --
> meta-ti-bsp/conf/machine/j721s2-hs-evm.conf | 3 ---
> meta-ti-bsp/conf/machine/j784s4-evm.conf | 2 --
> meta-ti-bsp/conf/machine/j784s4-hs-evm.conf | 2 --
> 13 files changed, 3 insertions(+), 33 deletions(-)
>
> diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> index 6e8c863c..e6cba3df 100644
> --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> @@ -4,9 +4,6 @@
>
> require conf/machine/include/j721e.inc
>
> -SERIAL_CONSOLES = "115200;ttyS2"
> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> -
> UBOOT_MACHINE = "j721e_evm_a72_config"
>
> PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
> diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc
> index d0970948..0c6b8503 100644
> --- a/meta-ti-bsp/conf/machine/include/am62axx.inc
> +++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
> @@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am62axx"
>
> MACHINE_FEATURES += "screen touchscreen"
>
> -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> -
> TFA_K3_SYSTEM_SUSPEND = "1"
>
> # Default tiboot3.bin on AM62A is for HS-FS
> diff --git a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
> index d37d4673..4601603c 100644
> --- a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
> +++ b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
> @@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am62xx"
>
> MACHINE_FEATURES += "screen touchscreen"
>
> -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> -
> TFA_K3_SYSTEM_SUSPEND = "1"
>
> # Default tiboot3.bin on AM62x LP is for HS-FS
> diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
> index af6a6db4..953128cc 100644
> --- a/meta-ti-bsp/conf/machine/include/am62xx.inc
> +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
> @@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am62xx"
>
> MACHINE_FEATURES += "screen gpu"
>
> -SERIAL_CONSOLES = "115200;ttyS2"
> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> -
> PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
>
> # Default tiboot3.bin on AM62x is for HS-FS
> diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc
> index 157bf5d5..c486f3c1 100644
> --- a/meta-ti-bsp/conf/machine/include/am64xx.inc
> +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
> @@ -1,9 +1,6 @@
> require conf/machine/include/k3.inc
> SOC_FAMILY:append = ":am64xx"
>
> -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> -
> KERNEL_DEVICETREE_PREFIX = "ti/k3-am642"
>
> KERNEL_DEVICETREE = " \
> diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
> index 564d61b0..b848881c 100644
> --- a/meta-ti-bsp/conf/machine/include/am65xx.inc
> +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
> @@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am65xx"
>
> MACHINE_FEATURES += "screen touchscreen gpu"
>
> -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> -
> PREFERRED_PROVIDER_virtual/gpudriver ?= ""
>
> KERNEL_DEVICETREE_PREFIX = "ti/k3-am654"
> diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
> index 93bcea76..5c3c771a 100644
> --- a/meta-ti-bsp/conf/machine/include/k3.inc
> +++ b/meta-ti-bsp/conf/machine/include/k3.inc
> @@ -53,3 +53,6 @@ MACHINE_FEATURES += "efi"
> WKS_FILE ?= "sdimage-2part-efi.wks"
> do_image_wic[depends] += "virtual/bootloader:do_deploy"
> do_image_wic[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"
> +
> +SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
> +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf
> index b17b65b7..dff1da69 100644
> --- a/meta-ti-bsp/conf/machine/j7200-evm.conf
> +++ b/meta-ti-bsp/conf/machine/j7200-evm.conf
> @@ -4,9 +4,6 @@
>
> require conf/machine/include/j7200.inc
>
> -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> -
> KERNEL_DEVICETREE_PREFIX = "ti/k3-j7200"
>
> KERNEL_DEVICETREE = " \
> diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf
> index f602a77b..8682ad60 100644
> --- a/meta-ti-bsp/conf/machine/j721e-evm.conf
> +++ b/meta-ti-bsp/conf/machine/j721e-evm.conf
> @@ -4,9 +4,6 @@
>
> require conf/machine/include/j721e.inc
>
> -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> -
> KERNEL_DEVICETREE_PREFIX = " \
> ti/k3-j721e \
> ti/k3-j7200-mcspi-loopback \
> diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
> index 1f54c7b1..a16e744d 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
>
> -SERIAL_CONSOLES = "115200;ttyS2"
> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> TFA_K3_USART = "0x8"
> OPTEE_K3_USART = "0x8"
>
> diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
> index 8fa98440..085c91e7 100644
> --- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
> +++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
> @@ -4,9 +4,6 @@
>
> require conf/machine/include/j721s2.inc
>
> -SERIAL_CONSOLES = "115200;ttyS2"
> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> -
> TFA_K3_USART = "0x8"
> OPTEE_K3_USART = "0x8"
>
> diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
> index 53bb4e4f..c0483505 100644
> --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
> +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
> @@ -4,8 +4,6 @@
>
> require conf/machine/include/j784s4.inc
>
> -SERIAL_CONSOLES = "115200;ttyS2"
> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> TFA_K3_USART = "0x8"
> OPTEE_K3_USART = "0x8"
>
> diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
> index 1c56f55a..4deb0f8b 100644
> --- a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
> +++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
> @@ -4,8 +4,6 @@
>
> require conf/machine/include/j784s4.inc
>
> -SERIAL_CONSOLES = "115200;ttyS2"
> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> TFA_K3_USART = "0x8"
> OPTEEMACHINE = "k3-j784s4"
> OPTEE_K3_USART = "0x8"
> --
> 2.39.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH] conf: machine: Set common default SERIAL_CONSOLES for all K3
2023-04-05 23:49 ` Denys Dmytriyenko
@ 2023-04-11 17:27 ` Andrew Davis
2023-04-11 18:59 ` Denys Dmytriyenko
0 siblings, 1 reply; 5+ messages in thread
From: Andrew Davis @ 2023-04-11 17:27 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
On 4/5/23 6:49 PM, Denys Dmytriyenko wrote:
> On Wed, Apr 05, 2023 at 01:50:27PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>> The traditional order of serial consoles for K3 has ttyS2 being the
>> primary UART attached console. ttyS0 is also a common choice for
>> distros and the TI kernel may switch at some point. To prepare
>> we check both UARTs on all K3 devices. Move this common check
>> to a K3 common location.
>
> I see different K3 platforms use ttyS0, ttyS1, ttyS2 and ttyS3.
>
> Were others just mis-used as MCU UARTs or some other leftovers?
>
Some look to be just misusing MCU UARTs, others types/leftovers.
Hopefully this patch unifies everything. If one wants to use
a different port then these two then can be chosen in DT.
Andrew
>
>> Signed-off-by: Andrew Davis <afd@ti.com>
>> ---
>> meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 ---
>> meta-ti-bsp/conf/machine/include/am62axx.inc | 3 ---
>> meta-ti-bsp/conf/machine/include/am62xx-lp.inc | 3 ---
>> meta-ti-bsp/conf/machine/include/am62xx.inc | 3 ---
>> meta-ti-bsp/conf/machine/include/am64xx.inc | 3 ---
>> meta-ti-bsp/conf/machine/include/am65xx.inc | 3 ---
>> meta-ti-bsp/conf/machine/include/k3.inc | 3 +++
>> meta-ti-bsp/conf/machine/j7200-evm.conf | 3 ---
>> meta-ti-bsp/conf/machine/j721e-evm.conf | 3 ---
>> meta-ti-bsp/conf/machine/j721s2-evm.conf | 2 --
>> meta-ti-bsp/conf/machine/j721s2-hs-evm.conf | 3 ---
>> meta-ti-bsp/conf/machine/j784s4-evm.conf | 2 --
>> meta-ti-bsp/conf/machine/j784s4-hs-evm.conf | 2 --
>> 13 files changed, 3 insertions(+), 33 deletions(-)
>>
>> diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>> index 6e8c863c..e6cba3df 100644
>> --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>> +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>> @@ -4,9 +4,6 @@
>>
>> require conf/machine/include/j721e.inc
>>
>> -SERIAL_CONSOLES = "115200;ttyS2"
>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>> -
>> UBOOT_MACHINE = "j721e_evm_a72_config"
>>
>> PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
>> diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc
>> index d0970948..0c6b8503 100644
>> --- a/meta-ti-bsp/conf/machine/include/am62axx.inc
>> +++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
>> @@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am62axx"
>>
>> MACHINE_FEATURES += "screen touchscreen"
>>
>> -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>> -
>> TFA_K3_SYSTEM_SUSPEND = "1"
>>
>> # Default tiboot3.bin on AM62A is for HS-FS
>> diff --git a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
>> index d37d4673..4601603c 100644
>> --- a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
>> +++ b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
>> @@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am62xx"
>>
>> MACHINE_FEATURES += "screen touchscreen"
>>
>> -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>> -
>> TFA_K3_SYSTEM_SUSPEND = "1"
>>
>> # Default tiboot3.bin on AM62x LP is for HS-FS
>> diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
>> index af6a6db4..953128cc 100644
>> --- a/meta-ti-bsp/conf/machine/include/am62xx.inc
>> +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
>> @@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am62xx"
>>
>> MACHINE_FEATURES += "screen gpu"
>>
>> -SERIAL_CONSOLES = "115200;ttyS2"
>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>> -
>> PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
>>
>> # Default tiboot3.bin on AM62x is for HS-FS
>> diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc
>> index 157bf5d5..c486f3c1 100644
>> --- a/meta-ti-bsp/conf/machine/include/am64xx.inc
>> +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
>> @@ -1,9 +1,6 @@
>> require conf/machine/include/k3.inc
>> SOC_FAMILY:append = ":am64xx"
>>
>> -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>> -
>> KERNEL_DEVICETREE_PREFIX = "ti/k3-am642"
>>
>> KERNEL_DEVICETREE = " \
>> diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
>> index 564d61b0..b848881c 100644
>> --- a/meta-ti-bsp/conf/machine/include/am65xx.inc
>> +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
>> @@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am65xx"
>>
>> MACHINE_FEATURES += "screen touchscreen gpu"
>>
>> -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>> -
>> PREFERRED_PROVIDER_virtual/gpudriver ?= ""
>>
>> KERNEL_DEVICETREE_PREFIX = "ti/k3-am654"
>> diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
>> index 93bcea76..5c3c771a 100644
>> --- a/meta-ti-bsp/conf/machine/include/k3.inc
>> +++ b/meta-ti-bsp/conf/machine/include/k3.inc
>> @@ -53,3 +53,6 @@ MACHINE_FEATURES += "efi"
>> WKS_FILE ?= "sdimage-2part-efi.wks"
>> do_image_wic[depends] += "virtual/bootloader:do_deploy"
>> do_image_wic[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"
>> +
>> +SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
>> +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>> diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf
>> index b17b65b7..dff1da69 100644
>> --- a/meta-ti-bsp/conf/machine/j7200-evm.conf
>> +++ b/meta-ti-bsp/conf/machine/j7200-evm.conf
>> @@ -4,9 +4,6 @@
>>
>> require conf/machine/include/j7200.inc
>>
>> -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>> -
>> KERNEL_DEVICETREE_PREFIX = "ti/k3-j7200"
>>
>> KERNEL_DEVICETREE = " \
>> diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf
>> index f602a77b..8682ad60 100644
>> --- a/meta-ti-bsp/conf/machine/j721e-evm.conf
>> +++ b/meta-ti-bsp/conf/machine/j721e-evm.conf
>> @@ -4,9 +4,6 @@
>>
>> require conf/machine/include/j721e.inc
>>
>> -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>> -
>> KERNEL_DEVICETREE_PREFIX = " \
>> ti/k3-j721e \
>> ti/k3-j7200-mcspi-loopback \
>> diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
>> index 1f54c7b1..a16e744d 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
>>
>> -SERIAL_CONSOLES = "115200;ttyS2"
>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>> TFA_K3_USART = "0x8"
>> OPTEE_K3_USART = "0x8"
>>
>> diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
>> index 8fa98440..085c91e7 100644
>> --- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
>> +++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
>> @@ -4,9 +4,6 @@
>>
>> require conf/machine/include/j721s2.inc
>>
>> -SERIAL_CONSOLES = "115200;ttyS2"
>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>> -
>> TFA_K3_USART = "0x8"
>> OPTEE_K3_USART = "0x8"
>>
>> diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
>> index 53bb4e4f..c0483505 100644
>> --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
>> +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
>> @@ -4,8 +4,6 @@
>>
>> require conf/machine/include/j784s4.inc
>>
>> -SERIAL_CONSOLES = "115200;ttyS2"
>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>> TFA_K3_USART = "0x8"
>> OPTEE_K3_USART = "0x8"
>>
>> diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
>> index 1c56f55a..4deb0f8b 100644
>> --- a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
>> +++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
>> @@ -4,8 +4,6 @@
>>
>> require conf/machine/include/j784s4.inc
>>
>> -SERIAL_CONSOLES = "115200;ttyS2"
>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>> TFA_K3_USART = "0x8"
>> OPTEEMACHINE = "k3-j784s4"
>> OPTEE_K3_USART = "0x8"
>> --
>> 2.39.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH] conf: machine: Set common default SERIAL_CONSOLES for all K3
2023-04-11 17:27 ` Andrew Davis
@ 2023-04-11 18:59 ` Denys Dmytriyenko
2023-04-11 19:11 ` Andrew Davis
0 siblings, 1 reply; 5+ messages in thread
From: Denys Dmytriyenko @ 2023-04-11 18:59 UTC (permalink / raw)
To: Andrew Davis; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
On Tue, Apr 11, 2023 at 12:27:10PM -0500, Andrew Davis wrote:
> On 4/5/23 6:49 PM, Denys Dmytriyenko wrote:
> >On Wed, Apr 05, 2023 at 01:50:27PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> >>The traditional order of serial consoles for K3 has ttyS2 being the
> >>primary UART attached console. ttyS0 is also a common choice for
> >>distros and the TI kernel may switch at some point. To prepare
> >>we check both UARTs on all K3 devices. Move this common check
> >>to a K3 common location.
> >
> >I see different K3 platforms use ttyS0, ttyS1, ttyS2 and ttyS3.
> >
> >Were others just mis-used as MCU UARTs or some other leftovers?
> >
>
> Some look to be just misusing MCU UARTs, others types/leftovers.
> Hopefully this patch unifies everything. If one wants to use
> a different port then these two then can be chosen in DT.
Are there any derivative boards (like SK or other product-specific spins) that
use a different main UART? I remember in pre-K3 days that used to be the case
for some platforms, where EVM uses one UART and SK/ICE/etc. a different one...
> >>Signed-off-by: Andrew Davis <afd@ti.com>
> >>---
> >> meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 ---
> >> meta-ti-bsp/conf/machine/include/am62axx.inc | 3 ---
> >> meta-ti-bsp/conf/machine/include/am62xx-lp.inc | 3 ---
> >> meta-ti-bsp/conf/machine/include/am62xx.inc | 3 ---
> >> meta-ti-bsp/conf/machine/include/am64xx.inc | 3 ---
> >> meta-ti-bsp/conf/machine/include/am65xx.inc | 3 ---
> >> meta-ti-bsp/conf/machine/include/k3.inc | 3 +++
> >> meta-ti-bsp/conf/machine/j7200-evm.conf | 3 ---
> >> meta-ti-bsp/conf/machine/j721e-evm.conf | 3 ---
> >> meta-ti-bsp/conf/machine/j721s2-evm.conf | 2 --
> >> meta-ti-bsp/conf/machine/j721s2-hs-evm.conf | 3 ---
> >> meta-ti-bsp/conf/machine/j784s4-evm.conf | 2 --
> >> meta-ti-bsp/conf/machine/j784s4-hs-evm.conf | 2 --
> >> 13 files changed, 3 insertions(+), 33 deletions(-)
> >>
> >>diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >>index 6e8c863c..e6cba3df 100644
> >>--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >>+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >>@@ -4,9 +4,6 @@
> >> require conf/machine/include/j721e.inc
> >>-SERIAL_CONSOLES = "115200;ttyS2"
> >>-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> >>-
> >> UBOOT_MACHINE = "j721e_evm_a72_config"
> >> PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
> >>diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc
> >>index d0970948..0c6b8503 100644
> >>--- a/meta-ti-bsp/conf/machine/include/am62axx.inc
> >>+++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
> >>@@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am62axx"
> >> MACHINE_FEATURES += "screen touchscreen"
> >>-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
> >>-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> >>-
> >> TFA_K3_SYSTEM_SUSPEND = "1"
> >> # Default tiboot3.bin on AM62A is for HS-FS
> >>diff --git a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
> >>index d37d4673..4601603c 100644
> >>--- a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
> >>+++ b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
> >>@@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am62xx"
> >> MACHINE_FEATURES += "screen touchscreen"
> >>-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
> >>-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> >>-
> >> TFA_K3_SYSTEM_SUSPEND = "1"
> >> # Default tiboot3.bin on AM62x LP is for HS-FS
> >>diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
> >>index af6a6db4..953128cc 100644
> >>--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
> >>+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
> >>@@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am62xx"
> >> MACHINE_FEATURES += "screen gpu"
> >>-SERIAL_CONSOLES = "115200;ttyS2"
> >>-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> >>-
> >> PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
> >> # Default tiboot3.bin on AM62x is for HS-FS
> >>diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc
> >>index 157bf5d5..c486f3c1 100644
> >>--- a/meta-ti-bsp/conf/machine/include/am64xx.inc
> >>+++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
> >>@@ -1,9 +1,6 @@
> >> require conf/machine/include/k3.inc
> >> SOC_FAMILY:append = ":am64xx"
> >>-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
> >>-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> >>-
> >> KERNEL_DEVICETREE_PREFIX = "ti/k3-am642"
> >> KERNEL_DEVICETREE = " \
> >>diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
> >>index 564d61b0..b848881c 100644
> >>--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
> >>+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
> >>@@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am65xx"
> >> MACHINE_FEATURES += "screen touchscreen gpu"
> >>-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
> >>-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> >>-
> >> PREFERRED_PROVIDER_virtual/gpudriver ?= ""
> >> KERNEL_DEVICETREE_PREFIX = "ti/k3-am654"
> >>diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
> >>index 93bcea76..5c3c771a 100644
> >>--- a/meta-ti-bsp/conf/machine/include/k3.inc
> >>+++ b/meta-ti-bsp/conf/machine/include/k3.inc
> >>@@ -53,3 +53,6 @@ MACHINE_FEATURES += "efi"
> >> WKS_FILE ?= "sdimage-2part-efi.wks"
> >> do_image_wic[depends] += "virtual/bootloader:do_deploy"
> >> do_image_wic[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"
> >>+
> >>+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
> >>+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> >>diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf
> >>index b17b65b7..dff1da69 100644
> >>--- a/meta-ti-bsp/conf/machine/j7200-evm.conf
> >>+++ b/meta-ti-bsp/conf/machine/j7200-evm.conf
> >>@@ -4,9 +4,6 @@
> >> require conf/machine/include/j7200.inc
> >>-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
> >>-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> >>-
> >> KERNEL_DEVICETREE_PREFIX = "ti/k3-j7200"
> >> KERNEL_DEVICETREE = " \
> >>diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf
> >>index f602a77b..8682ad60 100644
> >>--- a/meta-ti-bsp/conf/machine/j721e-evm.conf
> >>+++ b/meta-ti-bsp/conf/machine/j721e-evm.conf
> >>@@ -4,9 +4,6 @@
> >> require conf/machine/include/j721e.inc
> >>-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
> >>-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> >>-
> >> KERNEL_DEVICETREE_PREFIX = " \
> >> ti/k3-j721e \
> >> ti/k3-j7200-mcspi-loopback \
> >>diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
> >>index 1f54c7b1..a16e744d 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
> >>-SERIAL_CONSOLES = "115200;ttyS2"
> >>-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> >> TFA_K3_USART = "0x8"
> >> OPTEE_K3_USART = "0x8"
> >>diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
> >>index 8fa98440..085c91e7 100644
> >>--- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
> >>+++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
> >>@@ -4,9 +4,6 @@
> >> require conf/machine/include/j721s2.inc
> >>-SERIAL_CONSOLES = "115200;ttyS2"
> >>-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> >>-
> >> TFA_K3_USART = "0x8"
> >> OPTEE_K3_USART = "0x8"
> >>diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
> >>index 53bb4e4f..c0483505 100644
> >>--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
> >>+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
> >>@@ -4,8 +4,6 @@
> >> require conf/machine/include/j784s4.inc
> >>-SERIAL_CONSOLES = "115200;ttyS2"
> >>-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> >> TFA_K3_USART = "0x8"
> >> OPTEE_K3_USART = "0x8"
> >>diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
> >>index 1c56f55a..4deb0f8b 100644
> >>--- a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
> >>+++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
> >>@@ -4,8 +4,6 @@
> >> require conf/machine/include/j784s4.inc
> >>-SERIAL_CONSOLES = "115200;ttyS2"
> >>-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> >> TFA_K3_USART = "0x8"
> >> OPTEEMACHINE = "k3-j784s4"
> >> OPTEE_K3_USART = "0x8"
> >>--
> >>2.39.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH] conf: machine: Set common default SERIAL_CONSOLES for all K3
2023-04-11 18:59 ` Denys Dmytriyenko
@ 2023-04-11 19:11 ` Andrew Davis
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Davis @ 2023-04-11 19:11 UTC (permalink / raw)
To: Denys Dmytriyenko, Menon, Nishanth
Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
On 4/11/23 1:59 PM, Denys Dmytriyenko wrote:
> On Tue, Apr 11, 2023 at 12:27:10PM -0500, Andrew Davis wrote:
>> On 4/5/23 6:49 PM, Denys Dmytriyenko wrote:
>>> On Wed, Apr 05, 2023 at 01:50:27PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>>>> The traditional order of serial consoles for K3 has ttyS2 being the
>>>> primary UART attached console. ttyS0 is also a common choice for
>>>> distros and the TI kernel may switch at some point. To prepare
>>>> we check both UARTs on all K3 devices. Move this common check
>>>> to a K3 common location.
>>>
>>> I see different K3 platforms use ttyS0, ttyS1, ttyS2 and ttyS3.
>>>
>>> Were others just mis-used as MCU UARTs or some other leftovers?
>>>
>>
>> Some look to be just misusing MCU UARTs, others types/leftovers.
>> Hopefully this patch unifies everything. If one wants to use
>> a different port then these two then can be chosen in DT.
>
> Are there any derivative boards (like SK or other product-specific spins) that
> use a different main UART? I remember in pre-K3 days that used to be the case
> for some platforms, where EVM uses one UART and SK/ICE/etc. a different one...
>
Probably, in those cases we now use DT aliases and make the default serial
port always ttyS0*. That allows us to fix these differences in the kernel
instead of out here in the integration layers. Since non-Arago distro's
always expect ttyS0, anything else doesn't work.
*(well ttyS2 for some K3 platforms even though it breaks our
multi-distro story for any distro that is not Arago. Guess since it
was broken before, we want to be "backwards compatible" with "broken"
and keep it broken forever, IDK ask +Nishanth /rant)
Andrew
>
>>>> Signed-off-by: Andrew Davis <afd@ti.com>
>>>> ---
>>>> meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 ---
>>>> meta-ti-bsp/conf/machine/include/am62axx.inc | 3 ---
>>>> meta-ti-bsp/conf/machine/include/am62xx-lp.inc | 3 ---
>>>> meta-ti-bsp/conf/machine/include/am62xx.inc | 3 ---
>>>> meta-ti-bsp/conf/machine/include/am64xx.inc | 3 ---
>>>> meta-ti-bsp/conf/machine/include/am65xx.inc | 3 ---
>>>> meta-ti-bsp/conf/machine/include/k3.inc | 3 +++
>>>> meta-ti-bsp/conf/machine/j7200-evm.conf | 3 ---
>>>> meta-ti-bsp/conf/machine/j721e-evm.conf | 3 ---
>>>> meta-ti-bsp/conf/machine/j721s2-evm.conf | 2 --
>>>> meta-ti-bsp/conf/machine/j721s2-hs-evm.conf | 3 ---
>>>> meta-ti-bsp/conf/machine/j784s4-evm.conf | 2 --
>>>> meta-ti-bsp/conf/machine/j784s4-hs-evm.conf | 2 --
>>>> 13 files changed, 3 insertions(+), 33 deletions(-)
>>>>
>>>> diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>>>> index 6e8c863c..e6cba3df 100644
>>>> --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>>>> +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>>>> @@ -4,9 +4,6 @@
>>>> require conf/machine/include/j721e.inc
>>>> -SERIAL_CONSOLES = "115200;ttyS2"
>>>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>>>> -
>>>> UBOOT_MACHINE = "j721e_evm_a72_config"
>>>> PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
>>>> diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc
>>>> index d0970948..0c6b8503 100644
>>>> --- a/meta-ti-bsp/conf/machine/include/am62axx.inc
>>>> +++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
>>>> @@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am62axx"
>>>> MACHINE_FEATURES += "screen touchscreen"
>>>> -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
>>>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>>>> -
>>>> TFA_K3_SYSTEM_SUSPEND = "1"
>>>> # Default tiboot3.bin on AM62A is for HS-FS
>>>> diff --git a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
>>>> index d37d4673..4601603c 100644
>>>> --- a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
>>>> +++ b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc
>>>> @@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am62xx"
>>>> MACHINE_FEATURES += "screen touchscreen"
>>>> -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
>>>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>>>> -
>>>> TFA_K3_SYSTEM_SUSPEND = "1"
>>>> # Default tiboot3.bin on AM62x LP is for HS-FS
>>>> diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
>>>> index af6a6db4..953128cc 100644
>>>> --- a/meta-ti-bsp/conf/machine/include/am62xx.inc
>>>> +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
>>>> @@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am62xx"
>>>> MACHINE_FEATURES += "screen gpu"
>>>> -SERIAL_CONSOLES = "115200;ttyS2"
>>>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>>>> -
>>>> PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
>>>> # Default tiboot3.bin on AM62x is for HS-FS
>>>> diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc
>>>> index 157bf5d5..c486f3c1 100644
>>>> --- a/meta-ti-bsp/conf/machine/include/am64xx.inc
>>>> +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
>>>> @@ -1,9 +1,6 @@
>>>> require conf/machine/include/k3.inc
>>>> SOC_FAMILY:append = ":am64xx"
>>>> -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
>>>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>>>> -
>>>> KERNEL_DEVICETREE_PREFIX = "ti/k3-am642"
>>>> KERNEL_DEVICETREE = " \
>>>> diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
>>>> index 564d61b0..b848881c 100644
>>>> --- a/meta-ti-bsp/conf/machine/include/am65xx.inc
>>>> +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
>>>> @@ -3,9 +3,6 @@ SOC_FAMILY:append = ":am65xx"
>>>> MACHINE_FEATURES += "screen touchscreen gpu"
>>>> -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
>>>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>>>> -
>>>> PREFERRED_PROVIDER_virtual/gpudriver ?= ""
>>>> KERNEL_DEVICETREE_PREFIX = "ti/k3-am654"
>>>> diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
>>>> index 93bcea76..5c3c771a 100644
>>>> --- a/meta-ti-bsp/conf/machine/include/k3.inc
>>>> +++ b/meta-ti-bsp/conf/machine/include/k3.inc
>>>> @@ -53,3 +53,6 @@ MACHINE_FEATURES += "efi"
>>>> WKS_FILE ?= "sdimage-2part-efi.wks"
>>>> do_image_wic[depends] += "virtual/bootloader:do_deploy"
>>>> do_image_wic[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"
>>>> +
>>>> +SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
>>>> +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>>>> diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf
>>>> index b17b65b7..dff1da69 100644
>>>> --- a/meta-ti-bsp/conf/machine/j7200-evm.conf
>>>> +++ b/meta-ti-bsp/conf/machine/j7200-evm.conf
>>>> @@ -4,9 +4,6 @@
>>>> require conf/machine/include/j7200.inc
>>>> -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
>>>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>>>> -
>>>> KERNEL_DEVICETREE_PREFIX = "ti/k3-j7200"
>>>> KERNEL_DEVICETREE = " \
>>>> diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf
>>>> index f602a77b..8682ad60 100644
>>>> --- a/meta-ti-bsp/conf/machine/j721e-evm.conf
>>>> +++ b/meta-ti-bsp/conf/machine/j721e-evm.conf
>>>> @@ -4,9 +4,6 @@
>>>> require conf/machine/include/j721e.inc
>>>> -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
>>>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>>>> -
>>>> KERNEL_DEVICETREE_PREFIX = " \
>>>> ti/k3-j721e \
>>>> ti/k3-j7200-mcspi-loopback \
>>>> diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
>>>> index 1f54c7b1..a16e744d 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
>>>> -SERIAL_CONSOLES = "115200;ttyS2"
>>>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>>>> TFA_K3_USART = "0x8"
>>>> OPTEE_K3_USART = "0x8"
>>>> diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
>>>> index 8fa98440..085c91e7 100644
>>>> --- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
>>>> +++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
>>>> @@ -4,9 +4,6 @@
>>>> require conf/machine/include/j721s2.inc
>>>> -SERIAL_CONSOLES = "115200;ttyS2"
>>>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>>>> -
>>>> TFA_K3_USART = "0x8"
>>>> OPTEE_K3_USART = "0x8"
>>>> diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>>> index 53bb4e4f..c0483505 100644
>>>> --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>>> +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>>> @@ -4,8 +4,6 @@
>>>> require conf/machine/include/j784s4.inc
>>>> -SERIAL_CONSOLES = "115200;ttyS2"
>>>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>>>> TFA_K3_USART = "0x8"
>>>> OPTEE_K3_USART = "0x8"
>>>> diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
>>>> index 1c56f55a..4deb0f8b 100644
>>>> --- a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
>>>> +++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
>>>> @@ -4,8 +4,6 @@
>>>> require conf/machine/include/j784s4.inc
>>>> -SERIAL_CONSOLES = "115200;ttyS2"
>>>> -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>>>> TFA_K3_USART = "0x8"
>>>> OPTEEMACHINE = "k3-j784s4"
>>>> OPTEE_K3_USART = "0x8"
>>>> --
>>>> 2.39.2
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-04-11 19:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-05 18:50 [meta-ti][master/kirkstone][PATCH] conf: machine: Set common default SERIAL_CONSOLES for all K3 Andrew Davis
2023-04-05 23:49 ` Denys Dmytriyenko
2023-04-11 17:27 ` Andrew Davis
2023-04-11 18:59 ` Denys Dmytriyenko
2023-04-11 19:11 ` Andrew Davis
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.