From bc894bf52eaa4359eaa64a64e950accd099a81cb Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Wed, 5 Apr 2023 13:50:27 -0500 Subject: [PATCH] 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 Signed-off-by: Ryan Eatmon --- 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 94439911..304cbb62 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 434b2a0f..eacfa584 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 ad5cf997..bcc6f493 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 de180127..623d90eb 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 bff0de1f..f5f4ffe7 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 edfc7c11..9fe851f4 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 94c0e7e3..31da2ca9 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_complete[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 bef5684f..2a128411 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 7ce5000a..337818a4 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 42e9ea1a..7971ad73 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 42bca6e6..123de8c1 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"