conf/machine/: move common bits to inc files

* add four new files to hold common bits:
   include/qoriq-base.inc
   include/qoriq-default-providers.inc
   include/qoriq-default-settings.inc
   include/qoriq-default-versions.inc
* add 'qoriq-ppc' into list of MACHINEOVERRIDES

Signed-off-by: Ting Liu <b28495@freescale.com>

diff --git a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf b/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
index 45c820e4359f2f7313fa75b1960ee14b3b8cddca..a623c84f426b8d9eeeda8350aae7da53a75dfdf6 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
@@ -5,17 +5,11 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "b4420"
-
-# TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "B4420QDS"
 KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/b4420qds.conf b/meta-fsl-ppc/conf/machine/b4420qds.conf
index 9016cfb577d542246d68b29bb806d675c6e7ddac..fa1187b2032f09beeff551313910a79ccb68a6ed 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4420qds.conf
+++ b/meta-fsl-ppc/conf/machine/b4420qds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "b4420"
 UBOOT_MACHINES ?= "B4420QDS"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"

diff --git a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
index 4da069f9e9171ec9a8d45e745726554b9bb2a1f6..3ba56482e34d87c04f9205491e8f658a972fc03a 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
@@ -5,16 +5,11 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "b4860"
-# TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "B4860QDS"
 KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/b4860qds.conf b/meta-fsl-ppc/conf/machine/b4860qds.conf
index c560f1c7365accf33c4bd2d22d6aa7f82e5e117c..972d29f86b55b7d8ddbd3c856bfe62d5a729edaf 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4860qds.conf
+++ b/meta-fsl-ppc/conf/machine/b4860qds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "b4860"
 UBOOT_MACHINES ?= "B4860QDS"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"

diff --git a/meta-fsl-ppc/conf/machine/bsc9131rdb.conf b/meta-fsl-ppc/conf/machine/bsc9131rdb.conf
index 64ba795c4e1297362cd75224aec2ab56c01e0d8f..e65f7e4e21dfcd17063e97f8cb8fa8eadb104650 100644 (file)
--- a/meta-fsl-ppc/conf/machine/bsc9131rdb.conf
+++ b/meta-fsl-ppc/conf/machine/bsc9131rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com> 
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "bsc9131"
 UBOOT_MACHINES ?= "BSC9131RDB_SPIFLASH BSC9131RDB_NAND BSC9131RDB_NAND_SYSCLK100 BSC9131RDB_SPIFLASH_SYSCLK100"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/bsc913x_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/bsc9132qds.conf b/meta-fsl-ppc/conf/machine/bsc9132qds.conf
index a51cbd851b4de72e23cc5d525a81d12d64708a46..82078ee3ddc69cbb6dd90d7ce7d80249ba9423f8 100644 (file)
--- a/meta-fsl-ppc/conf/machine/bsc9132qds.conf
+++ b/meta-fsl-ppc/conf/machine/bsc9132qds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "bsc9132"
 UBOOT_MACHINES ?= " BSC9132QDS_NAND_DDRCLK133 BSC9132QDS_NAND_DDRCLK100 BSC9132QDS_NOR_DDRCLK100 BSC9132QDS_NOR_DDRCLK133 BSC9132QDS_SDCARD_DDRCLK100 BSC9132QDS_SDCARD_DDRCLK133 BSC9132QDS_SPIFLASH_DDRCLK100 BSC9132QDS_SPIFLASH_DDRCLK133"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/bsc913x_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/c293pcie.conf b/meta-fsl-ppc/conf/machine/c293pcie.conf
index b22dfd054a1359eb22cd0f3bfd4707696a58e937..6a63844e0b0029da8735195c361ae112f920b3ec 100644 (file)
--- a/meta-fsl-ppc/conf/machine/c293pcie.conf
+++ b/meta-fsl-ppc/conf/machine/c293pcie.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "c293pcie"
 BOOTFORMAT_CONFIG = "config_ddr3_512m_c29xpcie_800M.dat"
@@ -15,6 +14,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/include/e500mc.inc b/meta-fsl-ppc/conf/machine/include/e500mc.inc
index a35d91b8d4c68a4425bdcc599bcfe4c2a3ca3529..09b5c69e1ba7b93457311cd5d42dcbaa806a6d8f 100644 (file)
--- a/meta-fsl-ppc/conf/machine/include/e500mc.inc
+++ b/meta-fsl-ppc/conf/machine/include/e500mc.inc
@@ -1,17 +1,6 @@
 TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce500mc.inc
-
-MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
-
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-#              ext2.bz2 ext2.lzma \
-#              ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+require conf/machine/include/qoriq-base.inc
 
 MACHINEOVERRIDES .= ":e500mc:fslmachine"

diff --git a/meta-fsl-ppc/conf/machine/include/e500v2.inc b/meta-fsl-ppc/conf/machine/include/e500v2.inc
index adaa3cdf3c2d072b4b28a205382e91c10876c3ac..178de1882865fcd09fd62c9c1feaa9ed072822ab 100644 (file)
--- a/meta-fsl-ppc/conf/machine/include/e500v2.inc
+++ b/meta-fsl-ppc/conf/machine/include/e500v2.inc
@@ -1,15 +1,4 @@
 require conf/machine/include/tune-ppce500v2.inc
-
-MACHINE_FEATURES = "pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
-
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-#              ext2.bz2 ext2.lzma \
-#              ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+require conf/machine/include/qoriq-base.inc
 
 MACHINEOVERRIDES .= ":e500v2:fslmachine"

diff --git a/meta-fsl-ppc/conf/machine/include/e5500-64b.inc b/meta-fsl-ppc/conf/machine/include/e5500-64b.inc
index c951843456ca4a3a24e813380447f8e586186ac6..47a9ad7c54213020217c78f77093156365f52ca2 100644 (file)
--- a/meta-fsl-ppc/conf/machine/include/e5500-64b.inc
+++ b/meta-fsl-ppc/conf/machine/include/e5500-64b.inc
@@ -1,18 +1,7 @@
 TARGET_FPU = "hard"
-
 DEFAULTTUNE ?= "ppc64e5500"
-require conf/machine/include/tune-ppce5500.inc
-
-MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
-
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-#              ext2.bz2 ext2.lzma \
-#              ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+require conf/machine/include/tune-ppce5500.inc
+require conf/machine/include/qoriq-base.inc
 
 MACHINEOVERRIDES .= ":e5500-64b:fslmachine"

diff --git a/meta-fsl-ppc/conf/machine/include/e5500.inc b/meta-fsl-ppc/conf/machine/include/e5500.inc
index 0babacca527e6f53e887d6029fbeb49db749da16..e6f0400ad49d45d1611c00937555012538638e51 100644 (file)
--- a/meta-fsl-ppc/conf/machine/include/e5500.inc
+++ b/meta-fsl-ppc/conf/machine/include/e5500.inc
@@ -1,17 +1,6 @@
 TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce5500.inc
-
-MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
-
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-#              ext2.bz2 ext2.lzma \
-#              ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+require conf/machine/include/qoriq-base.inc
 
 MACHINEOVERRIDES .= ":e5500:fslmachine"

diff --git a/meta-fsl-ppc/conf/machine/include/e6500-64b.inc b/meta-fsl-ppc/conf/machine/include/e6500-64b.inc
index 36f55a2c469354e331564ed83eb797cfd84f3ba9..0770cc37dcb0e5864a8cd01d26c50c8d24307b76 100644 (file)
--- a/meta-fsl-ppc/conf/machine/include/e6500-64b.inc
+++ b/meta-fsl-ppc/conf/machine/include/e6500-64b.inc
@@ -1,18 +1,7 @@
 TARGET_FPU = "hard"
-
 DEFAULTTUNE ?= "ppc64e6500"
-require conf/machine/include/tune-ppce6500.inc
-
-MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
-
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-#              ext2.bz2 ext2.lzma \
-#              ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+require conf/machine/include/tune-ppce6500.inc
+require conf/machine/include/qoriq-base.inc
 
 MACHINEOVERRIDES .= ":e6500-64b:fslmachine"

diff --git a/meta-fsl-ppc/conf/machine/include/e6500.inc b/meta-fsl-ppc/conf/machine/include/e6500.inc
index 81a2bf4799bb4060e64d86d8d9493bc91582c1f0..323e420d7bf19ab8e1b4a618b59322d25cd95f1b 100644 (file)
--- a/meta-fsl-ppc/conf/machine/include/e6500.inc
+++ b/meta-fsl-ppc/conf/machine/include/e6500.inc
@@ -1,17 +1,9 @@
 TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce6500.inc
+require conf/machine/include/qoriq-base.inc
 
-MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
+MACHINEOVERRIDES .= ":e6500:fslmachine"
 
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-#              ext2.bz2 ext2.lzma \
-#              ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+BUILD_64BIT_KERNEL = "1"
 
-MACHINEOVERRIDES .= ":e6500:fslmachine"

diff --git a/meta-fsl-ppc/conf/machine/include/qoriq-base.inc b/meta-fsl-ppc/conf/machine/include/qoriq-base.inc
new file mode 100644 (file)
index 0000000..9b26d10
--- /dev/null
+++ b/meta-fsl-ppc/conf/machine/include/qoriq-base.inc
@@ -0,0 +1,8 @@
+# Provides the QorIQ common settings
+
+require conf/machine/include/qoriq-default-settings.inc
+require conf/machine/include/qoriq-default-versions.inc
+require conf/machine/include/qoriq-default-providers.inc
+
+require conf/machine/include/soc-family.inc
+

diff --git a/meta-fsl-ppc/conf/machine/include/qoriq-default-providers.inc b/meta-fsl-ppc/conf/machine/include/qoriq-default-providers.inc
new file mode 100644 (file)
index 0000000..824712b
--- /dev/null
+++ b/meta-fsl-ppc/conf/machine/include/qoriq-default-providers.inc
@@ -0,0 +1,2 @@
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
+

diff --git a/meta-fsl-ppc/conf/machine/include/qoriq-default-settings.inc b/meta-fsl-ppc/conf/machine/include/qoriq-default-settings.inc
new file mode 100644 (file)
index 0000000..a4fc0ec
--- /dev/null
+++ b/meta-fsl-ppc/conf/machine/include/qoriq-default-settings.inc
@@ -0,0 +1,15 @@
+MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
+MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
+
+KERNEL_IMAGETYPE ?= "uImage"
+# disable the images below for now
+#       ext2.bz2 ext2.lzma \
+#       ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+
+MACHINEOVERRIDES .= ":qoriq-ppc"
+
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
+
+USE_VT = "0"
+

diff --git a/meta-fsl-ppc/conf/machine/include/qoriq-default-versions.inc b/meta-fsl-ppc/conf/machine/include/qoriq-default-versions.inc
new file mode 100644 (file)
index 0000000..3bb03ba
--- /dev/null
+++ b/meta-fsl-ppc/conf/machine/include/qoriq-default-versions.inc
@@ -0,0 +1,3 @@
+PREFERRED_VERSION_qemu = "1.7+fsl"
+PREFERRED_VERSION_openssl = "1.0.1g"
+

diff --git a/meta-fsl-ppc/conf/machine/p1010rdb.conf b/meta-fsl-ppc/conf/machine/p1010rdb.conf
index 10b1c927e527b7cc9429d7a2ceec6371e538f660..ee7a9b61a548beac6f067c1eee2de75bd71fdd9b 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1010rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1010rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1010"
 BOOTFORMAT_CONFIG = "config_sram_p1010rdb.dat"
@@ -17,6 +16,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/p1020rdb.conf b/meta-fsl-ppc/conf/machine/p1020rdb.conf
index 3fa73771f65b1eb9fd69402946df15e7cf19aad7..e2b706ed4ae83885a7db969ee37efbe9f54a3f88 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1020rdb.conf
@@ -5,18 +5,12 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1020"
 BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
 UBOOT_MACHINES ?= " P1020RDB-PD P1020RDB-PD_NAND P1020RDB-PD_SDCARD P1020RDB-PD_SPIFLASH"
-
 KERNEL_DEVICETREE ?= "p1020rdb-pd_32b.dtb"
-
 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}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/p1021rdb.conf b/meta-fsl-ppc/conf/machine/p1021rdb.conf
index 711a62d912805a2047be839517c70dd92450c86d..4c793e8ef1d6adb1f85d5a2df1c008940e7b6ddc 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1021rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1021rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1021"
 BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
@@ -15,6 +14,3 @@ 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}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/p1022ds.conf b/meta-fsl-ppc/conf/machine/p1022ds.conf
index 107cbe4bce05baf8a1c788989b98d449f8e1c8b4..823131ad6f9701bafa89c6869c779d55f6ca6f62 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1022ds.conf
+++ b/meta-fsl-ppc/conf/machine/p1022ds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1022"
 BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
@@ -25,6 +24,3 @@ XSERVER = " \
 
 JFFS2_ERASEBLOCK = "0x20000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/p1023rdb.conf b/meta-fsl-ppc/conf/machine/p1023rdb.conf
index 59a9ce61fb21ad6a31e0bacd52daf5feda0e04dd..02ec4a59dfb92996460cd13c40308afef1f4d0bb 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1023rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1023rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1023"
 UBOOT_MACHINES ?= "P1023RDB"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/p1023_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/p1025twr.conf b/meta-fsl-ppc/conf/machine/p1025twr.conf
index e7d25fe974023112721acd8bf3b1f5af4f12e71c..67fa569f34c0598722d9f84c6c6656abdd0c3e99 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1025twr.conf
+++ b/meta-fsl-ppc/conf/machine/p1025twr.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1025"
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
@@ -15,6 +14,3 @@ 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}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/p2020ds.conf b/meta-fsl-ppc/conf/machine/p2020ds.conf
index 7510787678f76c1960d204040c4a21772ee1dbd5..96433a2e03dc0e0f7c9e858728add06bad800615 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p2020ds.conf
+++ b/meta-fsl-ppc/conf/machine/p2020ds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p2020"
 BOOTFORMAT_CONFIG = "config_sram_p2020ds.dat"
@@ -15,6 +14,3 @@ 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}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/p2020rdb.conf b/meta-fsl-ppc/conf/machine/p2020rdb.conf
index c3d08c95294b41efa48e18bfa641d9be021c4967..9544c256748cd695707079ad150db08c865ede4e 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p2020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p2020rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p2020"
 BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
@@ -15,6 +14,3 @@ 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}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/p2041rdb.conf b/meta-fsl-ppc/conf/machine/p2041rdb.conf
index d06df45c866165a2643d925096dcfe3c3683db23..f641a000ca187f8459b0a1e58b5cd8db098b924b 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p2041rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p2041rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500mc.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p2041"
 UBOOT_MACHINES ?= "P2041RDB P2041RDB_NAND P2041RDB_SECURE_BOOT P2041RDB_SDCARD P2041RDB_SPIFLASH"
@@ -14,6 +13,3 @@ 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}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/p3041ds.conf b/meta-fsl-ppc/conf/machine/p3041ds.conf
index 7be35b9373ca569b2310594dac6a60f4ea15dfdd..01c51e40e11180e6f636fcfefbc76498094bfa0e 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p3041ds.conf
+++ b/meta-fsl-ppc/conf/machine/p3041ds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500mc.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p3041"
 UBOOT_MACHINES ?= "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT P3041DS_SDCARD P3041DS_SPIFLASH"
@@ -14,6 +13,3 @@ 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}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/p4080ds.conf b/meta-fsl-ppc/conf/machine/p4080ds.conf
index 51c0fed8fc9ae8006b48597172fe33dc9c786560..1b6fad747bae4a524f4be6e4b9f8761080489345 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p4080ds.conf
+++ b/meta-fsl-ppc/conf/machine/p4080ds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500mc.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p4080"
 UBOOT_MACHINES ?= "P4080DS P4080DS_SECURE_BOOT P4080DS_SDCARD P4080DS_SPIFLASH "
@@ -14,6 +13,3 @@ 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}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
index a901b48eb308472c0f934ea06d9ef9f0fa6dacc1..057e9f3a080bd509e61c833163289d24980c36b2 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
@@ -5,16 +5,11 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p5020"
-# TODO: fix 32bit build of u-boot for p5020ds-64b
 UBOOT_MACHINES ?= "P5020DS"
 KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb"
 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}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/p5020ds.conf b/meta-fsl-ppc/conf/machine/p5020ds.conf
index 42ab7690be1d36ede7be58f21d7ac04aa83ce4e6..7effe1e969e62cbfa3f4ca12c51cc4e036c17355 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5020ds.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p5020"
 UBOOT_MACHINES ?= "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT P5020DS_SDCARD P5020DS_SPIFLASH "
@@ -14,6 +13,3 @@ 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}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
index c462970a7f680e77f8a98b76bd86ec4063089d40..fbbe9e2ff50d761f8ef7d10e01bc4447534c146d 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p5040"
 UBOOT_MACHINES ?= "P5040DS  P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH"
@@ -14,6 +13,3 @@ 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}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/p5040ds.conf b/meta-fsl-ppc/conf/machine/p5040ds.conf
index 8f5ea620d5b8eaf0dbbf6509995d26d9b5d2d699..1cd95120cac4a7d80629e3990b56f52b9294a195 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5040ds.conf
+++ b/meta-fsl-ppc/conf/machine/p5040ds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p5040"
 UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH"
@@ -14,6 +13,3 @@ 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}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/t1040rdb-64b.conf b/meta-fsl-ppc/conf/machine/t1040rdb-64b.conf
index bc4de7b4efd8111ed8f165b23b85828b1c5dacaa..b4ea5c8669eb12ce9c7fd51f19ba5783944a5c17 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t1040rdb-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t1040rdb-64b.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t1040"
 UBOOT_MACHINES ?= "T1040RDB"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_64bit_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/t1040rdb.conf b/meta-fsl-ppc/conf/machine/t1040rdb.conf
index d2ec7a4c59372088148e8f933a82937dc2a4d6e2..684cf8ee2223eda43f02c2f4e68d936095f6cc67 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t1040rdb.conf
+++ b/meta-fsl-ppc/conf/machine/t1040rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t1040"
 UBOOT_MACHINES ?= "T1040RDB"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_32bit_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/t1042rdb-64b.conf b/meta-fsl-ppc/conf/machine/t1042rdb-64b.conf
index 58b2bd0fba7ac23a09147e69438141fe1922db1e..0141e1027a45bb7aebcc7cfa2c4d69c3309ba67c 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t1042rdb-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t1042rdb-64b.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t1042"
 UBOOT_MACHINES ?= "T1042RDB_PI"
@@ -14,10 +13,6 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_64bit_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 XSERVER = " \
     xserver-xorg \

diff --git a/meta-fsl-ppc/conf/machine/t1042rdb.conf b/meta-fsl-ppc/conf/machine/t1042rdb.conf
index e5c4112ae797150280630a631fc95dc3584df286..1f13d86c97a47513ec3d16a7a934b740eddcb94a 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t1042rdb.conf
+++ b/meta-fsl-ppc/conf/machine/t1042rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t1042"
 UBOOT_MACHINES ?= "T1042RDB_PI"
@@ -14,10 +13,6 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_32bit_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 XSERVER = " \
     xserver-xorg \

diff --git a/meta-fsl-ppc/conf/machine/t2080qds-64b.conf b/meta-fsl-ppc/conf/machine/t2080qds-64b.conf
index bd1cd1d93b1ed04dc5e5608a084dac1b14d45e5d..e2b5682fedf26828cdfdccf1522c8ff6f2d3ed22 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t2080qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t2080qds-64b.conf
@@ -5,16 +5,11 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t2080"
-# TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT"
 KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/t2080qds.conf b/meta-fsl-ppc/conf/machine/t2080qds.conf
index 2892baafae611dbe19de7b3b046a27393afa59e9..dfa6b090cc2d05607017b78408d90747e355133c 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t2080qds.conf
+++ b/meta-fsl-ppc/conf/machine/t2080qds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t2080"
 UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"

diff --git a/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf b/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf
index 2d28f9c209bfb459306d49467f4cc097ce15bc6b..5d4eed43496152657f9d317c641cb8055da1dcea 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf
@@ -5,16 +5,11 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t2080"
-# TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT"
 KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/t2080rdb.conf b/meta-fsl-ppc/conf/machine/t2080rdb.conf
index 256a3d0cb2c2cf59ac99d94950b223b1249d169b..08d2dd723550b3681fd1f00ee77be425c1f2002a 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t2080rdb.conf
+++ b/meta-fsl-ppc/conf/machine/t2080rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t2080"
 UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"

diff --git a/meta-fsl-ppc/conf/machine/t4160qds-64b.conf b/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
index 18650787cb4462b16f15cf1f9910323056bf63bc..3f35e57b184776380ca72ae00acb260cbccb69b2 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
@@ -5,16 +5,11 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4160"
-# TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "T4160QDS"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/t4160qds.conf b/meta-fsl-ppc/conf/machine/t4160qds.conf
index 07ea41b5f674d413ae9bf397a6fea250bb167319..f87b58e5c78663fd5b0631e95bda3c85799a3d37 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4160qds.conf
+++ b/meta-fsl-ppc/conf/machine/t4160qds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4160"
 UBOOT_MACHINES ?= "T4160QDS"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"

diff --git a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf b/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
index ff56c3bbaa115bdec6637f368527e488fca0db66..510b813e7108015f7ec7e0cc7e981024da8ea446 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
@@ -5,16 +5,11 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4240"
-# TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "T4240QDS"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/t4240qds.conf b/meta-fsl-ppc/conf/machine/t4240qds.conf
index 0df32f6a31b847af6f545005e1ac061783ec5c50..58e5200015f11a8a2b20f1803ae18549fbccb2d1 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4240qds.conf
+++ b/meta-fsl-ppc/conf/machine/t4240qds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4240"
 UBOOT_MACHINES ?= "T4240QDS"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"

diff --git a/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf b/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf
index 0838187ef50d935ce5924d158d5c8bd061987475..ea458957fdfce0de54aa2aa87aa976fa8f79fc1e 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf
@@ -5,16 +5,11 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4240"
-# TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "T4240RDB"
 KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb t4240rdb-usdpaa-shared-interfaces.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"

diff --git a/meta-fsl-ppc/conf/machine/t4240rdb.conf b/meta-fsl-ppc/conf/machine/t4240rdb.conf
index dc5f45cf63b3498adf1fb36248364a22b3c060d7..ec9c5bbcc229a3492b8b36bc10c8c462c2f4cbcf 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4240rdb.conf
+++ b/meta-fsl-ppc/conf/machine/t4240rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4240"
 UBOOT_MACHINES ?= "T4240RDB"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"