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>

8 files changed, 22 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"
diff --git a/conf/machine/kc705-trd-microblazeel.conf b/conf/machine/kc705-trd-microblazeel.conf
index 86315ba6..d58111b6 100644
--- a/conf/machine/kc705-trd-microblazeel.conf
+++ b/conf/machine/kc705-trd-microblazeel.conf
@@ -15,6 +15,7 @@ TARGET_CPU = "microblazeel"
 MACHINE_FEATURES := ""
 
 require conf/machine/include/tune-microblaze.inc
+require conf/machine/include/machine-xilinx-default.inc
 TUNE_FEATURES_tune-microblaze += "v8.50 little-endian barrel-shift pattern-compare reorder multiply-low"
 
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/qemumicroblaze.conf b/conf/machine/qemumicroblaze.conf
index 824dbf47..f8e035f2 100644
--- a/conf/machine/qemumicroblaze.conf
+++ b/conf/machine/qemumicroblaze.conf
@@ -5,6 +5,7 @@
 MACHINE_FEATURES := ""
 
 require conf/machine/include/tune-microblaze.inc
+require conf/machine/include/machine-xilinx-default.inc
 TUNE_FEATURES_tune-microblaze += "v8.50 little-endian barrel-shift reorder pattern-compare divide-hard multiply-high fpu-hard"
 
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/qemuzynq.conf b/conf/machine/qemuzynq.conf
index a260dd32..a0ef073b 100644
--- a/conf/machine/qemuzynq.conf
+++ b/conf/machine/qemuzynq.conf
@@ -5,6 +5,7 @@
 MACHINE_FEATURES := ""
 
 require conf/machine/include/tune-zynq.inc
+require conf/machine/include/machine-xilinx-default.inc
 
 SERIAL_CONSOLE = "115200 ttyPS0"
 
diff --git a/conf/machine/zc702-zynq7.conf b/conf/machine/zc702-zynq7.conf
index bb7fb8d7..b603dc54 100644
--- a/conf/machine/zc702-zynq7.conf
+++ b/conf/machine/zc702-zynq7.conf
@@ -13,6 +13,7 @@ PREFERRED_VERSION_linux-xlnx ?= "3.8%"
 PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%"
 
 require conf/machine/include/tune-zynq.inc
+require conf/machine/include/machine-xilinx-default.inc
 
 # ZC70x machine definition known by Xilinx UBOOT
 UBOOT_MACHINE = "zynq_zc70x_config"
diff --git a/conf/machine/zedboard-zynq7.conf b/conf/machine/zedboard-zynq7.conf
index 6dbb8f75..c668c3e4 100644
--- a/conf/machine/zedboard-zynq7.conf
+++ b/conf/machine/zedboard-zynq7.conf
@@ -13,6 +13,7 @@ PREFERRED_VERSION_linux-xlnx ?= "3.8%"
 PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%"
 
 require conf/machine/include/tune-zynq.inc
+require conf/machine/include/machine-xilinx-default.inc
 
 # Zedboard machine definition known by Xilinx UBOOT
 UBOOT_MACHINE = "zynq_zed_config"