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 <ferlandm@amotus.ca>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/conf/machine/imx25pdk.conf b/conf/machine/imx25pdk.conf
index e22d9f4e41c00b4e670cc14041bb889d5f08b58d..9e8ad0037e6fb712b00a0ce533653ec6159ea439 100644 (file)
--- 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 937fd143f6e94083136ac3e8e89a5f663223bd00..7c359e54900b1e380ed600752dd58cd07a0325c6 100644 (file)
--- 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 fabd4cd0d61d48efad1d6da899ddf75a8302bba0..64a13a8a71470f8a1725c67874da3376cef9bab8 100644 (file)
--- 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 7cde50592213fc5a2715124338f9a2b3e95b8bc1..ff1a3c76d5c7cb91c4cf79729ab0c8499e579481 100644 (file)
--- 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 ffcbaaa76578ced1767621097d9f13ad9214e754..5d81272fb13628b233a5da4ce8c6bd8b4d7162ad 100644 (file)
--- 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 84d1e3195db25e49411641d658e35332d14a438b..ef1552028f5d41b1fbea1dd522868f4fe8edf6da 100644 (file)
--- 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 ca5c97469b0b1ea8befde7c1bd8a51a500204794..b26605d43ef9723a364301e7e10ed4592dd14b65 100644 (file)
--- 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 3a969e4a350ea20fc9d341c22e22786aff5c9a8b..5793a0b01759af1f047b49472a7412d7adee48df 100644 (file)
--- 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 7cf9c328b7d3011b41b1fd3db2f2392c64a28130..b05216aca03f9176cec52f29a15255df3e04a73c 100644 (file)
--- 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 d077de74313619f0b1043081967da053ef167714..8a29520610d4ce17ba3084644e9614866c097a8a 100644 (file)
--- 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 44b3249fee13f571c82926c430a7fd8115c42b45..a0523a703367dc2bd11cc298bc3a119bb4e09594 100644 (file)
--- 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 96f1220340313848bb4d376f41818a53e59256ef..23037967584cfa5d8a3521549bd8f0da5b69a06a 100644 (file)
--- 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 e1f26b44ff1b2d8ae0418c29ebe79a257b905786..c20908a22489f9139accc7c06dfd05af41f386d9 100644 (file)
--- 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 2ffbcacc2d7bdc27507d99c8e2b7486c3ded966e..e11e147ab8247feb250d2e19c6c2ba152ff29701 100644 (file)
--- 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 92959ee2ad76427d2031a6b733f2d0cbf76ec574..7a19335b3bf638318c30e365f0d13c88bf80f3c4 100644 (file)
--- 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"