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>

10 files changed, 38 insertions, 73 deletions

diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index a35d91b..09b5c69 100644
--- a/conf/machine/include/e500mc.inc
+++ b/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/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc
index adaa3cd..178de18 100644
--- a/conf/machine/include/e500v2.inc
+++ b/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/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
index c951843..47a9ad7 100644
--- a/conf/machine/include/e5500-64b.inc
+++ b/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/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
index 0babacc..e6f0400 100644
--- a/conf/machine/include/e5500.inc
+++ b/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/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
index 36f55a2..0770cc3 100644
--- a/conf/machine/include/e6500-64b.inc
+++ b/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/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
index 81a2bf4..323e420 100644
--- a/conf/machine/include/e6500.inc
+++ b/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/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
new file mode 100644
index 0000000..9b26d10
--- /dev/null
+++ b/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/conf/machine/include/qoriq-default-providers.inc b/conf/machine/include/qoriq-default-providers.inc
new file mode 100644
index 0000000..824712b
--- /dev/null
+++ b/conf/machine/include/qoriq-default-providers.inc
@@ -0,0 +1,2 @@
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
+
diff --git a/conf/machine/include/qoriq-default-settings.inc b/conf/machine/include/qoriq-default-settings.inc
new file mode 100644
index 0000000..a4fc0ec
--- /dev/null
+++ b/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/conf/machine/include/qoriq-default-versions.inc b/conf/machine/include/qoriq-default-versions.inc
new file mode 100644
index 0000000..3bb03ba
--- /dev/null
+++ b/conf/machine/include/qoriq-default-versions.inc
@@ -0,0 +1,3 @@
+PREFERRED_VERSION_qemu = "1.7+fsl"
+PREFERRED_VERSION_openssl = "1.0.1g"
+