1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-04 18:00:36 +00:00

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.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Andrew Davis
2023-04-05 13:50:27 -05:00
committed by Ryan Eatmon
parent 6a00c74301
commit bc894bf52e
13 changed files with 3 additions and 33 deletions
@@ -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"
@@ -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
@@ -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
@@ -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
@@ -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 = " \
@@ -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"
+3
View File
@@ -53,3 +53,6 @@ MACHINE_FEATURES += "efi"
WKS_FILE ?= "sdimage-2part-efi.wks"
do_image_wic[depends] += "virtual/bootloader:do_deploy"
do_image_complete[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-3
View File
@@ -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 = " \
-3
View File
@@ -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 \
-2
View File
@@ -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"
@@ -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"
-2
View File
@@ -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"
@@ -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"