From 4c611528b24543ea8592d3eb9f07e20a33f7fc09 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 | 5 ----- conf/machine/mpc8536ds.conf | 4 +++- conf/machine/mpc8544ds.conf | 4 +++- conf/machine/mpc8548cds.conf | 4 +++- conf/machine/mpc8572ds.conf | 4 +++- conf/machine/p1010rdb.conf | 4 +++- conf/machine/p1020mbg.conf | 4 +++- conf/machine/p1020rdb.conf | 4 +++- conf/machine/p1020utm.conf | 4 +++- conf/machine/p1021rdb.conf | 4 +++- conf/machine/p1022ds.conf | 4 +++- conf/machine/p1023rds.conf | 4 +++- conf/machine/p1024rdb.conf | 4 +++- conf/machine/p1025rdb.conf | 4 +++- conf/machine/p2020ds.conf | 4 +++- conf/machine/p2020rdb.conf | 4 +++- conf/machine/p2041rdb.conf | 4 +++- conf/machine/p3041ds.conf | 4 +++- conf/machine/p4080ds.conf | 4 +++- conf/machine/p5020ds-64b.conf | 4 +++- conf/machine/p5020ds.conf | 4 +++- conf/machine/p5040ds-64b.conf | 4 +++- conf/machine/p5040ds.conf | 4 +++- 23 files changed, 66 insertions(+), 27 deletions(-) diff --git a/conf/distro/fsl.conf b/conf/distro/fsl.conf index 34c505c..e8f966c 100644 --- a/conf/distro/fsl.conf +++ b/conf/distro/fsl.conf @@ -57,9 +57,4 @@ PREFERRED_VERSION_samba = "3.4.0" 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" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" - CCACHE = "" diff --git a/conf/machine/mpc8536ds.conf b/conf/machine/mpc8536ds.conf index 5a173d0..b0916b1 100644 --- a/conf/machine/mpc8536ds.conf +++ b/conf/machine/mpc8536ds.conf @@ -10,6 +10,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8536ds.dts" KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig" JFFS2_ERASEBLOCK = "0x20000" + +SYSVINIT_ENABLED_GETTYS = "" +USE_VT = "" SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/mpc8544ds.conf b/conf/machine/mpc8544ds.conf index 50ea26f..1ee19a3 100644 --- a/conf/machine/mpc8544ds.conf +++ b/conf/machine/mpc8544ds.conf @@ -9,6 +9,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8544ds.dts" KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig" JFFS2_ERASEBLOCK = "0x20000" + +SYSVINIT_ENABLED_GETTYS = "" +USE_VT = "" SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/mpc8548cds.conf b/conf/machine/mpc8548cds.conf index 0f6d194..53cd6c7 100644 --- a/conf/machine/mpc8548cds.conf +++ b/conf/machine/mpc8548cds.conf @@ -9,6 +9,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8548cds_32b.dts" KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig" JFFS2_ERASEBLOCK = "0x20000" + +SYSVINIT_ENABLED_GETTYS = "" +USE_VT = "" SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/mpc8572ds.conf b/conf/machine/mpc8572ds.conf index 9e175af..c8035c6 100644 --- a/conf/machine/mpc8572ds.conf +++ b/conf/machine/mpc8572ds.conf @@ -8,6 +8,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8572ds.dts" 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" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p1010rdb.conf b/conf/machine/p1010rdb.conf index 02be56b..cdde545 100644 --- a/conf/machine/p1010rdb.conf +++ b/conf/machine/p1010rdb.conf @@ -9,6 +9,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1010rdb.dts" KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig" JFFS2_ERASEBLOCK = "0x20000" + +SYSVINIT_ENABLED_GETTYS = "" +USE_VT = "" SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p1020mbg.conf b/conf/machine/p1020mbg.conf index a9f21b9..f58a51c 100644 --- a/conf/machine/p1020mbg.conf +++ b/conf/machine/p1020mbg.conf @@ -10,6 +10,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020mbg-pc_32b.dts" 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" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p1020rdb.conf b/conf/machine/p1020rdb.conf index f7e7e4d..f5df0d6 100644 --- a/conf/machine/p1020rdb.conf +++ b/conf/machine/p1020rdb.conf @@ -11,6 +11,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020rdb-pc_32b.dts" 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" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p1020utm.conf b/conf/machine/p1020utm.conf index 4fd5693..0833914 100644 --- a/conf/machine/p1020utm.conf +++ b/conf/machine/p1020utm.conf @@ -10,6 +10,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020utm-pc_32b.dts" 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" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p1021rdb.conf b/conf/machine/p1021rdb.conf index 2e626f4..d73b416 100644 --- a/conf/machine/p1021rdb.conf +++ b/conf/machine/p1021rdb.conf @@ -9,6 +9,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1021rdb-pc_32b.dts" 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" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p1022ds.conf b/conf/machine/p1022ds.conf index d02f5b4..ddae5d4 100644 --- a/conf/machine/p1022ds.conf +++ b/conf/machine/p1022ds.conf @@ -19,6 +19,8 @@ XSERVER = " \ " JFFS2_ERASEBLOCK = "0x20000" + +SYSVINIT_ENABLED_GETTYS = "" +USE_VT = "" SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p1023rds.conf b/conf/machine/p1023rds.conf index ea9b2b3..2ddac81 100644 --- a/conf/machine/p1023rds.conf +++ b/conf/machine/p1023rds.conf @@ -8,6 +8,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1023rds.dts" 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" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p1024rdb.conf b/conf/machine/p1024rdb.conf index 899e94f..e6172ac 100644 --- a/conf/machine/p1024rdb.conf +++ b/conf/machine/p1024rdb.conf @@ -10,6 +10,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1024rdb_32b.dts" 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" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p1025rdb.conf b/conf/machine/p1025rdb.conf index ac282d7..41f1c5d 100644 --- a/conf/machine/p1025rdb.conf +++ b/conf/machine/p1025rdb.conf @@ -11,6 +11,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1025rdb_32b.dts" 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" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p2020ds.conf b/conf/machine/p2020ds.conf index f4de26a..c1c4b27 100644 --- a/conf/machine/p2020ds.conf +++ b/conf/machine/p2020ds.conf @@ -9,6 +9,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2020ds.dts" 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" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p2020rdb.conf b/conf/machine/p2020rdb.conf index eac158f..26c8ad6 100644 --- a/conf/machine/p2020rdb.conf +++ b/conf/machine/p2020rdb.conf @@ -10,6 +10,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2020rdb-pc_32b.dts" 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" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf index 389e578..9f12e4b 100644 --- a/conf/machine/p2041rdb.conf +++ b/conf/machine/p2041rdb.conf @@ -9,6 +9,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2041rdb.dts \ 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" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf index 749067f..0fdc2db 100644 --- a/conf/machine/p3041ds.conf +++ b/conf/machine/p3041ds.conf @@ -9,6 +9,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p3041ds.dts \ 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" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf index 2541c3f..f8df544 100644 --- a/conf/machine/p4080ds.conf +++ b/conf/machine/p4080ds.conf @@ -9,6 +9,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p4080ds.dts \ 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" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf index 6449337..7ed02e8 100644 --- a/conf/machine/p5020ds-64b.conf +++ b/conf/machine/p5020ds-64b.conf @@ -10,6 +10,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts \ 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" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf index 7b43f7b..45c2f71 100644 --- a/conf/machine/p5020ds.conf +++ b/conf/machine/p5020ds.conf @@ -9,6 +9,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts \ 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" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf index 56abacd..7433497 100644 --- a/conf/machine/p5040ds-64b.conf +++ b/conf/machine/p5040ds-64b.conf @@ -9,6 +9,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5040ds.dts \ 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" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf index 3ddea39..81c3886 100644 --- a/conf/machine/p5040ds.conf +++ b/conf/machine/p5040ds.conf @@ -9,6 +9,8 @@ KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5040ds.dts \ 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" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" -- cgit v1.2.3-54-g00ecf