From: Matthew McClintock <msm@freescale.com>
Date: Wed, 11 Jul 2012 22:26:51 +0000 (-0500)
Subject: move serial console definitions into machine.conf so they are available for all distr... 
X-Git-Tag: 2.1~534^2~428
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d22a53ebedc57e2ac29adf6820d75d431770c3c8;p=meta-freescale.git

move serial console definitions into machine.conf so they are available for all distros (e.g. poky and fsl)

Signed-off-by: Matthew McClintock <msm@freescale.com>
---

diff --git a/meta-fsl-ppc/conf/distro/fsl.conf b/meta-fsl-ppc/conf/distro/fsl.conf
index ed04a062..87953762 100644
--- a/meta-fsl-ppc/conf/distro/fsl.conf
+++ b/meta-fsl-ppc/conf/distro/fsl.conf
@@ -90,7 +90,4 @@ PREFERRED_PROVIDER_linux-libc-headers-nativesdk ?= "linux-qoriq-sdk-headers-nati
 
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
 CCACHE = ""
diff --git a/meta-fsl-ppc/conf/machine/mpc8536ds.conf b/meta-fsl-ppc/conf/machine/mpc8536ds.conf
index aef057ad..d573bc53 100644
--- a/meta-fsl-ppc/conf/machine/mpc8536ds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8536ds.conf
@@ -14,3 +14,4 @@ JFFS2_ERASEBLOCK = "0x20000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/mpc8544ds.conf b/meta-fsl-ppc/conf/machine/mpc8544ds.conf
index 3d5d26ea..e7b9afa4 100644
--- a/meta-fsl-ppc/conf/machine/mpc8544ds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8544ds.conf
@@ -13,3 +13,4 @@ JFFS2_ERASEBLOCK = "0x20000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/mpc8548cds.conf b/meta-fsl-ppc/conf/machine/mpc8548cds.conf
index 007c3bc9..96b0f940 100644
--- a/meta-fsl-ppc/conf/machine/mpc8548cds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8548cds.conf
@@ -13,3 +13,4 @@ JFFS2_ERASEBLOCK = "0x20000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/mpc8572ds.conf b/meta-fsl-ppc/conf/machine/mpc8572ds.conf
index cefcdcc0..3bdbea1b 100644
--- a/meta-fsl-ppc/conf/machine/mpc8572ds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8572ds.conf
@@ -12,3 +12,4 @@ JFFS2_ERASEBLOCK = "0x20000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p1010rdb.conf b/meta-fsl-ppc/conf/machine/p1010rdb.conf
index 908219f0..f7c8885e 100644
--- a/meta-fsl-ppc/conf/machine/p1010rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1010rdb.conf
@@ -13,3 +13,4 @@ JFFS2_ERASEBLOCK = "0x20000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p1020mbg.conf b/meta-fsl-ppc/conf/machine/p1020mbg.conf
index d7c41197..da3dde20 100644
--- a/meta-fsl-ppc/conf/machine/p1020mbg.conf
+++ b/meta-fsl-ppc/conf/machine/p1020mbg.conf
@@ -14,3 +14,4 @@ JFFS2_ERASEBLOCK = "0x20000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p1020rdb.conf b/meta-fsl-ppc/conf/machine/p1020rdb.conf
index 0ebe32c8..83e34285 100644
--- a/meta-fsl-ppc/conf/machine/p1020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1020rdb.conf
@@ -15,3 +15,4 @@ JFFS2_ERASEBLOCK = "0x20000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p1020utm.conf b/meta-fsl-ppc/conf/machine/p1020utm.conf
index fc71ddd5..8b1478d1 100644
--- a/meta-fsl-ppc/conf/machine/p1020utm.conf
+++ b/meta-fsl-ppc/conf/machine/p1020utm.conf
@@ -14,3 +14,4 @@ JFFS2_ERASEBLOCK = "0x20000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p1021rdb.conf b/meta-fsl-ppc/conf/machine/p1021rdb.conf
index cecbf580..e92f95e1 100644
--- a/meta-fsl-ppc/conf/machine/p1021rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1021rdb.conf
@@ -13,3 +13,4 @@ JFFS2_ERASEBLOCK = "0x20000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p1022ds.conf b/meta-fsl-ppc/conf/machine/p1022ds.conf
index fa93d316..3485e1cd 100644
--- a/meta-fsl-ppc/conf/machine/p1022ds.conf
+++ b/meta-fsl-ppc/conf/machine/p1022ds.conf
@@ -23,3 +23,4 @@ JFFS2_ERASEBLOCK = "0x20000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p1023rds.conf b/meta-fsl-ppc/conf/machine/p1023rds.conf
index 5f97c465..ed5d5ba4 100644
--- a/meta-fsl-ppc/conf/machine/p1023rds.conf
+++ b/meta-fsl-ppc/conf/machine/p1023rds.conf
@@ -12,3 +12,4 @@ JFFS2_ERASEBLOCK = "0x10000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p1024rdb.conf b/meta-fsl-ppc/conf/machine/p1024rdb.conf
index 37b27177..44a20b31 100644
--- a/meta-fsl-ppc/conf/machine/p1024rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1024rdb.conf
@@ -14,3 +14,4 @@ JFFS2_ERASEBLOCK = "0x20000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p1025rdb.conf b/meta-fsl-ppc/conf/machine/p1025rdb.conf
index bc1b4246..8e6b8683 100644
--- a/meta-fsl-ppc/conf/machine/p1025rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1025rdb.conf
@@ -15,3 +15,4 @@ JFFS2_ERASEBLOCK = "0x20000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p2020ds.conf b/meta-fsl-ppc/conf/machine/p2020ds.conf
index 80c54cef..cfc5e455 100644
--- a/meta-fsl-ppc/conf/machine/p2020ds.conf
+++ b/meta-fsl-ppc/conf/machine/p2020ds.conf
@@ -13,3 +13,4 @@ JFFS2_ERASEBLOCK = "0x20000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p2020rdb.conf b/meta-fsl-ppc/conf/machine/p2020rdb.conf
index 09e56804..da1c8155 100644
--- a/meta-fsl-ppc/conf/machine/p2020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p2020rdb.conf
@@ -14,3 +14,4 @@ JFFS2_ERASEBLOCK = "0x20000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p2041rdb.conf b/meta-fsl-ppc/conf/machine/p2041rdb.conf
index b4f12648..5adb4f6b 100644
--- a/meta-fsl-ppc/conf/machine/p2041rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p2041rdb.conf
@@ -13,3 +13,4 @@ JFFS2_ERASEBLOCK = "0x10000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p3041ds.conf b/meta-fsl-ppc/conf/machine/p3041ds.conf
index 2f2c605b..efc372b3 100644
--- a/meta-fsl-ppc/conf/machine/p3041ds.conf
+++ b/meta-fsl-ppc/conf/machine/p3041ds.conf
@@ -13,3 +13,4 @@ JFFS2_ERASEBLOCK = "0x10000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p4080ds.conf b/meta-fsl-ppc/conf/machine/p4080ds.conf
index 0d29de27..55b30af2 100644
--- a/meta-fsl-ppc/conf/machine/p4080ds.conf
+++ b/meta-fsl-ppc/conf/machine/p4080ds.conf
@@ -13,3 +13,4 @@ JFFS2_ERASEBLOCK = "0x10000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
index 9ab47110..60210b37 100644
--- a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
@@ -14,3 +14,4 @@ JFFS2_ERASEBLOCK = "0x10000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p5020ds.conf b/meta-fsl-ppc/conf/machine/p5020ds.conf
index 45d1ea71..4f443dc6 100644
--- a/meta-fsl-ppc/conf/machine/p5020ds.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds.conf
@@ -13,3 +13,4 @@ JFFS2_ERASEBLOCK = "0x10000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
index 091f81f7..44c3b7d2 100644
--- a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
@@ -13,3 +13,4 @@ JFFS2_ERASEBLOCK = "0x10000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
diff --git a/meta-fsl-ppc/conf/machine/p5040ds.conf b/meta-fsl-ppc/conf/machine/p5040ds.conf
index f06b47a6..df13fcc8 100644
--- a/meta-fsl-ppc/conf/machine/p5040ds.conf
+++ b/meta-fsl-ppc/conf/machine/p5040ds.conf
@@ -13,3 +13,4 @@ JFFS2_ERASEBLOCK = "0x10000"
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"