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 <[email protected]> > --- > 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
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16300): https://lists.yoctoproject.org/g/meta-ti/message/16300 Mute This Topic: https://lists.yoctoproject.org/mt/98089371/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/6695321/21656/1393940836/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
