1 files changed, 5 insertions, 34 deletions

diff --git a/recipes-kernel/linux/linux-xlnx.inc b/recipes-kernel/linux/linux-xlnx.inc
index 7b2319be..3528edaf 100644
--- a/recipes-kernel/linux/linux-xlnx.inc
+++ b/recipes-kernel/linux/linux-xlnx.inc
@@ -1,48 +1,19 @@
-#
-#   To use linux-xlnx in your layer, create a
-#   linux-yocto-xlnx.bbappend file containing at least the following
-#   lines:
-#
-#     FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-#     COMPATIBLE_MACHINE_yourmachine = "yourmachine"
-#
-#   You must also provide a Linux kernel configuration. The most direct
-#   method is to copy your .config to files/defconfig in your layer,
-#   in the same directory as the bbappend and add file://defconfig to
-#   your SRC_URI.
-#
-#
-# Notes:
-#
-#   patches: patches can be merged into to the source git tree itself,
-#            added via the SRC_URI, or controlled via a BSP
-#            configuration.
-#   
-#   example configuration addition:
-#            SRC_URI += "file://smp.cfg"
-#   example patch addition (for kernel v3.4 only):
-#            SRC_URI += "file://0001-linux-version-tweak.patch
-#   example feature addition (for kernel v3.4 only):
-#            SRC_URI += "file://feature.scc"
-#
-
 inherit kernel
 
 # This version extension should match CONFIG_LOCALVERSION in defconfig
 LINUX_VERSION_EXTENSION ?= "-xilinx"
 
 require recipes-kernel/linux/linux-yocto.inc
+require conf/machine/include/soc-family.inc
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:"
+# MicroBlaze is a uImage target, but its not called 'uImage'
+DEPENDS_microblaze += "u-boot-mkimage-native"
 
-# Override SRC_URI in a bbappend file to point at a different source
-# tree if you do not want to build from Linus' tree.
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:"
 SRC_URI = "git://github.com/Xilinx/linux-xlnx;protocol=git;nocheckout=1"
 
 PR = "r1"
 PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCPV}"
 
-# Override COMPATIBLE_MACHINE to include your machine in a bbappend
-# file.
+# Override COMPATIBLE_MACHINE to include your machine in a bbappend file.
 COMPATIBLE_MACHINE = "zynq|microblazeel"
-