[meta-virtualization][master][scarthgap][PATCH v3] device-tree: Rename EXTRA_OVERLAYS to EXTRA_DT_INCLUDE_FILES

[meta-virtualization][master][scarthgap][PATCH v3] device-tree: Rename EXTRA_OVERLAYS to EXTRA_DT_INCLUDE_FILES

[Sandeep Gundlupet Raju]

Rename EXTRA_OVERLAYS to EXTRA_DT_INCLUDE_FILES as these variables
are renamed in https://github.com/Xilinx/meta-xilinx/blob/master/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
recipe.

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
---
Changes in 3:
   - Update merge branch.

Changes in v2:
   - As per Bruce comments add link to device-tree recipe so that others
     will known which one we are tracking.
---
 .../device-tree/device-tree.bbappend          | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dynamic-layers/xilinx/recipes-bsp/device-tree/device-tree.bbappend b/dynamic-layers/xilinx/recipes-bsp/device-tree/device-tree.bbappend
index e235826..813c08f 100644
--- a/dynamic-layers/xilinx/recipes-bsp/device-tree/device-tree.bbappend
+++ b/dynamic-layers/xilinx/recipes-bsp/device-tree/device-tree.bbappend
@@ -3,17 +3,17 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 ENABLE_XEN_DTSI ?= ""
 ENABLE_XEN_QEMU_DTSI ?= ""
 
-XEN_EXTRA_OVERLAYS = ""
-XEN_EXTRA_QEMU_OVERLAYS = ""
+XEN_EXTRA_DT_INCLUDE_FILES = ""
+XEN_EXTRA_QEMU_DT_INCLUDE_FILES = ""
 
-XEN_EXTRA_OVERLAYS:zynqmp = "zynqmp-xen.dtsi"
-XEN_EXTRA_QEMU_OVERLAYS:zynqmp = "zynqmp-xen.dtsi zynqmp-xen-qemu.dtsi"
+XEN_EXTRA_DT_INCLUDE_FILES:zynqmp = "zynqmp-xen.dtsi"
+XEN_EXTRA_QEMU_DT_INCLUDE_FILES:zynqmp = "zynqmp-xen.dtsi zynqmp-xen-qemu.dtsi"
 
-XEN_EXTRA_OVERLAYS:versal = "versal-xen.dtsi"
-XEN_EXTRA_QEMU_OVERLAYS:versal = "versal-xen.dtsi versal-xen-qemu.dtsi"
+XEN_EXTRA_DT_INCLUDE_FILES:versal = "versal-xen.dtsi"
+XEN_EXTRA_QEMU_DT_INCLUDE_FILES:versal = "versal-xen.dtsi versal-xen-qemu.dtsi"
 
-XEN_EXTRA_OVERLAYS:versal-net = "versal-net-xen.dtsi"
-XEN_EXTRA_QEMU_OVERLAYS:versal-net = "versal-net-xen.dtsi versal-net-xen-qemu.dtsi"
+XEN_EXTRA_DT_INCLUDE_FILES:versal-net = "versal-net-xen.dtsi"
+XEN_EXTRA_QEMU_DT_INCLUDE_FILES:versal-net = "versal-net-xen.dtsi versal-net-xen-qemu.dtsi"
 
-EXTRA_OVERLAYS:append = "${@' ${XEN_EXTRA_OVERLAYS}' if d.getVar('ENABLE_XEN_DTSI') == '1' else ''}"
-EXTRA_OVERLAYS:append = "${@' ${XEN_EXTRA_QEMU_OVERLAYS}' if d.getVar('ENABLE_XEN_QEMU_DTSI') == '1' else ''}"
+EXTRA_DT_INCLUDE_FILES:append = "${@' ${XEN_EXTRA_DT_INCLUDE_FILES}' if d.getVar('ENABLE_XEN_DTSI') == '1' else ''}"
+EXTRA_DT_INCLUDE_FILES:append = "${@' ${XEN_EXTRA_QEMU_DT_INCLUDE_FILES}' if d.getVar('ENABLE_XEN_QEMU_DTSI') == '1' else ''}"
-- 
2.34.1

Re: [meta-virtualization][master][scarthgap][PATCH v3] device-tree: Rename EXTRA_OVERLAYS to EXTRA_DT_INCLUDE_FILES

[Bruce Ashfield]

merged.

Bruce

In message: [meta-virtualization][master][scarthgap][PATCH v3] device-tree: Rename EXTRA_OVERLAYS to EXTRA_DT_INCLUDE_FILES
on 08/10/2024 Sandeep Gundlupet Raju wrote:

> Rename EXTRA_OVERLAYS to EXTRA_DT_INCLUDE_FILES as these variables
> are renamed in https://github.com/Xilinx/meta-xilinx/blob/master/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
> recipe.
> 
> Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
> ---
> Changes in 3:
>    - Update merge branch.
> 
> Changes in v2:
>    - As per Bruce comments add link to device-tree recipe so that others
>      will known which one we are tracking.
> ---
>  .../device-tree/device-tree.bbappend          | 20 +++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/dynamic-layers/xilinx/recipes-bsp/device-tree/device-tree.bbappend b/dynamic-layers/xilinx/recipes-bsp/device-tree/device-tree.bbappend
> index e235826..813c08f 100644
> --- a/dynamic-layers/xilinx/recipes-bsp/device-tree/device-tree.bbappend
> +++ b/dynamic-layers/xilinx/recipes-bsp/device-tree/device-tree.bbappend
> @@ -3,17 +3,17 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
>  ENABLE_XEN_DTSI ?= ""
>  ENABLE_XEN_QEMU_DTSI ?= ""
>  
> -XEN_EXTRA_OVERLAYS = ""
> -XEN_EXTRA_QEMU_OVERLAYS = ""
> +XEN_EXTRA_DT_INCLUDE_FILES = ""
> +XEN_EXTRA_QEMU_DT_INCLUDE_FILES = ""
>  
> -XEN_EXTRA_OVERLAYS:zynqmp = "zynqmp-xen.dtsi"
> -XEN_EXTRA_QEMU_OVERLAYS:zynqmp = "zynqmp-xen.dtsi zynqmp-xen-qemu.dtsi"
> +XEN_EXTRA_DT_INCLUDE_FILES:zynqmp = "zynqmp-xen.dtsi"
> +XEN_EXTRA_QEMU_DT_INCLUDE_FILES:zynqmp = "zynqmp-xen.dtsi zynqmp-xen-qemu.dtsi"
>  
> -XEN_EXTRA_OVERLAYS:versal = "versal-xen.dtsi"
> -XEN_EXTRA_QEMU_OVERLAYS:versal = "versal-xen.dtsi versal-xen-qemu.dtsi"
> +XEN_EXTRA_DT_INCLUDE_FILES:versal = "versal-xen.dtsi"
> +XEN_EXTRA_QEMU_DT_INCLUDE_FILES:versal = "versal-xen.dtsi versal-xen-qemu.dtsi"
>  
> -XEN_EXTRA_OVERLAYS:versal-net = "versal-net-xen.dtsi"
> -XEN_EXTRA_QEMU_OVERLAYS:versal-net = "versal-net-xen.dtsi versal-net-xen-qemu.dtsi"
> +XEN_EXTRA_DT_INCLUDE_FILES:versal-net = "versal-net-xen.dtsi"
> +XEN_EXTRA_QEMU_DT_INCLUDE_FILES:versal-net = "versal-net-xen.dtsi versal-net-xen-qemu.dtsi"
>  
> -EXTRA_OVERLAYS:append = "${@' ${XEN_EXTRA_OVERLAYS}' if d.getVar('ENABLE_XEN_DTSI') == '1' else ''}"
> -EXTRA_OVERLAYS:append = "${@' ${XEN_EXTRA_QEMU_OVERLAYS}' if d.getVar('ENABLE_XEN_QEMU_DTSI') == '1' else ''}"
> +EXTRA_DT_INCLUDE_FILES:append = "${@' ${XEN_EXTRA_DT_INCLUDE_FILES}' if d.getVar('ENABLE_XEN_DTSI') == '1' else ''}"
> +EXTRA_DT_INCLUDE_FILES:append = "${@' ${XEN_EXTRA_QEMU_DT_INCLUDE_FILES}' if d.getVar('ENABLE_XEN_QEMU_DTSI') == '1' else ''}"
> -- 
> 2.34.1
>