From f59ad3d3680bacb563ed4790acf3cbcc229e24dd Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Wed, 5 Apr 2023 13:50:27 -0500 Subject: 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/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 +++ 6 files changed, 3 insertions(+), 15 deletions(-) (limited to 'meta-ti-bsp/conf/machine/include') 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}" -- cgit v1.2.3-54-g00ecf