move serial console definitions into machine.conf so they are available for all distr...

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 ed04a062892cbcfd792616153fa84a8828b82820..87953762af7077e54f0273c691e02b7049661a62 100644 (file)
--- 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 aef057ad47d023f67e166a5d5b52664589d13c17..d573bc5390f47951713e1db834105acff640a751 100644 (file)
--- 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 3d5d26ea95d77cc28aff2b8099a1b2d57da9bee5..e7b9afa489fdffa4344e715d9692e22309ea630e 100644 (file)
--- 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 007c3bc9a39ef03e99c47a4f3041a1be3f3ebec3..96b0f9402d0d2d180eedba529b2a249def2c5b87 100644 (file)
--- 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 cefcdcc03200acab2d7d2296afbb4809bfd26569..3bdbea1b6771da879b8be53fcd9c5b6ba1afceb5 100644 (file)
--- 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 908219f0b46860a4146e524e8681b71917751383..f7c8885ef3fa3b7c0f15037610b041fb264b5c96 100644 (file)
--- 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 d7c411977e10a34c6bf1045c10a78c2388e09405..da3dde206205c9f5448785293de4fd4942585fd9 100644 (file)
--- 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 0ebe32c8d75a7f9cb3198cea9a97a9a4a7827997..83e34285edfd73ed74c8ea296017ebb12cb531b6 100644 (file)
--- 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 fc71ddd5ea396ddf2fe11ba5382388bed86d9b41..8b1478d1ce1f9fd790d9236db49deb0a28b9e555 100644 (file)
--- 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 cecbf5808727e25d4e3f125285207241c52a0cb9..e92f95e1415261346ee430263565196f0934f358 100644 (file)
--- 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 fa93d316db2110b5eef5da4cd5771aec1edb8a66..3485e1cdb857d7c75cb1179e6a57179fe1c0d4b3 100644 (file)
--- 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 5f97c465c88991f428f2e936c51e66c28406908c..ed5d5ba4adec6a1c38865406f0d5b08ee600eb84 100644 (file)
--- 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 37b271772037773a273072392eedae4ee5f27bdd..44a20b3105eb606d002e8588ece663ce3312cea6 100644 (file)
--- 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 bc1b4246685b3fad3b9fdcad20ecf041509e4227..8e6b8683ab0ae04ac011759331130195e62095b5 100644 (file)
--- 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 80c54cefddfba30e5367edcff783f099e2217c7c..cfc5e45575740141549d023f347873da8182a90b 100644 (file)
--- 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 09e56804dbc9ccd17b6dfb4a283f179dc155eec6..da1c8155f8e12cc0d94c167edda06645f385add5 100644 (file)
--- 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 b4f12648f5cc3def2557d654378da105df954038..5adb4f6b78e874c03b742671acdb5eed9ed4ece6 100644 (file)
--- 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 2f2c605b1d55e7c4f2d72c7031440cd028ead8b3..efc372b3ee535e89fcc6c5ab5b08ea98cfb47957 100644 (file)
--- 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 0d29de27c73ee04de7b200ba0f69a5c2f05c6c9e..55b30af28bc0ddff4d232725080951d38e5bef65 100644 (file)
--- 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 9ab471104fbc77e3931447f01163d89e62cdcbc8..60210b3781721247bf6d83b7819cf14d773588c2 100644 (file)
--- 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 45d1ea710b6b639eb35a1fa9fc62fb9d812fb511..4f443dc6980276e8897efc40243422cbeb8d81e0 100644 (file)
--- 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 091f81f7beb0c4b152c3a5967312ad819f316bfc..44c3b7d2b8b211073925746bd7f5da58e3dca318 100644 (file)
--- 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 f06b47a68a87b0c34c367c5386e7543732c98626..df13fcc838c543cb8fb3f190b6b727e4454ed26d 100644 (file)
--- 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}"