conf: machine: Set common default SERIAL_CONSOLES for all K3
PATCH 1/1 conf: machine: Set common default SERIAL_CONSOLES for all K3
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.
--- 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(-)
meta-ti-bsp/conf/machine/beaglebone-ai64.conf +0 -3
@@ -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"
meta-ti-bsp/conf/machine/include/am62axx.inc +0 -3
@@ -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
meta-ti-bsp/conf/machine/include/am62xx-lp.inc +0 -3
@@ -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
meta-ti-bsp/conf/machine/include/am62xx.inc +0 -3
@@ -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
meta-ti-bsp/conf/machine/include/am64xx.inc +0 -3
@@ -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 = " \
meta-ti-bsp/conf/machine/include/am65xx.inc +0 -3
@@ -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"
meta-ti-bsp/conf/machine/include/k3.inc +3 -0
@@ -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}"
meta-ti-bsp/conf/machine/j7200-evm.conf +0 -3
@@ -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 = " \
meta-ti-bsp/conf/machine/j721e-evm.conf +0 -3
@@ -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 \
meta-ti-bsp/conf/machine/j721s2-evm.conf +0 -2
@@ -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"
meta-ti-bsp/conf/machine/j721s2-hs-evm.conf +0 -3
@@ -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"
meta-ti-bsp/conf/machine/j784s4-evm.conf +0 -2
@@ -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"
meta-ti-bsp/conf/machine/j784s4-hs-evm.conf +0 -2
@@ -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"
Signature · 1 line
2.39.2
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org
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?
Quoted 195 lines
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(-)meta-ti-bsp/conf/machine/beaglebone-ai64.conf +0
-3@@ -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"meta-ti-bsp/conf/machine/include/am62axx.inc +0
-3@@ -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-FSmeta-ti-bsp/conf/machine/include/am62xx-lp.inc +0
-3@@ -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-FSmeta-ti-bsp/conf/machine/include/am62xx.inc +0
-3@@ -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-FSmeta-ti-bsp/conf/machine/include/am64xx.inc +0
-3@@ -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 = " \meta-ti-bsp/conf/machine/include/am65xx.inc +0
-3@@ -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"meta-ti-bsp/conf/machine/include/k3.inc +3
-0@@ -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}"meta-ti-bsp/conf/machine/j7200-evm.conf +0
-3@@ -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 = " \meta-ti-bsp/conf/machine/j721e-evm.conf +0
-3@@ -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 \meta-ti-bsp/conf/machine/j721s2-evm.conf +0
-2@@ -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"meta-ti-bsp/conf/machine/j721s2-hs-evm.conf +0
-3@@ -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"meta-ti-bsp/conf/machine/j784s4-evm.conf +0
-2@@ -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"meta-ti-bsp/conf/machine/j784s4-hs-evm.conf +0
-2@@ -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"Signature · 1 line
2.39.2
Quoted 11 lines · Denys Dmytriyenko
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org
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
Quoted 196 lines
Quoted 196 lines
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(-)meta-ti-bsp/conf/machine/beaglebone-ai64.conf +0
-3@@ -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"meta-ti-bsp/conf/machine/include/am62axx.inc +0
-3@@ -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-FSmeta-ti-bsp/conf/machine/include/am62xx-lp.inc +0
-3@@ -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-FSmeta-ti-bsp/conf/machine/include/am62xx.inc +0
-3@@ -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-FSmeta-ti-bsp/conf/machine/include/am64xx.inc +0
-3@@ -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 = " \meta-ti-bsp/conf/machine/include/am65xx.inc +0
-3@@ -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"meta-ti-bsp/conf/machine/include/k3.inc +3
-0@@ -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}"meta-ti-bsp/conf/machine/j7200-evm.conf +0
-3@@ -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 = " \meta-ti-bsp/conf/machine/j721e-evm.conf +0
-3@@ -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 \meta-ti-bsp/conf/machine/j721s2-evm.conf +0
-2@@ -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"meta-ti-bsp/conf/machine/j721s2-hs-evm.conf +0
-3@@ -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"meta-ti-bsp/conf/machine/j784s4-evm.conf +0
-2@@ -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"meta-ti-bsp/conf/machine/j784s4-hs-evm.conf +0
-2@@ -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"Signature · 1 line
2.39.2
Quoted 8 lines · Andrew Davis
Quoted 7 lines · Denys Dmytriyenko
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org
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.
Quoted 8 lines
Quoted 4 lines
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...
Quoted 162 lines
Quoted 162 lines
Quoted 162 lines
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(-)meta-ti-bsp/conf/machine/beaglebone-ai64.conf +0
-3@@ -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"meta-ti-bsp/conf/machine/include/am62axx.inc +0
-3@@ -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-FSmeta-ti-bsp/conf/machine/include/am62xx-lp.inc +0
-3@@ -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-FSmeta-ti-bsp/conf/machine/include/am62xx.inc +0
-3@@ -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-FSmeta-ti-bsp/conf/machine/include/am64xx.inc +0
-3@@ -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 = " \meta-ti-bsp/conf/machine/include/am65xx.inc +0
-3@@ -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"meta-ti-bsp/conf/machine/include/k3.inc +3
-0@@ -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}"meta-ti-bsp/conf/machine/j7200-evm.conf +0
-3@@ -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 = " \meta-ti-bsp/conf/machine/j721e-evm.conf +0
-3@@ -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 \meta-ti-bsp/conf/machine/j721s2-evm.conf +0
-2@@ -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"meta-ti-bsp/conf/machine/j721s2-hs-evm.conf +0
-3@@ -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"meta-ti-bsp/conf/machine/j784s4-evm.conf +0
-2@@ -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"meta-ti-bsp/conf/machine/j784s4-hs-evm.conf +0
-2@@ -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"Signature · 1 line
2.39.2
Quoted 14 lines · Denys Dmytriyenko
Quoted 13 lines · Andrew Davis
Quoted 11 lines · Denys Dmytriyenko
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org
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?
Quoted 8 lines
Quoted 3 lines
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
Quoted 163 lines
Quoted 163 lines
Quoted 163 lines
Quoted 163 lines
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(-)meta-ti-bsp/conf/machine/beaglebone-ai64.conf +0
-3@@ -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"meta-ti-bsp/conf/machine/include/am62axx.inc +0
-3@@ -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-FSmeta-ti-bsp/conf/machine/include/am62xx-lp.inc +0
-3@@ -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-FSmeta-ti-bsp/conf/machine/include/am62xx.inc +0
-3@@ -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-FSmeta-ti-bsp/conf/machine/include/am64xx.inc +0
-3@@ -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 = " \meta-ti-bsp/conf/machine/include/am65xx.inc +0
-3@@ -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"meta-ti-bsp/conf/machine/include/k3.inc +3
-0@@ -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}"meta-ti-bsp/conf/machine/j7200-evm.conf +0
-3@@ -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 = " \meta-ti-bsp/conf/machine/j721e-evm.conf +0
-3@@ -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 \meta-ti-bsp/conf/machine/j721s2-evm.conf +0
-2@@ -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"meta-ti-bsp/conf/machine/j721s2-hs-evm.conf +0
-3@@ -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"meta-ti-bsp/conf/machine/j784s4-evm.conf +0
-2@@ -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"meta-ti-bsp/conf/machine/j784s4-hs-evm.conf +0
-2@@ -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"Signature · 1 line
2.39.2