From 5272a8a7e3327d0e12658ef0d3939dbb8dece378 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Tue, 30 Jul 2013 17:30:40 +1000 Subject: linux-xlnx: Split out common platform definitions * Split platform definitions out into linux-machine-common.inc Signed-off-by: Nathan Rossi --- recipes-kernel/linux/linux-machine-common.inc | 10 ++++++++++ recipes-kernel/linux/linux-xlnx.inc | 9 +-------- 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 recipes-kernel/linux/linux-machine-common.inc (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/linux-machine-common.inc b/recipes-kernel/linux/linux-machine-common.inc new file mode 100644 index 00000000..6d8cd8c5 --- /dev/null +++ b/recipes-kernel/linux/linux-machine-common.inc @@ -0,0 +1,10 @@ + +require linux-machine-config.inc + +# MicroBlaze is a uImage target, but its not called 'uImage' +DEPENDS_append_microblaze += "u-boot-mkimage-native" + +# Common Device Tree Includes +# (put them in ${WORKDIR} to avoid using dtc with include paths) +FILESEXTRAPATHS_append := "${XILINX_LAYERDIR}/conf/machine/boards/common:" +SRC_URI_append += "file://zynq-7-base.dtsi" diff --git a/recipes-kernel/linux/linux-xlnx.inc b/recipes-kernel/linux/linux-xlnx.inc index b195ba73..ffe99616 100644 --- a/recipes-kernel/linux/linux-xlnx.inc +++ b/recipes-kernel/linux/linux-xlnx.inc @@ -3,11 +3,8 @@ inherit kernel # This version extension should match CONFIG_LOCALVERSION in defconfig LINUX_VERSION_EXTENSION ?= "-xilinx" -require linux-machine-config.inc require recipes-kernel/linux/linux-yocto.inc - -# MicroBlaze is a uImage target, but its not called 'uImage' -DEPENDS_append_microblaze += "u-boot-mkimage-native" +require linux-machine-common.inc FILESEXTRAPATHS_prepend := "${THISDIR}/files:" FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:" @@ -19,10 +16,6 @@ PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCREV}" # Override COMPATIBLE_MACHINE to include your machine in a bbappend file. COMPATIBLE_MACHINE = "qemumicroblaze|qemuzynq|microblaze|zynq" -# Common Device Tree Includes -# (put them in ${WORKDIR} to avoid using dtc with include paths) -FILESEXTRAPATHS_append := "${XILINX_LAYERDIR}/conf/machine/boards/common:" -SRC_URI_append += "file://zynq-7-base.dtsi" # Add the modules directory to the 'kernel-base' files list FILES_kernel-base_append = " /lib/modules/${KERNEL_VERSION}/kernel" -- cgit v1.2.3-54-g00ecf