[meta-ti] Denys Dmytriyenko : machines: configure all used consoles regardless of UART driver

Arago Project git git at arago-project.org
Wed May 4 10:40:58 PDT 2016


Module: meta-ti
Branch: master
Commit: d236f27110a27598fa727c09f0bc71a037a0a563
URL:    http://arago-project.org/git/meta-ti.git?a=commit;h=d236f27110a27598fa727c09f0bc71a037a0a563

Author: Denys Dmytriyenko <denys at ti.com>
Date:   Wed May  4 23:15:15 2016 +0000

machines: configure all used consoles regardless of UART driver

Signed-off-by: Denys Dmytriyenko <denys at ti.com>

---

 conf/machine/am437x-evm.conf |    4 +++-
 conf/machine/am57xx-evm.conf |    4 +++-
 conf/machine/dra7xx-evm.conf |    4 +++-
 conf/machine/k2e-evm.conf    |    4 +++-
 conf/machine/k2g-evm.conf    |    4 +++-
 conf/machine/k2hk-evm.conf   |    4 +++-
 conf/machine/k2l-evm.conf    |    4 +++-
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/conf/machine/am437x-evm.conf b/conf/machine/am437x-evm.conf
index 16f7cd8..e4f237a 100644
--- a/conf/machine/am437x-evm.conf
+++ b/conf/machine/am437x-evm.conf
@@ -11,7 +11,9 @@ MACHINE_FEATURES += "touchscreen"
 
 IMAGE_FSTYPES += "ubi tar.gz tar.xz"
 
-SERIAL_CONSOLE = "115200 ttyO0"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 # UBI information.  Note that this is board and kernel specific.  Changes
 # in your kernel port may require changes in these variables.  For more
diff --git a/conf/machine/am57xx-evm.conf b/conf/machine/am57xx-evm.conf
index cd3adc9..5d6bf09 100644
--- a/conf/machine/am57xx-evm.conf
+++ b/conf/machine/am57xx-evm.conf
@@ -8,7 +8,9 @@ MACHINE_FEATURES += "touchscreen"
 
 IMAGE_FSTYPES += "ubi tar.gz tar.xz"
 
-SERIAL_CONSOLE = "115200 ttyO2"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS2 115200;ttyO2"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 UBOOT_MACHINE = "am57xx_evm_config"
 
diff --git a/conf/machine/dra7xx-evm.conf b/conf/machine/dra7xx-evm.conf
index b1e34ab..03efa19 100644
--- a/conf/machine/dra7xx-evm.conf
+++ b/conf/machine/dra7xx-evm.conf
@@ -8,7 +8,9 @@ MACHINE_FEATURES += "touchscreen"
 
 IMAGE_FSTYPES += "ubi tar.gz tar.xz"
 
-SERIAL_CONSOLE = "115200 ttyO0"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 UBOOT_MACHINE = "dra7xx_evm_config"
 
diff --git a/conf/machine/k2e-evm.conf b/conf/machine/k2e-evm.conf
index e531f71..0735357 100644
--- a/conf/machine/k2e-evm.conf
+++ b/conf/machine/k2e-evm.conf
@@ -10,7 +10,9 @@ BOOT_MONITOR_MAKE_TARGET = "k2e"
 
 IMAGE_FSTYPES += "ubi tar.gz tar.xz cpio"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 SYSVINIT_ENABLED_GETTYS = ""
 
diff --git a/conf/machine/k2g-evm.conf b/conf/machine/k2g-evm.conf
index 00234a4..125a949 100644
--- a/conf/machine/k2g-evm.conf
+++ b/conf/machine/k2g-evm.conf
@@ -12,7 +12,9 @@ BOOT_MONITOR_MAKE_TARGET = "k2g"
 
 IMAGE_FSTYPES += "ubi tar.gz tar.xz cpio"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 SYSVINIT_ENABLED_GETTYS = ""
 
diff --git a/conf/machine/k2hk-evm.conf b/conf/machine/k2hk-evm.conf
index f9954d3..d375b24 100644
--- a/conf/machine/k2hk-evm.conf
+++ b/conf/machine/k2hk-evm.conf
@@ -10,7 +10,9 @@ BOOT_MONITOR_MAKE_TARGET = "k2hk"
 
 IMAGE_FSTYPES += "ubi tar.gz tar.xz cpio"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 SYSVINIT_ENABLED_GETTYS = ""
 
diff --git a/conf/machine/k2l-evm.conf b/conf/machine/k2l-evm.conf
index a94be5a..c7b712b 100644
--- a/conf/machine/k2l-evm.conf
+++ b/conf/machine/k2l-evm.conf
@@ -10,7 +10,9 @@ BOOT_MONITOR_MAKE_TARGET = "k2l"
 
 IMAGE_FSTYPES += "ubi tar.gz tar.xz cpio"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 SYSVINIT_ENABLED_GETTYS = ""
 



More information about the meta-ti mailing list