linux-yocto: Fix compatiblity with base layer machines

* Remove use of machine specific configuration, replace with a
  'zynq-default' and 'microblaze-default'.
* Add support for the use of meta-xilinx MACHINE_* variables.

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

2 files changed, 6 insertions, 0 deletions

diff --git a/conf/machine/include/tune-microblaze.inc b/conf/machine/include/tune-microblaze.inc
index c908bb46..5f4d65ba 100644
--- a/conf/machine/include/tune-microblaze.inc
+++ b/conf/machine/include/tune-microblaze.inc
@@ -23,3 +23,6 @@ IMAGE_CLASSES += "image_types_uboot"
 PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx"
 PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%"
 UBOOT_MACHINE ?= "microblaze-generic"
+
+# linux-yocto KMACHINE
+KMACHINE ?= "microblaze-default"
diff --git a/conf/machine/include/tune-zynq.inc b/conf/machine/include/tune-zynq.inc
index f02b9a95..e1a91ad8 100644
--- a/conf/machine/include/tune-zynq.inc
+++ b/conf/machine/include/tune-zynq.inc
@@ -26,3 +26,6 @@ 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"