From e569dd145ee9f11c7268ddc0acb11461475d7078 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 24 Feb 2016 16:53:13 +1000 Subject: machine-xilinx-*.inc: Remove default append for 'device-tree' * The device-tree recipe is not required for all machines or all boards, remove the default append to allow each machine to add the dependency when needed * Add the 'device-tree' as a machine RDEPEND for all machines that use the device-tree recipe to obtain the machines device tree output Signed-off-by: Nathan Rossi --- conf/machine/include/machine-xilinx-board.inc | 2 -- conf/machine/include/machine-xilinx-default.inc | 3 --- conf/machine/kc705-trd-microblazeel.conf | 1 + conf/machine/microzed-zynq7.conf | 1 + conf/machine/picozed-zynq7.conf | 1 + conf/machine/qemuzynq.conf | 1 + 6 files changed, 4 insertions(+), 5 deletions(-) diff --git a/conf/machine/include/machine-xilinx-board.inc b/conf/machine/include/machine-xilinx-board.inc index 3447731e..ba9a36be 100644 --- a/conf/machine/include/machine-xilinx-board.inc +++ b/conf/machine/include/machine-xilinx-board.inc @@ -2,7 +2,5 @@ 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 8cfbb968..ec581c06 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc @@ -26,6 +26,3 @@ UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" UBOOT_ELF ?= "u-boot" UBOOT_ELF_aarch64 ?= "u-boot.elf" -# By default use the device-tree recipe to generate device trees for Zynq machines -MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_zynq = " device-tree" - diff --git a/conf/machine/kc705-trd-microblazeel.conf b/conf/machine/kc705-trd-microblazeel.conf index 7bffeeb7..645ed328 100644 --- a/conf/machine/kc705-trd-microblazeel.conf +++ b/conf/machine/kc705-trd-microblazeel.conf @@ -22,6 +22,7 @@ MACHINE_FEATURES = "" USE_VT = "" SERIAL_CONSOLE = "115200 ttyS0" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" MACHINE_DEVICETREE = "kc705/kc705-trd-microblazeel.dts" EXTRA_IMAGEDEPENDS += "virtual/bitstream" diff --git a/conf/machine/microzed-zynq7.conf b/conf/machine/microzed-zynq7.conf index bea7c0a9..94283a81 100644 --- a/conf/machine/microzed-zynq7.conf +++ b/conf/machine/microzed-zynq7.conf @@ -14,6 +14,7 @@ SPL_BINARY = "boot.bin" SERIAL_CONSOLE = "115200 ttyPS0" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" MACHINE_DEVICETREE = "microzed/microzed-zynq7.dts" IMAGE_BOOT_FILES += "boot.bin ${MACHINE}.dtb" diff --git a/conf/machine/picozed-zynq7.conf b/conf/machine/picozed-zynq7.conf index a57bbedc..7e851f6c 100644 --- a/conf/machine/picozed-zynq7.conf +++ b/conf/machine/picozed-zynq7.conf @@ -18,6 +18,7 @@ SPL_BINARY = "boot.bin" SERIAL_CONSOLE = "115200 ttyPS0" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" MACHINE_DEVICETREE = "picozed/picozed-zynq7.dts" IMAGE_BOOT_FILES += "boot.bin ${MACHINE}.dtb" diff --git a/conf/machine/qemuzynq.conf b/conf/machine/qemuzynq.conf index 5c622560..c23db5da 100644 --- a/conf/machine/qemuzynq.conf +++ b/conf/machine/qemuzynq.conf @@ -11,6 +11,7 @@ EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" SERIAL_CONSOLE = "115200 ttyPS0" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" MACHINE_DEVICETREE = "qemu/qemuzynq.dts" # Use the networking setup from qemuarm -- cgit v1.2.3-54-g00ecf