machines: Move machine specific variable to machine conf

These variables are machine specific and therefore they
need to be in machine conf

Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/meta-fsl-ppc/conf/distro/fsl.conf b/meta-fsl-ppc/conf/distro/fsl.conf
index bcadbc74f02f7683aa5e8c9627f4b3579a35a398..2818b2653652da2045b5ff631e5f082467e9e952 100644 (file)
--- a/meta-fsl-ppc/conf/distro/fsl.conf
+++ b/meta-fsl-ppc/conf/distro/fsl.conf
@@ -88,10 +88,4 @@ PREFERRED_VERSION_u-boot-mkimage-native_powerpc = "2011.06"
 PREFERRED_PROVIDER_virtual/libx11 = "libx11"
 PREFERRED_PROVIDER_linux-libc-headers-nativesdk ?= "linux-qoriq-sdk-headers-nativesdk"
 
-SYSVINIT_ENABLED_GETTYS = ""
-USE_VT = ""
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-
 CCACHE = ""
-
-

diff --git a/meta-fsl-ppc/conf/machine/mpc8536ds.conf b/meta-fsl-ppc/conf/machine/mpc8536ds.conf
index 21effbc910715121225f0364449ba01f0928e3e0..bc74b8da6a95026aa91080e5f8c15a3c0639c668 100644 (file)
--- a/meta-fsl-ppc/conf/machine/mpc8536ds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8536ds.conf
@@ -11,3 +11,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/mpc8544ds.conf b/meta-fsl-ppc/conf/machine/mpc8544ds.conf
index a9cfadc352792f0158bd5c69df484d01fa809dd7..2199dcc5695c5f00589109d6f4c363c3f29ad5b6 100644 (file)
--- a/meta-fsl-ppc/conf/machine/mpc8544ds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8544ds.conf
@@ -10,3 +10,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/mpc8548cds.conf b/meta-fsl-ppc/conf/machine/mpc8548cds.conf
index 821aac0e5923fa5dcc9959a984a916c536e48568..01a5cc6180699c91515965f99644d6e2b14fa01f 100644 (file)
--- a/meta-fsl-ppc/conf/machine/mpc8548cds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8548cds.conf
@@ -10,3 +10,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/mpc8572ds.conf b/meta-fsl-ppc/conf/machine/mpc8572ds.conf
index 277cdc41a46418c8b176e13fc0b9a4c32d232917..65033ea2721edd1122234eb90dc83529509f2c31 100644 (file)
--- a/meta-fsl-ppc/conf/machine/mpc8572ds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8572ds.conf
@@ -9,3 +9,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p1010rdb.conf b/meta-fsl-ppc/conf/machine/p1010rdb.conf
index 362acd214d5ad1aba093a098d43d1c0c2c37d085..85253000bc45a4eb671515acb4b64364695003c9 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1010rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1010rdb.conf
@@ -10,3 +10,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p1020mbg.conf b/meta-fsl-ppc/conf/machine/p1020mbg.conf
index da62c432dbeeeafaea5856275e7174298adc0a2e..57d826fd5afe97cb08bbf4f847354ef3da38bb0f 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1020mbg.conf
+++ b/meta-fsl-ppc/conf/machine/p1020mbg.conf
@@ -11,3 +11,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p1020rdb.conf b/meta-fsl-ppc/conf/machine/p1020rdb.conf
index 653533cfd6b932cb4ab27006b117d5fe76d4bc81..c4cf9c5a7742f439e3e355cd6681b9aa7ed781c1 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1020rdb.conf
@@ -12,3 +12,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p1020utm.conf b/meta-fsl-ppc/conf/machine/p1020utm.conf
index 79298413cb662faa1668f78813861e5d7ea81fb7..af67986940198fe8a59e32de1e9813e237289aae 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1020utm.conf
+++ b/meta-fsl-ppc/conf/machine/p1020utm.conf
@@ -11,3 +11,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p1021rdb.conf b/meta-fsl-ppc/conf/machine/p1021rdb.conf
index 8e8075206797efc186df2952287cc020aa1c48f2..0d9349eca51bba7e31d185e1fb4616a9abd364b1 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1021rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1021rdb.conf
@@ -10,3 +10,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p1022ds.conf b/meta-fsl-ppc/conf/machine/p1022ds.conf
index 1f15303cffbf5314d7b72f3a7d8982e401fc5ee7..7d7b6af79e89bf427d68a2cf9602a3b6336e94da 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1022ds.conf
+++ b/meta-fsl-ppc/conf/machine/p1022ds.conf
@@ -20,3 +20,6 @@ XSERVER = " \
 
 JFFS2_ERASEBLOCK = "0x20000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p1023rds.conf b/meta-fsl-ppc/conf/machine/p1023rds.conf
index 522bde6c3cbd0702e0e1950da1e115a679d7b40d..f2397ef2717c61a6385f5eaf0a754327f500bc9c 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1023rds.conf
+++ b/meta-fsl-ppc/conf/machine/p1023rds.conf
@@ -9,3 +9,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/p1023rds_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p1024rdb.conf b/meta-fsl-ppc/conf/machine/p1024rdb.conf
index 1a7e315d384a71200255549a73cdda4b4df1e121..98b5ea24713b80135a789b65d9b5e9914c9e271d 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1024rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1024rdb.conf
@@ -11,3 +11,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p1025rdb.conf b/meta-fsl-ppc/conf/machine/p1025rdb.conf
index bcb167ef9fd455c1f3ead0c98c6355147b94b8b6..b5231fa25f2ce1fc857fe97d0b72076c5e51b8e7 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1025rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1025rdb.conf
@@ -12,3 +12,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p2020ds.conf b/meta-fsl-ppc/conf/machine/p2020ds.conf
index 3059bdefe47522fdc608fdab16cae18c1ec957ac..bedb3da3f2394cbb7330ac1e3c17684072998f80 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p2020ds.conf
+++ b/meta-fsl-ppc/conf/machine/p2020ds.conf
@@ -10,3 +10,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p2020rdb.conf b/meta-fsl-ppc/conf/machine/p2020rdb.conf
index 188a6f2eda464bae8cd1d4180af50c4668faf7aa..52e2e11e2c929d3e2cb9b661f50a154b3f8e3369 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p2020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p2020rdb.conf
@@ -11,3 +11,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p2041rdb.conf b/meta-fsl-ppc/conf/machine/p2041rdb.conf
index e16145981e8c5eb56157e31014bc139821cfa074..6854da349a622351b246b5555783f146a21c8b9a 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p2041rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p2041rdb.conf
@@ -10,3 +10,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p3041ds.conf b/meta-fsl-ppc/conf/machine/p3041ds.conf
index 909761e4b5c4cdf17fd2963fde23ce3219c25f4c..35b6feb4c3700d0167fabb996c23c010b5581c4e 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p3041ds.conf
+++ b/meta-fsl-ppc/conf/machine/p3041ds.conf
@@ -10,3 +10,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p4080ds.conf b/meta-fsl-ppc/conf/machine/p4080ds.conf
index 6c90912e3c18065b5abe1522873bb7c80251e44e..0de03042543f6dbb5b5ef205ab0e00953f3195d8 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p4080ds.conf
+++ b/meta-fsl-ppc/conf/machine/p4080ds.conf
@@ -10,3 +10,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
index e946076b0f829ed51b93a924bc2b7c4df35a3f79..46b3187c9d50d9f6f79b22c4de61394133cf05f3 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
@@ -11,3 +11,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p5020ds.conf b/meta-fsl-ppc/conf/machine/p5020ds.conf
index 3a5c67219bdc2e15a457160c84b96cb4bcec7ca6..7b5ed832bbfe60d1aafba3999b3d19b7e92909bb 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5020ds.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds.conf
@@ -10,3 +10,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
index 156042010b996f621bf88b9cf14356e78e19950b..41f4ad2c36b7ee5a80cee82b37d7bdb395515631 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
@@ -10,3 +10,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"

diff --git a/meta-fsl-ppc/conf/machine/p5040ds.conf b/meta-fsl-ppc/conf/machine/p5040ds.conf
index f3719c6e968d5c8f17ac6c5564820ac20f73f4a0..dd09e34103b54fc353da3f71006bb00ba58e234b 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5040ds.conf
+++ b/meta-fsl-ppc/conf/machine/p5040ds.conf
@@ -10,3 +10,6 @@ KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+SYSVINIT_ENABLED_GETTYS = ""
+USE_VT = ""
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"