From 2e83203ebd8439a45bc7a931ace6871e6b238658 Mon Sep 17 00:00:00 2001 From: Marc Ferland Date: Thu, 31 Jan 2019 11:35:19 -0500 Subject: [PATCH] Stop using SERIAL_CONSOLE and switch all boards to SERIAL_CONSOLES SERIAL_CONSOLE has been deprecated for a while now (see [1]). This patch fixes the machines that where still using the old variable. [1]: https://www.yoctoproject.org/docs/2.7/ref-manual/ref-manual.html#migration-2.6-serial-console-deprecated Signed-off-by: Marc Ferland Signed-off-by: Otavio Salvador --- conf/machine/imx25pdk.conf | 2 +- conf/machine/imx28evk.conf | 2 +- conf/machine/imx6qdlsabreauto.conf | 2 +- conf/machine/imx6qdlsabresd.conf | 2 +- conf/machine/imx6slevk.conf | 2 +- conf/machine/imx6sllevk.conf | 2 +- conf/machine/imx6sxsabreauto.conf | 2 +- conf/machine/imx6sxsabresd.conf | 2 +- conf/machine/imx6ullevk.conf | 2 +- conf/machine/imx7ulpevk.conf | 2 +- conf/machine/imx8mmevk.conf | 2 +- conf/machine/imx8mqevk.conf | 2 +- conf/machine/imx8qmmek.conf | 2 +- conf/machine/imx8qxpmek.conf | 2 +- conf/machine/include/imx-base.inc | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/conf/machine/imx25pdk.conf b/conf/machine/imx25pdk.conf index e22d9f4e..9e8ad003 100644 --- a/conf/machine/imx25pdk.conf +++ b/conf/machine/imx25pdk.conf @@ -13,7 +13,7 @@ UBOOT_MACHINE ?= "mx25pdk_defconfig" KERNEL_DEVICETREE = "imx25-pdk.dtb" -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf index 937fd143..7c359e54 100644 --- a/conf/machine/imx28evk.conf +++ b/conf/machine/imx28evk.conf @@ -18,7 +18,7 @@ UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config,sdcard" KERNEL_DEVICETREE = "imx28-evk.dtb" -SERIAL_CONSOLE = "115200 ttyAMA0" +SERIAL_CONSOLES = "115200;ttyAMA0" MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index fabd4cd0..64a13a8a 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf @@ -38,7 +38,7 @@ UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" WKS_FILE = "imx-uboot-spl-bootpart.wks" -SERIAL_CONSOLE = "115200 ttymxc3" +SERIAL_CONSOLES = "115200;ttymxc3" MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index 7cde5059..ff1a3c76 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf @@ -38,7 +38,7 @@ UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" WKS_FILE = "imx-uboot-spl-bootpart.wks" -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf index ffcbaaa7..5d81272f 100644 --- a/conf/machine/imx6slevk.conf +++ b/conf/machine/imx6slevk.conf @@ -19,7 +19,7 @@ UBOOT_CONFIG[epdc] = "mx6slevk_epdc_config" UBOOT_CONFIG[spinor] = "mx6slevk_spinor_config" UBOOT_CONFIG[mfgtool] = "mx6slevk_config" -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FEATURES += " pci wifi bluetooth" diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf index 84d1e319..ef155202 100644 --- a/conf/machine/imx6sllevk.conf +++ b/conf/machine/imx6sllevk.conf @@ -18,7 +18,7 @@ UBOOT_CONFIG[sd] = "mx6sllevk_config,sdcard" UBOOT_CONFIG[epdc] = "mx6sllevk_epdc_config" UBOOT_CONFIG[mfgtool] = "mx6sllevk_config" -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FEATURES += " pci wifi bluetooth" diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf index ca5c9746..b26605d4 100644 --- a/conf/machine/imx6sxsabreauto.conf +++ b/conf/machine/imx6sxsabreauto.conf @@ -21,7 +21,7 @@ UBOOT_CONFIG[qspi1] = "mx6sxsabreauto_qspi1_config" UBOOT_CONFIG[nand] = "mx6sxsabreauto_nand_config,ubifs" UBOOT_CONFIG[mfgtool] = "mx6sxsabreauto_config" -SERIAL_CONSOLE = "115200 ttymxc3" +SERIAL_CONSOLES = "115200;ttymxc3" MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf index 3a969e4a..5793a0b0 100644 --- a/conf/machine/imx6sxsabresd.conf +++ b/conf/machine/imx6sxsabresd.conf @@ -22,7 +22,7 @@ UBOOT_CONFIG[qspi2] = "mx6sxsabresd_qspi2_config" UBOOT_CONFIG[m4fastup] = "mx6sxsabresd_m4fastup_config" UBOOT_CONFIG[mfgtool] = "mx6sxsabresd_config" -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf index 7cf9c328..b05216ac 100644 --- a/conf/machine/imx6ullevk.conf +++ b/conf/machine/imx6ullevk.conf @@ -19,6 +19,6 @@ PREFERRED_PROVIDER_u-boot = "u-boot-imx" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" PREFERRED_PROVIDER_virtual/kernel = "linux-imx" -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FEATURES += "wifi bluetooth" diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf index d077de74..8a295206 100644 --- a/conf/machine/imx7ulpevk.conf +++ b/conf/machine/imx7ulpevk.conf @@ -24,4 +24,4 @@ UBOOT_CONFIG[mfgtool] = "mx7ulp_evk_config" MACHINE_FIRMWARE_append = " firmware-imx-brcm" # Set Serial console -SERIAL_CONSOLE = "115200 ttyLP0" +SERIAL_CONSOLES = "115200;ttyLP0" diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf index 44b3249f..a0523a70 100644 --- a/conf/machine/imx8mmevk.conf +++ b/conf/machine/imx8mmevk.conf @@ -41,7 +41,7 @@ UBOOT_DTB_NAME = "fsl-imx8mm-evk.dtb" IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}" # Set Serial console -SERIAL_CONSOLE = "115200 ttymxc1" +SERIAL_CONSOLES = "115200;ttymxc1" IMAGE_BOOTLOADER = "imx-boot" diff --git a/conf/machine/imx8mqevk.conf b/conf/machine/imx8mqevk.conf index 96f12203..23037967 100644 --- a/conf/machine/imx8mqevk.conf +++ b/conf/machine/imx8mqevk.conf @@ -38,7 +38,7 @@ UBOOT_DTB_NAME = "fsl-imx8mq-evk.dtb" IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi" # Set Serial console -SERIAL_CONSOLE = "115200 ttymxc0" +SERIAL_CONSOLES = "115200;ttymxc0" IMAGE_BOOTLOADER = "imx-boot" diff --git a/conf/machine/imx8qmmek.conf b/conf/machine/imx8qmmek.conf index e1f26b44..c20908a2 100644 --- a/conf/machine/imx8qmmek.conf +++ b/conf/machine/imx8qmmek.conf @@ -16,7 +16,7 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" LOADADDR = "" # We have to disable SERIAL_CONSOLE due to auto-serial-console -SERIAL_CONSOLE = "115200 ttyAMA0" +SERIAL_CONSOLES = "115200;ttyAMA0" # we do not want to have getty running on tty1 as we run # auto-serial-console there diff --git a/conf/machine/imx8qxpmek.conf b/conf/machine/imx8qxpmek.conf index 2ffbcacc..e11e147a 100644 --- a/conf/machine/imx8qxpmek.conf +++ b/conf/machine/imx8qxpmek.conf @@ -15,7 +15,7 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" LOADADDR = "" # We have to disable SERIAL_CONSOLE due to auto-serial-console -SERIAL_CONSOLE = "115200 ttyAMA0" +SERIAL_CONSOLES = "115200;ttyAMA0" # we do not want to have getty running on tty1 as we run # auto-serial-console there diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 92959ee2..7a19335b 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -310,8 +310,8 @@ SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" -SERIAL_CONSOLE = "115200 ttymxc0" -SERIAL_CONSOLE_mxs = "115200 ttyAMA0" +SERIAL_CONSOLES = "115200;ttymxc0" +SERIAL_CONSOLES_mxs = "115200;ttyAMA0" KERNEL_IMAGETYPE = "zImage" KERNEL_IMAGETYPE_aarch64 = "Image" -- 2.40.1