diff options
| author | Nathan Rossi <nathan.rossi@xilinx.com> | 2013-07-30 17:30:40 +1000 |
|---|---|---|
| committer | Nathan Rossi <nathan.rossi@xilinx.com> | 2013-07-30 17:30:40 +1000 |
| commit | 5272a8a7e3327d0e12658ef0d3939dbb8dece378 (patch) | |
| tree | 45e4d7a831c9c30618c303ada155ad5a257af728 /recipes-kernel | |
| parent | 77d200eb81997059e1e906a5903418ed55ab4d79 (diff) | |
| download | meta-xilinx-5272a8a7e3327d0e12658ef0d3939dbb8dece378.tar.gz | |
linux-xlnx: Split out common platform definitions
* Split platform definitions out into linux-machine-common.inc
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
Diffstat (limited to 'recipes-kernel')
| -rw-r--r-- | recipes-kernel/linux/linux-machine-common.inc | 10 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-xlnx.inc | 9 |
2 files changed, 11 insertions, 8 deletions
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 @@ | |||
| 1 | |||
| 2 | require linux-machine-config.inc | ||
| 3 | |||
| 4 | # MicroBlaze is a uImage target, but its not called 'uImage' | ||
| 5 | DEPENDS_append_microblaze += "u-boot-mkimage-native" | ||
| 6 | |||
| 7 | # Common Device Tree Includes | ||
| 8 | # (put them in ${WORKDIR} to avoid using dtc with include paths) | ||
| 9 | FILESEXTRAPATHS_append := "${XILINX_LAYERDIR}/conf/machine/boards/common:" | ||
| 10 | 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 | |||
| 3 | # This version extension should match CONFIG_LOCALVERSION in defconfig | 3 | # This version extension should match CONFIG_LOCALVERSION in defconfig |
| 4 | LINUX_VERSION_EXTENSION ?= "-xilinx" | 4 | LINUX_VERSION_EXTENSION ?= "-xilinx" |
| 5 | 5 | ||
| 6 | require linux-machine-config.inc | ||
| 7 | require recipes-kernel/linux/linux-yocto.inc | 6 | require recipes-kernel/linux/linux-yocto.inc |
| 8 | 7 | require linux-machine-common.inc | |
| 9 | # MicroBlaze is a uImage target, but its not called 'uImage' | ||
| 10 | DEPENDS_append_microblaze += "u-boot-mkimage-native" | ||
| 11 | 8 | ||
| 12 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | 9 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
| 13 | FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:" | 10 | FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:" |
| @@ -19,10 +16,6 @@ PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCREV}" | |||
| 19 | # Override COMPATIBLE_MACHINE to include your machine in a bbappend file. | 16 | # Override COMPATIBLE_MACHINE to include your machine in a bbappend file. |
| 20 | COMPATIBLE_MACHINE = "qemumicroblaze|qemuzynq|microblaze|zynq" | 17 | COMPATIBLE_MACHINE = "qemumicroblaze|qemuzynq|microblaze|zynq" |
| 21 | 18 | ||
| 22 | # Common Device Tree Includes | ||
| 23 | # (put them in ${WORKDIR} to avoid using dtc with include paths) | ||
| 24 | FILESEXTRAPATHS_append := "${XILINX_LAYERDIR}/conf/machine/boards/common:" | ||
| 25 | SRC_URI_append += "file://zynq-7-base.dtsi" | ||
| 26 | 19 | ||
| 27 | # Add the modules directory to the 'kernel-base' files list | 20 | # Add the modules directory to the 'kernel-base' files list |
| 28 | FILES_kernel-base_append = " /lib/modules/${KERNEL_VERSION}/kernel" | 21 | FILES_kernel-base_append = " /lib/modules/${KERNEL_VERSION}/kernel" |