aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2015-09-24 17:00:55 +1000
committerNathan Rossi <nathan@nathanrossi.com>2015-09-24 17:33:17 +1000
commita14fc617ba10df1b4c5bcd2d1a62534df501931a (patch)
tree79ff5347b3d86db054cdd2c1cd53dd8142ef40b8
parent88f9267aa26d546e657fcea72880b55a4fd9aa5d (diff)
downloadmeta-xilinx-a14fc617ba10df1b4c5bcd2d1a62534df501931a.tar.gz
meta-xilinx-a14fc617ba10df1b4c5bcd2d1a62534df501931a.tar.bz2
meta-xilinx-a14fc617ba10df1b4c5bcd2d1a62534df501931a.zip
machine-xilinx-*.inc: Not all MicroBlaze machines need device-tree
* Not all MicroBlaze machines need the 'device-tree' dependency, move this to being a board common setup Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-rw-r--r--conf/machine/include/machine-xilinx-board.inc2
-rw-r--r--conf/machine/include/machine-xilinx-default.inc3
2 files changed, 3 insertions, 2 deletions
diff --git a/conf/machine/include/machine-xilinx-board.inc b/conf/machine/include/machine-xilinx-board.inc
index ba9a36be..654e3ebb 100644
--- a/conf/machine/include/machine-xilinx-board.inc
+++ b/conf/machine/include/machine-xilinx-board.inc
@@ -2,5 +2,7 @@
EXTRA_IMAGEDEPENDS += "virtual/bootloader"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_microblaze += "device-tree"
+
IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} ${UBOOT_BINARY}"
diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc
index 0175bc27..8a23f07e 100644
--- a/conf/machine/include/machine-xilinx-default.inc
+++ b/conf/machine/include/machine-xilinx-default.inc
@@ -27,9 +27,8 @@ UBOOT_BINARY_zynq ?= "u-boot-dtb.${UBOOT_SUFFIX}"
UBOOT_ELF ?= "u-boot"
UBOOT_ELF_aarch64 ?= "u-boot.elf"
-# Device Trees
+# By default use the device-tree recipe to generate device trees for Zynq machines
MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_zynq += "device-tree"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_microblaze += "device-tree"
# Common Device Tree Includes
MACHINE_DEVICETREE_append_zynq += " \