From e448d3c1de3ce284ef42a591fd89cf4c2b6a81cf Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Sat, 15 Apr 2017 19:29:37 +1000 Subject: device-tree.bbappend: Move use of MACHINE_DEVICETREE to SRC_URI Remove the use of MACHINE_DEVICETREE for providing sources to device-tree, instead provide the device tree sources as SRC_URI entires. Whilst this was already being done automatically by the MACHINE_DEVICETREE logic it also created a non-standard way of providing the device tree sources to the recipe. The setup of SRC_URI is done via the use of a device-tree.bbappend instead of directly in the device-tree.bb recipe itself. This is for two reason, separation of the source from the build logic as well as to provide an example for how a user can extend the device-tree recipe to provide custom device tree sources in their layer. This change also moves the paths to the sources around, this is to align the names of the directories to match the OVERRIDES so that when expanding the file paths it will search the subdirs based on the OVERRIDES or machine names. Signed-off-by: Nathan Rossi --- conf/machine/kc705-microblazeel.conf | 4 ---- conf/machine/microzed-zynq7.conf | 1 - conf/machine/picozed-zynq7.conf | 1 - conf/machine/qemu-zynq7.conf | 1 - conf/machine/zybo-linux-bd-zynq7.conf | 6 ------ 5 files changed, 13 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/kc705-microblazeel.conf b/conf/machine/kc705-microblazeel.conf index cea1d173..efd83b78 100644 --- a/conf/machine/kc705-microblazeel.conf +++ b/conf/machine/kc705-microblazeel.conf @@ -15,10 +15,6 @@ USE_VT = "" SERIAL_CONSOLE = "115200 ttyS0" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" -MACHINE_DEVICETREE := " \ - kc705/kc705-microblazeel.dts \ - kc705/pl.dtsi \ - kc705/system-conf.dtsi" EXTRA_IMAGEDEPENDS += "virtual/bitstream" diff --git a/conf/machine/microzed-zynq7.conf b/conf/machine/microzed-zynq7.conf index 9a00e61d..8e24d5f5 100644 --- a/conf/machine/microzed-zynq7.conf +++ b/conf/machine/microzed-zynq7.conf @@ -15,7 +15,6 @@ SPL_BINARY = "spl/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 12b0fde2..e1d723c4 100644 --- a/conf/machine/picozed-zynq7.conf +++ b/conf/machine/picozed-zynq7.conf @@ -19,7 +19,6 @@ SPL_BINARY = "spl/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/qemu-zynq7.conf b/conf/machine/qemu-zynq7.conf index e3cd575a..6d55f09d 100644 --- a/conf/machine/qemu-zynq7.conf +++ b/conf/machine/qemu-zynq7.conf @@ -11,7 +11,6 @@ MACHINE_FEATURES = "ext2 vfat" SERIAL_CONSOLE = "115200 ttyPS0" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" -MACHINE_DEVICETREE = "qemu/qemu-zynq7.dts" # Use the networking setup from qemuarm FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm" diff --git a/conf/machine/zybo-linux-bd-zynq7.conf b/conf/machine/zybo-linux-bd-zynq7.conf index f5524c12..a5c572f6 100644 --- a/conf/machine/zybo-linux-bd-zynq7.conf +++ b/conf/machine/zybo-linux-bd-zynq7.conf @@ -17,12 +17,6 @@ SERIAL_CONSOLE = "115200 ttyPS0" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" -MACHINE_DEVICETREE = " \ - zybo-linux-bd/pcw.dtsi \ - zybo-linux-bd/pl.dtsi \ - zybo-linux-bd/zybo-linux-bd-zynq7.dts \ - " - UBOOT_MACHINE = "zynq_zybo_config" SPL_BINARY = "spl/boot.bin" FORCE_PS7INIT = "zybo" -- cgit v1.2.3-54-g00ecf