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 <[email protected]> --- 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 ------ recipes-bsp/device-tree/device-tree.bbappend | 21 +++++++++++++++++++++ .../kc705-microblazeel.dts | 0 .../files/{kc705 => kc705-microblazeel}/pl.dtsi | 0 .../{kc705 => kc705-microblazeel}/system-conf.dtsi | 0 .../files/{microzed => }/microzed-zynq7.dts | 0 .../files/{picozed => }/picozed-zynq7.dts | 0 .../device-tree/files/{qemu => }/qemu-zynq7.dts | 0 .../{zybo-linux-bd => zybo-linux-bd-zynq7}/pcw.dtsi | 0 .../{zybo-linux-bd => zybo-linux-bd-zynq7}/pl.dtsi | 0 .../zybo-linux-bd-zynq7.dts | 0 .../files/{common => }/zynq-7000-qspi-dummy.dtsi | 0 16 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 recipes-bsp/device-tree/device-tree.bbappend rename recipes-bsp/device-tree/files/{kc705 => kc705-microblazeel}/kc705-microblazeel.dts (100%) rename recipes-bsp/device-tree/files/{kc705 => kc705-microblazeel}/pl.dtsi (100%) rename recipes-bsp/device-tree/files/{kc705 => kc705-microblazeel}/system-conf.dtsi (100%) rename recipes-bsp/device-tree/files/{microzed => }/microzed-zynq7.dts (100%) rename recipes-bsp/device-tree/files/{picozed => }/picozed-zynq7.dts (100%) rename recipes-bsp/device-tree/files/{qemu => }/qemu-zynq7.dts (100%) rename recipes-bsp/device-tree/files/{zybo-linux-bd => zybo-linux-bd-zynq7}/pcw.dtsi (100%) rename recipes-bsp/device-tree/files/{zybo-linux-bd => zybo-linux-bd-zynq7}/pl.dtsi (100%) rename recipes-bsp/device-tree/files/{zybo-linux-bd => zybo-linux-bd-zynq7}/zybo-linux-bd-zynq7.dts (100%) rename recipes-bsp/device-tree/files/{common => }/zynq-7000-qspi-dummy.dtsi (100%) diff --git a/conf/machine/kc705-microblazeel.conf b/conf/machine/kc705-microblazeel.conf index cea1d173f7..efd83b7845 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 9a00e61d67..8e24d5f581 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 12b0fde234..e1d723c490 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 e3cd575ae2..6d55f09d6a 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 f5524c12b7..a5c572f610 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" diff --git a/recipes-bsp/device-tree/device-tree.bbappend b/recipes-bsp/device-tree/device-tree.bbappend new file mode 100644 index 0000000000..4f46e358b5 --- /dev/null +++ b/recipes-bsp/device-tree/device-tree.bbappend @@ -0,0 +1,21 @@ + +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +# common zynq include +SRC_URI_append_zynq = " file://zynq-7000-qspi-dummy.dtsi" + +# device tree sources for the various machines +SRC_URI_append_picozed-zynq7 = " file://picozed-zynq7.dts" +SRC_URI_append_microzed-zynq7 = " file://microzed-zynq7.dts" +SRC_URI_append_qemu-zynq7 = " file://qemu-zynq7.dts" +SRC_URI_append_zybo-linux-bd-zynq7 = " \ + file://zybo-linux-bd-zynq7.dts \ + file://pcw.dtsi \ + file://pl.dtsi \ + " +SRC_URI_append_kc705-microblazeel = " \ + file://kc705-microblazeel.dts \ + file://pl.dtsi \ + file://system-conf.dtsi \ + " + diff --git a/recipes-bsp/device-tree/files/kc705/kc705-microblazeel.dts b/recipes-bsp/device-tree/files/kc705-microblazeel/kc705-microblazeel.dts similarity index 100% rename from recipes-bsp/device-tree/files/kc705/kc705-microblazeel.dts rename to recipes-bsp/device-tree/files/kc705-microblazeel/kc705-microblazeel.dts diff --git a/recipes-bsp/device-tree/files/kc705/pl.dtsi b/recipes-bsp/device-tree/files/kc705-microblazeel/pl.dtsi similarity index 100% rename from recipes-bsp/device-tree/files/kc705/pl.dtsi rename to recipes-bsp/device-tree/files/kc705-microblazeel/pl.dtsi diff --git a/recipes-bsp/device-tree/files/kc705/system-conf.dtsi b/recipes-bsp/device-tree/files/kc705-microblazeel/system-conf.dtsi similarity index 100% rename from recipes-bsp/device-tree/files/kc705/system-conf.dtsi rename to recipes-bsp/device-tree/files/kc705-microblazeel/system-conf.dtsi diff --git a/recipes-bsp/device-tree/files/microzed/microzed-zynq7.dts b/recipes-bsp/device-tree/files/microzed-zynq7.dts similarity index 100% rename from recipes-bsp/device-tree/files/microzed/microzed-zynq7.dts rename to recipes-bsp/device-tree/files/microzed-zynq7.dts diff --git a/recipes-bsp/device-tree/files/picozed/picozed-zynq7.dts b/recipes-bsp/device-tree/files/picozed-zynq7.dts similarity index 100% rename from recipes-bsp/device-tree/files/picozed/picozed-zynq7.dts rename to recipes-bsp/device-tree/files/picozed-zynq7.dts diff --git a/recipes-bsp/device-tree/files/qemu/qemu-zynq7.dts b/recipes-bsp/device-tree/files/qemu-zynq7.dts similarity index 100% rename from recipes-bsp/device-tree/files/qemu/qemu-zynq7.dts rename to recipes-bsp/device-tree/files/qemu-zynq7.dts diff --git a/recipes-bsp/device-tree/files/zybo-linux-bd/pcw.dtsi b/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pcw.dtsi similarity index 100% rename from recipes-bsp/device-tree/files/zybo-linux-bd/pcw.dtsi rename to recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pcw.dtsi diff --git a/recipes-bsp/device-tree/files/zybo-linux-bd/pl.dtsi b/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pl.dtsi similarity index 100% rename from recipes-bsp/device-tree/files/zybo-linux-bd/pl.dtsi rename to recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pl.dtsi diff --git a/recipes-bsp/device-tree/files/zybo-linux-bd/zybo-linux-bd-zynq7.dts b/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.dts similarity index 100% rename from recipes-bsp/device-tree/files/zybo-linux-bd/zybo-linux-bd-zynq7.dts rename to recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.dts diff --git a/recipes-bsp/device-tree/files/common/zynq-7000-qspi-dummy.dtsi b/recipes-bsp/device-tree/files/zynq-7000-qspi-dummy.dtsi similarity index 100% rename from recipes-bsp/device-tree/files/common/zynq-7000-qspi-dummy.dtsi rename to recipes-bsp/device-tree/files/zynq-7000-qspi-dummy.dtsi -- 2.11.0 -- _______________________________________________ meta-xilinx mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-xilinx
