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>

10 files changed, 30 insertions, 22 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"
diff --git a/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend b/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend
index 7d7c5639..d6783b85 100644
--- a/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend
+++ b/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend
@@ -2,6 +2,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
 FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:"
 
+require linux-machine-common.inc
+
 SRC_URI_append += " \
         file://xilinx-v14.5_modifications_to_v3.8.scc \
         file://microblaze-patches_v3.8.scc \
@@ -11,4 +13,4 @@ SRC_URI_append += " \
 SRC_URI_append += "git://github.com/Xilinx/xilinx-kernel-cache;protocol=git;branch=master;type=kmeta;name=externalcache;destsuffix=external-cache/"
 SRCREV_externalcache = "${AUTOREV}"
 
-COMPATIBLE_MACHINE = "zedboard|zc702|kc705-trd"
\ No newline at end of file
+COMPATIBLE_MACHINE = "zedboard-zynq7|zc702-zynq7|kc705-trd-microblazeel"
\ No newline at end of file
diff --git a/recipes-kernel/linux/linux-yocto/microblaze-default-standard.scc b/recipes-kernel/linux/linux-yocto/microblaze-default-standard.scc
new file mode 100644
index 00000000..6e083bbc
--- /dev/null
+++ b/recipes-kernel/linux/linux-yocto/microblaze-default-standard.scc
@@ -0,0 +1,8 @@
+define KMACHINE microblaze-default
+define KTYPE standard
+define KARCH microblaze
+
+include ktypes/standard
+branch meta
+
+include microblaze-standard.scc
diff --git a/recipes-kernel/linux/linux-yocto/microblaze-default-tiny.scc b/recipes-kernel/linux/linux-yocto/microblaze-default-tiny.scc
new file mode 100644
index 00000000..49761bcb
--- /dev/null
+++ b/recipes-kernel/linux/linux-yocto/microblaze-default-tiny.scc
@@ -0,0 +1,9 @@
+define KMACHINE microblaze-default
+define KTYPE tiny
+define KARCH microblaze
+
+include ktypes/tiny
+branch meta
+
+# Same configs used for standard as tiny for microblaze
+include microblaze-standard.scc
diff --git a/recipes-kernel/linux/linux-yocto/zc702-standard.scc b/recipes-kernel/linux/linux-yocto/zc702-standard.scc
deleted file mode 100644
index ca803b45..00000000
--- a/recipes-kernel/linux/linux-yocto/zc702-standard.scc
+++ /dev/null
@@ -1,8 +0,0 @@
-define KMACHINE zc702
-define KTYPE standard
-define KARCH arm
-
-include ktypes/standard
-branch meta
-include zynq-standard.scc
-include cfg/zynq/rtc.scc
diff --git a/recipes-kernel/linux/linux-yocto/zc702-tiny.scc b/recipes-kernel/linux/linux-yocto/zc702-tiny.scc
deleted file mode 100644
index fbd7a1a5..00000000
--- a/recipes-kernel/linux/linux-yocto/zc702-tiny.scc
+++ /dev/null
@@ -1,8 +0,0 @@
-define KMACHINE zc702
-define KTYPE tiny
-define KARCH arm
-
-include ktypes/tiny
-branch meta
-include zynq-tiny.scc
-include cfg/zynq/rtc.scc
diff --git a/recipes-kernel/linux/linux-yocto/zedboard-standard.scc b/recipes-kernel/linux/linux-yocto/zynq-default-standard.scc
index d29f8284..34ff1295 100644
--- a/recipes-kernel/linux/linux-yocto/zedboard-standard.scc
+++ b/recipes-kernel/linux/linux-yocto/zynq-default-standard.scc
@@ -1,4 +1,4 @@
-define KMACHINE zedboard
+define KMACHINE zynq-default
 define KTYPE standard
 define KARCH arm
 
diff --git a/recipes-kernel/linux/linux-yocto/zedboard-tiny.scc b/recipes-kernel/linux/linux-yocto/zynq-default-tiny.scc
index ff86fd42..2de64cc9 100644
--- a/recipes-kernel/linux/linux-yocto/zedboard-tiny.scc
+++ b/recipes-kernel/linux/linux-yocto/zynq-default-tiny.scc
@@ -1,4 +1,4 @@
-define KMACHINE zedboard
+define KMACHINE zynq-default
 define KTYPE tiny
 define KARCH arm
 
diff --git a/recipes-kernel/linux/linux-yocto_3.8.bbappend b/recipes-kernel/linux/linux-yocto_3.8.bbappend
index 5c76548c..09892658 100644
--- a/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -2,8 +2,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
 FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:"
 
-# MicroBlaze is a uImage target, but its not called 'uImage'
-DEPENDS_append_microblaze += "u-boot-mkimage-native"
+require linux-machine-common.inc
 
 SRC_URI_append += " \
         file://xilinx-v14.5_modifications_to_v3.8.scc \
@@ -14,4 +13,4 @@ SRC_URI_append += " \
 SRC_URI_append += "git://github.com/Xilinx/xilinx-kernel-cache;protocol=git;branch=master;type=kmeta;name=externalcache;destsuffix=external-cache/"
 SRCREV_externalcache = "${AUTOREV}"
 
-COMPATIBLE_MACHINE = "zedboard|zc702|kc705-trd"
+COMPATIBLE_MACHINE = "zedboard-zynq7|zc702-zynq7|kc705-trd-microblazeel"