From 869cba51d3db7909077ad0f066b784ebfd3b092d Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 30 Apr 2014 16:42:00 +1000 Subject: machine-xilinx-default.inc: Move base dts includes * Move the base dts includes into the machine-xilinx-default.inc, removing the definition from the kernel recipes. This is to bring the device tree configuration inline with the kernel configuration variables. * Fix the name of the dtsi, using the expected file paths which machine the naming convention. Signed-off-by: Nathan Rossi --- conf/machine/include/machine-xilinx-default.inc | 6 ++++++ recipes-kernel/linux/linux-machine-common.inc | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc index c510ce1d..4d5d977d 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc @@ -16,3 +16,9 @@ PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%" # Architecture specific kernel configuration parts, defconfigs for Xilinx architectures MACHINE_KCONFIG_prepend += "common/linux/${SOC_FAMILY}/defconfig_${@'.'.join(d.getVar('LINUX_VERSION', True).split('.')[0:2]).strip('+')}.cfg " + +# Common Device Tree Includes +MACHINE_DEVICETREE_append_zynq += " \ + common/zynq7-base.dtsi \ + common/zynq7-mainline-gem.dtsi \ + " diff --git a/recipes-kernel/linux/linux-machine-common.inc b/recipes-kernel/linux/linux-machine-common.inc index 2b76cdee..0f79e1bb 100644 --- a/recipes-kernel/linux/linux-machine-common.inc +++ b/recipes-kernel/linux/linux-machine-common.inc @@ -3,9 +3,3 @@ 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 -MACHINE_DEVICETREE_append_zynq += " \ - common/zynq-7-base.dtsi \ - common/zynq-7-mainline-gem.dtsi \ - " -- cgit v1.2.3-54-g00ecf