From 06a955fdb95f494d0cb7f4bed790082f18547337 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 11 Jul 2012 10:56:44 -0700 Subject: 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 --- conf/distro/fsl.conf | 6 ------ conf/machine/mpc8536ds.conf | 3 +++ conf/machine/mpc8544ds.conf | 3 +++ conf/machine/mpc8548cds.conf | 3 +++ conf/machine/mpc8572ds.conf | 3 +++ conf/machine/p1010rdb.conf | 3 +++ conf/machine/p1020mbg.conf | 3 +++ conf/machine/p1020rdb.conf | 3 +++ conf/machine/p1020utm.conf | 3 +++ conf/machine/p1021rdb.conf | 3 +++ conf/machine/p1022ds.conf | 3 +++ conf/machine/p1023rds.conf | 3 +++ conf/machine/p1024rdb.conf | 3 +++ conf/machine/p1025rdb.conf | 3 +++ conf/machine/p2020ds.conf | 3 +++ conf/machine/p2020rdb.conf | 3 +++ conf/machine/p2041rdb.conf | 3 +++ conf/machine/p3041ds.conf | 3 +++ conf/machine/p4080ds.conf | 3 +++ conf/machine/p5020ds-64b.conf | 3 +++ conf/machine/p5020ds.conf | 3 +++ conf/machine/p5040ds-64b.conf | 3 +++ conf/machine/p5040ds.conf | 3 +++ 23 files changed, 66 insertions(+), 6 deletions(-) diff --git a/conf/distro/fsl.conf b/conf/distro/fsl.conf index bcadbc7..2818b26 100644 --- a/conf/distro/fsl.conf +++ b/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/conf/machine/mpc8536ds.conf b/conf/machine/mpc8536ds.conf index 21effbc..bc74b8d 100644 --- a/conf/machine/mpc8536ds.conf +++ b/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/conf/machine/mpc8544ds.conf b/conf/machine/mpc8544ds.conf index a9cfadc..2199dcc 100644 --- a/conf/machine/mpc8544ds.conf +++ b/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/conf/machine/mpc8548cds.conf b/conf/machine/mpc8548cds.conf index 821aac0..01a5cc6 100644 --- a/conf/machine/mpc8548cds.conf +++ b/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/conf/machine/mpc8572ds.conf b/conf/machine/mpc8572ds.conf index 277cdc4..65033ea 100644 --- a/conf/machine/mpc8572ds.conf +++ b/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/conf/machine/p1010rdb.conf b/conf/machine/p1010rdb.conf index 362acd2..8525300 100644 --- a/conf/machine/p1010rdb.conf +++ b/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/conf/machine/p1020mbg.conf b/conf/machine/p1020mbg.conf index da62c43..57d826f 100644 --- a/conf/machine/p1020mbg.conf +++ b/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/conf/machine/p1020rdb.conf b/conf/machine/p1020rdb.conf index 653533c..c4cf9c5 100644 --- a/conf/machine/p1020rdb.conf +++ b/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/conf/machine/p1020utm.conf b/conf/machine/p1020utm.conf index 7929841..af67986 100644 --- a/conf/machine/p1020utm.conf +++ b/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/conf/machine/p1021rdb.conf b/conf/machine/p1021rdb.conf index 8e80752..0d9349e 100644 --- a/conf/machine/p1021rdb.conf +++ b/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/conf/machine/p1022ds.conf b/conf/machine/p1022ds.conf index 1f15303..7d7b6af 100644 --- a/conf/machine/p1022ds.conf +++ b/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/conf/machine/p1023rds.conf b/conf/machine/p1023rds.conf index 522bde6..f2397ef 100644 --- a/conf/machine/p1023rds.conf +++ b/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/conf/machine/p1024rdb.conf b/conf/machine/p1024rdb.conf index 1a7e315..98b5ea2 100644 --- a/conf/machine/p1024rdb.conf +++ b/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/conf/machine/p1025rdb.conf b/conf/machine/p1025rdb.conf index bcb167e..b5231fa 100644 --- a/conf/machine/p1025rdb.conf +++ b/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/conf/machine/p2020ds.conf b/conf/machine/p2020ds.conf index 3059bde..bedb3da 100644 --- a/conf/machine/p2020ds.conf +++ b/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/conf/machine/p2020rdb.conf b/conf/machine/p2020rdb.conf index 188a6f2..52e2e11 100644 --- a/conf/machine/p2020rdb.conf +++ b/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/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf index e161459..6854da3 100644 --- a/conf/machine/p2041rdb.conf +++ b/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/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf index 909761e..35b6feb 100644 --- a/conf/machine/p3041ds.conf +++ b/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/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf index 6c90912..0de0304 100644 --- a/conf/machine/p4080ds.conf +++ b/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/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf index e946076..46b3187 100644 --- a/conf/machine/p5020ds-64b.conf +++ b/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/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf index 3a5c672..7b5ed83 100644 --- a/conf/machine/p5020ds.conf +++ b/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/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf index 1560420..41f4ad2 100644 --- a/conf/machine/p5040ds-64b.conf +++ b/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/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf index f3719c6..dd09e34 100644 --- a/conf/machine/p5040ds.conf +++ b/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" -- cgit v1.2.3-54-g00ecf