[meta-freescale] [3rdparty][PATCH] Stop using SERIAL_CONSOLE and switch all boards to SERIAL_CONSOLES
Fabio Berton
fabio.berton at ossystems.com.br
Tue Feb 19 06:41:57 PST 2019
>From meta-freescale commit 2e83203ebd8439a45bc7a931ace6871e6b238658
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: Fabio Berton <fabio.berton at ossystems.com.br>
---
conf/machine/ccimx6ulsbcexpress.conf | 2 +-
conf/machine/cgtqmx6.conf | 2 +-
conf/machine/cm-fx6.conf | 2 +-
conf/machine/colibri-imx7.conf | 2 +-
conf/machine/colibri-vf.conf | 2 +-
conf/machine/cubox-i.conf | 2 +-
conf/machine/imx6dl-riotboard.conf | 2 +-
conf/machine/imx6q-dms-ba16.conf | 2 +-
conf/machine/imx6qdl-variscite-som.conf | 2 +-
conf/machine/imx6sl-warp.conf | 2 +-
conf/machine/imx6ul-pico.conf | 2 +-
conf/machine/imx7d-pico.conf | 2 +-
conf/machine/include/tx6-karo-common.inc | 2 +-
conf/machine/m28evk.conf | 2 +-
conf/machine/m53evk.conf | 2 +-
conf/machine/nitrogen6sx.conf | 2 +-
conf/machine/nitrogen6x-lite.conf | 2 +-
conf/machine/nitrogen6x.conf | 2 +-
conf/machine/nitrogen7.conf | 2 +-
conf/machine/nitrogen8m.conf | 2 +-
conf/machine/pcm052.conf | 2 +-
conf/machine/ventana.conf | 2 +-
conf/machine/wandboard.conf | 2 +-
23 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/conf/machine/ccimx6ulsbcexpress.conf b/conf/machine/ccimx6ulsbcexpress.conf
index 4550872..4778643 100644
--- a/conf/machine/ccimx6ulsbcexpress.conf
+++ b/conf/machine/ccimx6ulsbcexpress.conf
@@ -33,6 +33,6 @@ IMAGE_CLASSES += "image_types_digi"
# Overwrite the defaults in imx-base not to include wic images
IMAGE_FSTYPES = "tar.bz2 ubifs boot.ubifs"
-SERIAL_CONSOLE = "115200 ttymxc4"
+SERIAL_CONSOLES = "115200;ttymxc4"
KERNEL_DEVICETREE = "imx6ul-ccimx6ulsbcexpress.dtb"
diff --git a/conf/machine/cgtqmx6.conf b/conf/machine/cgtqmx6.conf
index 5be7971..916410c 100644
--- a/conf/machine/cgtqmx6.conf
+++ b/conf/machine/cgtqmx6.conf
@@ -23,6 +23,6 @@ PREFERRED_PROVIDER_virtual/kernel ??= "linux-congatec"
KERNEL_DEVICETREE = "imx6q-qmx6.dtb imx6dl-qmx6.dtb"
KERNEL_IMAGETYPE = "uImage"
-SERIAL_CONSOLE = "115200 ttymxc1"
+SERIAL_CONSOLES = "115200;ttymxc1"
MACHINE_FEATURES += " pci"
diff --git a/conf/machine/cm-fx6.conf b/conf/machine/cm-fx6.conf
index 81d1062..bad4820 100644
--- a/conf/machine/cm-fx6.conf
+++ b/conf/machine/cm-fx6.conf
@@ -18,4 +18,4 @@ KERNEL_DEVICETREE = "imx6dl-cm-fx6.dtb imx6dl-sbc-fx6.dtb imx6dl-sbc-fx6m.dtb
MACHINE_FEATURES += "pci wifi bluetooth alsa bluetooth serial usbhost wifi"
-SERIAL_CONSOLE = "115200 ttymxc3"
+SERIAL_CONSOLES = "115200;ttymxc3"
diff --git a/conf/machine/colibri-imx7.conf b/conf/machine/colibri-imx7.conf
index 2ad296b..c20e048 100644
--- a/conf/machine/colibri-imx7.conf
+++ b/conf/machine/colibri-imx7.conf
@@ -37,6 +37,6 @@ MKUBIFS_ARGS = " -c 8112 -e 124KiB -m 2KiB -F"
UBINIZE_ARGS = " -p 128KiB -m 2048 -s 2048"
UBI_VOLNAME = "rootfs"
-SERIAL_CONSOLE = "115200 ttymxc0"
+SERIAL_CONSOLES = "115200;ttymxc0"
MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"
diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index a03853d..752bb64 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -40,6 +40,6 @@ MKUBIFS_ARGS = " -c 8112 -e 124KiB -m 2KiB -F"
UBINIZE_ARGS = " -p 128KiB -m 2048 -s 2048"
UBI_VOLNAME = "rootfs"
-SERIAL_CONSOLE = "115200 ttyLP0"
+SERIAL_CONSOLES = "115200;ttyLP0"
MACHINE_FEATURES += "usbgadget usbhost vfat alsa touchscreen"
diff --git a/conf/machine/cubox-i.conf b/conf/machine/cubox-i.conf
index 4c9ae2e..b1a85f6 100644
--- a/conf/machine/cubox-i.conf
+++ b/conf/machine/cubox-i.conf
@@ -34,7 +34,7 @@ KERNEL_DEVICETREE = "imx6dl-cubox-i.dtb imx6q-cubox-i.dtb imx6dl-hummingboard.dt
MACHINE_FEATURES += "pci wifi bluetooth alsa irda serial usbhost"
MACHINE_EXTRA_RRECOMMENDS += "bcm4330-nvram-config bcm4329-nvram-config"
-SERIAL_CONSOLE = "115200 ttymxc0"
+SERIAL_CONSOLES = "115200;ttymxc0"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
kernel-image \
diff --git a/conf/machine/imx6dl-riotboard.conf b/conf/machine/imx6dl-riotboard.conf
index 157e2c9..e3e2f05 100644
--- a/conf/machine/imx6dl-riotboard.conf
+++ b/conf/machine/imx6dl-riotboard.conf
@@ -14,7 +14,7 @@ UBOOT_MACHINE = "riotboard_defconfig"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc"
KERNEL_DEVICETREE = "imx6dl-riotboard.dtb"
-SERIAL_CONSOLE = "115200 ttymxc1"
+SERIAL_CONSOLES = "115200;ttymxc1"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
kernel-image \
diff --git a/conf/machine/imx6q-dms-ba16.conf b/conf/machine/imx6q-dms-ba16.conf
index 2f837f6..8c79424 100644
--- a/conf/machine/imx6q-dms-ba16.conf
+++ b/conf/machine/imx6q-dms-ba16.conf
@@ -18,4 +18,4 @@ KERNEL_IMAGETYPE = "uImage"
MACHINE_FEATURES += "pci"
-SERIAL_CONSOLE = "115200 ttymxc3"
+SERIAL_CONSOLES = "115200;ttymxc3"
diff --git a/conf/machine/imx6qdl-variscite-som.conf b/conf/machine/imx6qdl-variscite-som.conf
index 6b6d7b5..37aa271 100644
--- a/conf/machine/imx6qdl-variscite-som.conf
+++ b/conf/machine/imx6qdl-variscite-som.conf
@@ -52,7 +52,7 @@ UBI_VOLNAME = "rootfs"
MKUBIFS_ARGS = " -m 2048 -e 124KiB -c 3965 -F "
UBINIZE_ARGS = " -m 2048 -p 128KiB -s 2048 -O 2048 "
-SERIAL_CONSOLE = "115200 ttymxc0"
+SERIAL_CONSOLES = "115200;ttymxc0"
USE_VT = "0"
diff --git a/conf/machine/imx6sl-warp.conf b/conf/machine/imx6sl-warp.conf
index 5e0d19f..537db17 100644
--- a/conf/machine/imx6sl-warp.conf
+++ b/conf/machine/imx6sl-warp.conf
@@ -40,7 +40,7 @@ UBOOT_MACHINE ?= "warp_defconfig"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc-imx"
KERNEL_DEVICETREE = "imx6sl-warp.dtb"
-SERIAL_CONSOLE = "115200 ttymxc0"
+SERIAL_CONSOLES = "115200;ttymxc0"
MACHINE_FEATURES += "wifi bluetooth serial"
MACHINE_EXTRA_RRECOMMENDS += "bcm4330-nvram-config"
diff --git a/conf/machine/imx6ul-pico.conf b/conf/machine/imx6ul-pico.conf
index 3448318..3f4fba8 100644
--- a/conf/machine/imx6ul-pico.conf
+++ b/conf/machine/imx6ul-pico.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "use-mainline-bsp:mx6:mx6ul:"
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa7.inc
-SERIAL_CONSOLE = "115200 ttymxc5"
+SERIAL_CONSOLES = "115200;ttymxc5"
KERNEL_DEVICETREE = " \
imx6ul-pico-hobbit.dtb \
diff --git a/conf/machine/imx7d-pico.conf b/conf/machine/imx7d-pico.conf
index 625b600..a9469cb 100644
--- a/conf/machine/imx7d-pico.conf
+++ b/conf/machine/imx7d-pico.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "use-mainline-bsp:mx7:mx7d:"
require conf/machine/include/imx-base.inc
require conf/machine/include/tune-cortexa7.inc
-SERIAL_CONSOLE = "115200 ttymxc4"
+SERIAL_CONSOLES = "115200;ttymxc4"
KERNEL_DEVICETREE = " \
imx7d-pico-hobbit.dtb \
diff --git a/conf/machine/include/tx6-karo-common.inc b/conf/machine/include/tx6-karo-common.inc
index 83a7de6..5e446a2 100644
--- a/conf/machine/include/tx6-karo-common.inc
+++ b/conf/machine/include/tx6-karo-common.inc
@@ -3,7 +3,7 @@
require conf/machine/include/imx-base.inc
require conf/machine/include/tune-cortexa9.inc
-SERIAL_CONSOLE = "115200 ttymxc0"
+SERIAL_CONSOLES = "115200;ttymxc0"
UBOOT_SUFFIX = "bin"
UBOOT_MAKE_TARGET = "u-boot.bin"
diff --git a/conf/machine/m28evk.conf b/conf/machine/m28evk.conf
index d5d8986..0fceabc 100644
--- a/conf/machine/m28evk.conf
+++ b/conf/machine/m28evk.conf
@@ -17,7 +17,7 @@ KERNEL_DEVICETREE = "imx28-m28evk.dtb"
SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard"
-SERIAL_CONSOLE = "115200 ttyAMA0"
+SERIAL_CONSOLES = "115200;ttyAMA0"
MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
diff --git a/conf/machine/m53evk.conf b/conf/machine/m53evk.conf
index 4356d18..50e9b3f 100644
--- a/conf/machine/m53evk.conf
+++ b/conf/machine/m53evk.conf
@@ -18,7 +18,7 @@ KERNEL_DEVICETREE = "imx53-m53evk.dtb"
SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard"
-SERIAL_CONSOLE = "115200 ttymxc1"
+SERIAL_CONSOLES = "115200;ttymxc1"
MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
diff --git a/conf/machine/nitrogen6sx.conf b/conf/machine/nitrogen6sx.conf
index 9aa43d4..5a33014 100644
--- a/conf/machine/nitrogen6sx.conf
+++ b/conf/machine/nitrogen6sx.conf
@@ -31,7 +31,7 @@ WKS_FILE_DEPENDS = " \
UBOOT_MACHINE ?= "nitrogen6sx_defconfig"
-SERIAL_CONSOLE = "115200 ttymxc0"
+SERIAL_CONSOLES = "115200;ttymxc0"
MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-wl12xx"
MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/conf/machine/nitrogen6x-lite.conf b/conf/machine/nitrogen6x-lite.conf
index 44cf5c2..99b3ab5 100644
--- a/conf/machine/nitrogen6x-lite.conf
+++ b/conf/machine/nitrogen6x-lite.conf
@@ -31,7 +31,7 @@ WKS_FILE_DEPENDS = " \
UBOOT_MACHINE ?= "nit6xlite_defconfig"
-SERIAL_CONSOLE = "115200 ttymxc1"
+SERIAL_CONSOLES = "115200;ttymxc1"
MACHINE_EXTRA_RRECOMMENDS += " bcm4330-nvram-config"
MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/conf/machine/nitrogen6x.conf b/conf/machine/nitrogen6x.conf
index e777a14..3ffee5a 100644
--- a/conf/machine/nitrogen6x.conf
+++ b/conf/machine/nitrogen6x.conf
@@ -65,7 +65,7 @@ WKS_FILE_DEPENDS = " \
UBOOT_MACHINE ?= "nitrogen6q_defconfig"
-SERIAL_CONSOLE = "115200 ttymxc1"
+SERIAL_CONSOLES = "115200;ttymxc1"
MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-wl12xx"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
diff --git a/conf/machine/nitrogen7.conf b/conf/machine/nitrogen7.conf
index 57160e0..cc61a08 100644
--- a/conf/machine/nitrogen7.conf
+++ b/conf/machine/nitrogen7.conf
@@ -31,7 +31,7 @@ WKS_FILE_DEPENDS = " \
UBOOT_MACHINE ?= "nitrogen7_defconfig"
-SERIAL_CONSOLE = "115200 ttymxc0"
+SERIAL_CONSOLES = "115200;ttymxc0"
MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-wl12xx"
MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/conf/machine/nitrogen8m.conf b/conf/machine/nitrogen8m.conf
index 9565209..fbaa95e 100644
--- a/conf/machine/nitrogen8m.conf
+++ b/conf/machine/nitrogen8m.conf
@@ -37,6 +37,6 @@ WKS_FILE_DEPENDS_mx8 += " \
bmap-tools-native \
"
-SERIAL_CONSOLE ?= "115200 ttymxc0"
+SERIAL_CONSOLES ?= "115200;ttymxc0"
MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/conf/machine/pcm052.conf b/conf/machine/pcm052.conf
index c1d017a..36adf55 100644
--- a/conf/machine/pcm052.conf
+++ b/conf/machine/pcm052.conf
@@ -20,6 +20,6 @@ KERNEL_DEVICETREE = "vf610-pcm052.dtb"
SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard"
-SERIAL_CONSOLE = "115200 ttyLP1"
+SERIAL_CONSOLES = "115200;ttyLP1"
MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
diff --git a/conf/machine/ventana.conf b/conf/machine/ventana.conf
index f3e111d..7794c77 100644
--- a/conf/machine/ventana.conf
+++ b/conf/machine/ventana.conf
@@ -61,7 +61,7 @@ UBOOT_CONFIG ??= "std"
UBOOT_CONFIG[std] = "gwventana_config"
UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000"
-SERIAL_CONSOLE = "115200 ttymxc1"
+SERIAL_CONSOLES = "115200;ttymxc1"
# Override FS Type Creation
IMAGE_FSTYPES = "tar.bz2 multiubi"
diff --git a/conf/machine/wandboard.conf b/conf/machine/wandboard.conf
index 50c19c8..a567a1c 100644
--- a/conf/machine/wandboard.conf
+++ b/conf/machine/wandboard.conf
@@ -40,7 +40,7 @@ MACHINE_EXTRA_RRECOMMENDS += " \
bcm4330-nvram-config \
"
-SERIAL_CONSOLE = "115200 ttymxc0"
+SERIAL_CONSOLES = "115200;ttymxc0"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
kernel-image \
--
2.20.1
More information about the meta-freescale
mailing list