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>

23 files changed, 22 insertions, 3 deletions

diff --git a/conf/distro/fsl.conf b/conf/distro/fsl.conf
index ed04a06..8795376 100644
--- a/conf/distro/fsl.conf
+++ b/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/conf/machine/mpc8536ds.conf b/conf/machine/mpc8536ds.conf
index aef057a..d573bc5 100644
--- a/conf/machine/mpc8536ds.conf
+++ b/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/conf/machine/mpc8544ds.conf b/conf/machine/mpc8544ds.conf
index 3d5d26e..e7b9afa 100644
--- a/conf/machine/mpc8544ds.conf
+++ b/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/conf/machine/mpc8548cds.conf b/conf/machine/mpc8548cds.conf
index 007c3bc..96b0f94 100644
--- a/conf/machine/mpc8548cds.conf
+++ b/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/conf/machine/mpc8572ds.conf b/conf/machine/mpc8572ds.conf
index cefcdcc..3bdbea1 100644
--- a/conf/machine/mpc8572ds.conf
+++ b/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/conf/machine/p1010rdb.conf b/conf/machine/p1010rdb.conf
index 908219f..f7c8885 100644
--- a/conf/machine/p1010rdb.conf
+++ b/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/conf/machine/p1020mbg.conf b/conf/machine/p1020mbg.conf
index d7c4119..da3dde2 100644
--- a/conf/machine/p1020mbg.conf
+++ b/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/conf/machine/p1020rdb.conf b/conf/machine/p1020rdb.conf
index 0ebe32c..83e3428 100644
--- a/conf/machine/p1020rdb.conf
+++ b/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/conf/machine/p1020utm.conf b/conf/machine/p1020utm.conf
index fc71ddd..8b1478d 100644
--- a/conf/machine/p1020utm.conf
+++ b/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/conf/machine/p1021rdb.conf b/conf/machine/p1021rdb.conf
index cecbf58..e92f95e 100644
--- a/conf/machine/p1021rdb.conf
+++ b/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/conf/machine/p1022ds.conf b/conf/machine/p1022ds.conf
index fa93d31..3485e1c 100644
--- a/conf/machine/p1022ds.conf
+++ b/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/conf/machine/p1023rds.conf b/conf/machine/p1023rds.conf
index 5f97c46..ed5d5ba 100644
--- a/conf/machine/p1023rds.conf
+++ b/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/conf/machine/p1024rdb.conf b/conf/machine/p1024rdb.conf
index 37b2717..44a20b3 100644
--- a/conf/machine/p1024rdb.conf
+++ b/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/conf/machine/p1025rdb.conf b/conf/machine/p1025rdb.conf
index bc1b424..8e6b868 100644
--- a/conf/machine/p1025rdb.conf
+++ b/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/conf/machine/p2020ds.conf b/conf/machine/p2020ds.conf
index 80c54ce..cfc5e45 100644
--- a/conf/machine/p2020ds.conf
+++ b/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/conf/machine/p2020rdb.conf b/conf/machine/p2020rdb.conf
index 09e5680..da1c815 100644
--- a/conf/machine/p2020rdb.conf
+++ b/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/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf
index b4f1264..5adb4f6 100644
--- a/conf/machine/p2041rdb.conf
+++ b/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/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf
index 2f2c605..efc372b 100644
--- a/conf/machine/p3041ds.conf
+++ b/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/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf
index 0d29de2..55b30af 100644
--- a/conf/machine/p4080ds.conf
+++ b/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/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf
index 9ab4711..60210b3 100644
--- a/conf/machine/p5020ds-64b.conf
+++ b/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/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf
index 45d1ea7..4f443dc 100644
--- a/conf/machine/p5020ds.conf
+++ b/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/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index 091f81f..44c3b7d 100644
--- a/conf/machine/p5040ds-64b.conf
+++ b/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/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index f06b47a..df13fcc 100644
--- a/conf/machine/p5040ds.conf
+++ b/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}"