From a14fc617ba10df1b4c5bcd2d1a62534df501931a Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Thu, 24 Sep 2015 17:00:55 +1000 Subject: 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 --- conf/machine/include/machine-xilinx-board.inc | 2 ++ conf/machine/include/machine-xilinx-default.inc | 3 +-- 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 += " \ -- cgit v1.2.3-54-g00ecf