machine-xilinx-default.inc: Refactored all non-tune configuration

* Moved non-tune configuration into machine-xilinx-default.inc

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>

3 files changed, 17 insertions, 19 deletions

diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc
new file mode 100644
index 00000000..06eb9cb1
--- /dev/null
+++ b/conf/machine/include/machine-xilinx-default.inc
@@ -0,0 +1,15 @@
+# Default Xilinx BSP Machine settings
+
+# File System Configuration
+IMAGE_FSTYPES ?= "cpio tar.gz ext2 ext2.gz.u-boot ext2.gz"
+IMAGE_CLASSES += "image_types_uboot"
+
+# Kernel Configuration
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx"
+PREFERRED_VERSION_linux-xlnx ?= "3.8%"
+PREFERRED_VERSION_linux-yocto ?= "3.8%"
+PREFERRED_VERSION_linux-yocto-tiny ?= "3.8%"
+
+# U-Boot Configuration
+PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx"
+PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%"
diff --git a/conf/machine/include/tune-microblaze.inc b/conf/machine/include/tune-microblaze.inc
index 5f4d65ba..13bb241d 100644
--- a/conf/machine/include/tune-microblaze.inc
+++ b/conf/machine/include/tune-microblaze.inc
@@ -11,17 +11,9 @@ TUNE_FEATURES_tune-microblaze = "microblaze"
 PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
 
 # Linux Configuration
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx"
-PREFERRED_VERSION_linux-xlnx ?= "3.8%"
 KERNEL_IMAGETYPE ?= "linux.bin.ub"
 
-# File System Configuration
-IMAGE_FSTYPES ?= "cpio ext2 ext2.gz.u-boot ext2.gz"
-IMAGE_CLASSES += "image_types_uboot"
-
 # U-Boot Configuration
-PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx"
-PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%"
 UBOOT_MACHINE ?= "microblaze-generic"
 
 # linux-yocto KMACHINE
diff --git a/conf/machine/include/tune-zynq.inc b/conf/machine/include/tune-zynq.inc
index e1a91ad8..95b81e22 100644
--- a/conf/machine/include/tune-zynq.inc
+++ b/conf/machine/include/tune-zynq.inc
@@ -12,20 +12,11 @@ ARMPKGARCH = "${ARMPKGARCH_tune-armv7a-neon}"
 PACKAGE_EXTRA_ARCHS_tune-zynq = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon} zynq"
 
 # Linux Configuration
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx"
-PREFERRED_VERSION_linux-xlnx ?= "3.8%"
 KERNEL_IMAGETYPE ?= "uImage"
-# Set default load address. 
+
+# Set default load address.
 # Override with KERNEL_EXTRA_ARGS_<board> += "..." in machine file if required
 KERNEL_EXTRA_ARGS_zynq += "UIMAGE_LOADADDR=0x8000"
 
-# File System Configuration
-IMAGE_FSTYPES ?= "cpio ext2 ext2.gz.u-boot ext2.gz"
-IMAGE_CLASSES += "image_types_uboot"
-
-# U-Boot Configuration
-PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx"
-PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%"
-
 # linux-yocto KMACHINE
 KMACHINE ?= "zynq-default"