diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2015-09-24 17:00:55 +1000 |
---|---|---|
committer | Nathan Rossi <nathan@nathanrossi.com> | 2015-09-24 17:33:17 +1000 |
commit | a14fc617ba10df1b4c5bcd2d1a62534df501931a (patch) | |
tree | 79ff5347b3d86db054cdd2c1cd53dd8142ef40b8 | |
parent | 88f9267aa26d546e657fcea72880b55a4fd9aa5d (diff) | |
download | meta-xilinx-a14fc617ba10df1b4c5bcd2d1a62534df501931a.tar.gz |
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.inc | 2 | ||||
-rw-r--r-- | 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 @@ | |||
2 | 2 | ||
3 | EXTRA_IMAGEDEPENDS += "virtual/bootloader" | 3 | EXTRA_IMAGEDEPENDS += "virtual/bootloader" |
4 | 4 | ||
5 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_microblaze += "device-tree" | ||
6 | |||
5 | IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} ${UBOOT_BINARY}" | 7 | IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} ${UBOOT_BINARY}" |
6 | 8 | ||
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}" | |||
27 | UBOOT_ELF ?= "u-boot" | 27 | UBOOT_ELF ?= "u-boot" |
28 | UBOOT_ELF_aarch64 ?= "u-boot.elf" | 28 | UBOOT_ELF_aarch64 ?= "u-boot.elf" |
29 | 29 | ||
30 | # Device Trees | 30 | # By default use the device-tree recipe to generate device trees for Zynq machines |
31 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_zynq += "device-tree" | 31 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_zynq += "device-tree" |
32 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_microblaze += "device-tree" | ||
33 | 32 | ||
34 | # Common Device Tree Includes | 33 | # Common Device Tree Includes |
35 | MACHINE_DEVICETREE_append_zynq += " \ | 34 | MACHINE_DEVICETREE_append_zynq += " \ |