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, 44 insertions, 23 deletions

diff --git a/conf/distro/fsl.conf b/conf/distro/fsl.conf
index 31485e8..597993e 100644
--- a/conf/distro/fsl.conf
+++ b/conf/distro/fsl.conf
@@ -60,6 +60,5 @@ FREESCALE_GIT = "git://git.am.freescale.net"
 
 SYSVINIT_ENABLED_GETTYS = ""
 USE_VT = ""
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
 
 CCACHE = ""
diff --git a/conf/machine/mpc8536ds.conf b/conf/machine/mpc8536ds.conf
index 21effbc..cb2ff3b 100644
--- a/conf/machine/mpc8536ds.conf
+++ b/conf/machine/mpc8536ds.conf
@@ -10,4 +10,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8536ds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
-
+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 a9cfadc..844d14e 100644
--- a/conf/machine/mpc8544ds.conf
+++ b/conf/machine/mpc8544ds.conf
@@ -9,4 +9,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8544ds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
-
+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 821aac0..f8c5071 100644
--- a/conf/machine/mpc8548cds.conf
+++ b/conf/machine/mpc8548cds.conf
@@ -9,4 +9,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8548cds_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
-
+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 277cdc4..25a731b 100644
--- a/conf/machine/mpc8572ds.conf
+++ b/conf/machine/mpc8572ds.conf
@@ -8,4 +8,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8572ds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
-
+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 362acd2..b056b53 100644
--- a/conf/machine/p1010rdb.conf
+++ b/conf/machine/p1010rdb.conf
@@ -9,4 +9,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1010rdb.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
-
+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 da62c43..b30faad 100644
--- a/conf/machine/p1020mbg.conf
+++ b/conf/machine/p1020mbg.conf
@@ -10,4 +10,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020mbg-pc_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
-
+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 653533c..5c0acbc 100644
--- a/conf/machine/p1020rdb.conf
+++ b/conf/machine/p1020rdb.conf
@@ -11,4 +11,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020rdb-pc_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
-
+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 7929841..ec6f2e2 100644
--- a/conf/machine/p1020utm.conf
+++ b/conf/machine/p1020utm.conf
@@ -10,4 +10,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020utm-pc_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
-
+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 8e80752..144bfec 100644
--- a/conf/machine/p1021rdb.conf
+++ b/conf/machine/p1021rdb.conf
@@ -9,4 +9,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1021rdb-pc_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
-
+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 388417e..0d38bd5 100644
--- a/conf/machine/p1022ds.conf
+++ b/conf/machine/p1022ds.conf
@@ -19,4 +19,5 @@ XSERVER = " \
 "
 
 JFFS2_ERASEBLOCK = "0x20000"
-
+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 522bde6..20795b4 100644
--- a/conf/machine/p1023rds.conf
+++ b/conf/machine/p1023rds.conf
@@ -8,4 +8,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1023rds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/p1023rds_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
+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 1a7e315..66404fb 100644
--- a/conf/machine/p1024rdb.conf
+++ b/conf/machine/p1024rdb.conf
@@ -10,4 +10,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1024rdb_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
-
+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 bcb167e..b64fe7c 100644
--- a/conf/machine/p1025rdb.conf
+++ b/conf/machine/p1025rdb.conf
@@ -11,4 +11,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1025rdb_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
-
+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 3059bde..ea988dd 100644
--- a/conf/machine/p2020ds.conf
+++ b/conf/machine/p2020ds.conf
@@ -9,4 +9,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2020ds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
-
+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 188a6f2..6bbad78 100644
--- a/conf/machine/p2020rdb.conf
+++ b/conf/machine/p2020rdb.conf
@@ -10,4 +10,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2020rdb-pc_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
-
+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 e161459..7549380 100644
--- a/conf/machine/p2041rdb.conf
+++ b/conf/machine/p2041rdb.conf
@@ -9,4 +9,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2041rdb.dts \
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
+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 909761e..3facf4c 100644
--- a/conf/machine/p3041ds.conf
+++ b/conf/machine/p3041ds.conf
@@ -9,4 +9,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p3041ds.dts \
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
+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 6c90912..d8cc1f2 100644
--- a/conf/machine/p4080ds.conf
+++ b/conf/machine/p4080ds.conf
@@ -9,4 +9,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p4080ds.dts \
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
+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 e946076..7cda9f3 100644
--- a/conf/machine/p5020ds-64b.conf
+++ b/conf/machine/p5020ds-64b.conf
@@ -10,4 +10,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts \
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
+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 3a5c672..c3cf285 100644
--- a/conf/machine/p5020ds.conf
+++ b/conf/machine/p5020ds.conf
@@ -9,4 +9,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts \
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
+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 1560420..cb5ed52 100644
--- a/conf/machine/p5040ds-64b.conf
+++ b/conf/machine/p5040ds-64b.conf
@@ -9,4 +9,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5040ds.dts \
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
+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 f3719c6..852dc5e 100644
--- a/conf/machine/p5040ds.conf
+++ b/conf/machine/p5040ds.conf
@@ -9,4 +9,5 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5040ds.dts \
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"