4 files changed, 25 insertions, 31 deletions

diff --git a/meta-fsl-ppc/conf/machine/include/qoriq-base.inc b/meta-fsl-ppc/conf/machine/include/qoriq-base.inc
index 9b26d10c..aae476d6 100644
--- a/meta-fsl-ppc/conf/machine/include/qoriq-base.inc
+++ b/meta-fsl-ppc/conf/machine/include/qoriq-base.inc
@@ -1,8 +1,29 @@
 # Provides the QorIQ common settings
+require conf/machine/include/soc-family.inc
 
-require conf/machine/include/qoriq-default-settings.inc
-require conf/machine/include/qoriq-default-versions.inc
-require conf/machine/include/qoriq-default-providers.inc
+# providers
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq"
 
-require conf/machine/include/soc-family.inc
+# versions
+PREFERRED_VERSION_qemu = "1.7+fsl"
+PREFERRED_VERSION_openssl = "1.0.1i"
+
+# settings
+MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
+MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules"
+MACHINEOVERRIDES .= ":qoriq-ppc"
+
+IMAGE_CLASSES += "image_types_uboot"
+EXTRA_IMAGEDEPENDS += "u-boot"
+
+KERNEL_IMAGETYPE ?= "uImage"
+
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
+
+USE_VT = "0"
+
+MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600"
+UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
 
diff --git a/meta-fsl-ppc/conf/machine/include/qoriq-default-providers.inc b/meta-fsl-ppc/conf/machine/include/qoriq-default-providers.inc
deleted file mode 100644
index 25197da5..00000000
--- a/meta-fsl-ppc/conf/machine/include/qoriq-default-providers.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
-PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq"
-
diff --git a/meta-fsl-ppc/conf/machine/include/qoriq-default-settings.inc b/meta-fsl-ppc/conf/machine/include/qoriq-default-settings.inc
deleted file mode 100644
index 539f6a1d..00000000
--- a/meta-fsl-ppc/conf/machine/include/qoriq-default-settings.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules"
-
-IMAGE_CLASSES += "image_types_uboot"
-EXTRA_IMAGEDEPENDS += "u-boot"
-
-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"
-
-MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600"
-UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
-
diff --git a/meta-fsl-ppc/conf/machine/include/qoriq-default-versions.inc b/meta-fsl-ppc/conf/machine/include/qoriq-default-versions.inc
deleted file mode 100644
index 639e61e9..00000000
--- a/meta-fsl-ppc/conf/machine/include/qoriq-default-versions.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1i"
-