diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2016-02-23 23:57:25 +1000 |
---|---|---|
committer | Nathan Rossi <nathan@nathanrossi.com> | 2016-03-06 20:04:03 +1000 |
commit | a6a32d6b80b218363e1c4dc147af124f55b89033 (patch) | |
tree | a24609a8ec9ad21e221cb777099712e07566cf1e | |
parent | d9afe0553794e57682de10baeb413494e3399477 (diff) | |
download | meta-xilinx-a6a32d6b80b218363e1c4dc147af124f55b89033.tar.gz |
device-tree.bb: Move zynq7-base.dtsi into recipe source
* Move zynq7-base.dtsi out of conf/machine/boards and into the files/
directory of the device-tree recipe
* Also move the config from machine-xilinx-default.inc that includes the
dtsi for zynq targets
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-rw-r--r-- | conf/machine/include/machine-xilinx-default.inc | 5 | ||||
-rw-r--r-- | recipes-bsp/device-tree/device-tree.bb | 3 | ||||
-rw-r--r-- | recipes-bsp/device-tree/files/common/zynq7-base.dtsi (renamed from conf/machine/boards/common/zynq7-base.dtsi) | 0 |
3 files changed, 3 insertions, 5 deletions
diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc index ee3a80bf..8cfbb968 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc | |||
@@ -29,8 +29,3 @@ UBOOT_ELF_aarch64 ?= "u-boot.elf" | |||
29 | # By default use the device-tree recipe to generate device trees for Zynq machines | 29 | # By default use the device-tree recipe to generate device trees for Zynq machines |
30 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_zynq = " device-tree" | 30 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_zynq = " device-tree" |
31 | 31 | ||
32 | # Common Device Tree Includes | ||
33 | MACHINE_DEVICETREE_append_zynq = " \ | ||
34 | common/zynq7-base.dtsi \ | ||
35 | " | ||
36 | |||
diff --git a/recipes-bsp/device-tree/device-tree.bb b/recipes-bsp/device-tree/device-tree.bb index 6332e9c2..2cd47ce0 100644 --- a/recipes-bsp/device-tree/device-tree.bb +++ b/recipes-bsp/device-tree/device-tree.bb | |||
@@ -13,6 +13,9 @@ DEPENDS += "dtc-native" | |||
13 | FILES_${PN} = "/boot/devicetree*" | 13 | FILES_${PN} = "/boot/devicetree*" |
14 | DEVICETREE_FLAGS ?= "-R 8 -p 0x3000" | 14 | DEVICETREE_FLAGS ?= "-R 8 -p 0x3000" |
15 | 15 | ||
16 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
17 | SRC_URI_append_zynq = " file://common/zynq7-base.dtsi" | ||
18 | |||
16 | S = "${WORKDIR}" | 19 | S = "${WORKDIR}" |
17 | 20 | ||
18 | KERNEL_DTS_INCLUDE ??= "" | 21 | KERNEL_DTS_INCLUDE ??= "" |
diff --git a/conf/machine/boards/common/zynq7-base.dtsi b/recipes-bsp/device-tree/files/common/zynq7-base.dtsi index a59e0b85..a59e0b85 100644 --- a/conf/machine/boards/common/zynq7-base.dtsi +++ b/recipes-bsp/device-tree/files/common/zynq7-base.dtsi | |||