[meta-xilinx] [PATCH] device-tree.bb: add missing include path

[Martin Siegumfeldt]

On 20 June 2018 at 21:14, Martin Siegumfeldt <mns at gomspace.com> wrote:



> This patch add a missing include path for dt-bindings header-files
> (i.e. gpio, pinctrl etc.)
>
> Signed-off-by: Martin Siegumfeldt <mns at gomspace.com>
> ---
>  meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb
> index dc49cbb..e01e5b5 100644
> --- a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb
> +++ b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb
> @@ -34,6 +34,7 @@ KERNEL_DTS_INCLUDE ??= " \
>  # For arm64/zynqmp the xilinx specific includes are subdired under a vendor directory.
>  KERNEL_DTS_INCLUDE_append_zynqmp = " \
>                 ${STAGING_KERNEL_DIR}/arch/${ARCH}/boot/dts/xilinx \
> +               ${STAGING_KERNEL_DIR}/include \

Does "${STAGING_KERNEL_DIR}/scripts/dtc/include-prefixes" cover the
includes you are after? Since I don't believe the kernel itself adds
the root include directory for dtc targets.

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/scripts/Makefile.lib?h=v4.18-rc1#n167

Regards,
Nathan

Yes it does:

martin at dell:~/work/z7000-distro_sumo/build$ ls -la tmp/work-shared/nanomind-ultra-zu6eg-uv1/kernel-source/scripts/dtc/include-prefixes/ 
total 8                                                             
drwxr-xr-x 2 martin martin 4096 Jun 20 21:24 .                      
drwxr-xr-x 4 martin martin 4096 Jun 20 21:24 ..                     
lrwxrwxrwx 1 martin martin   26 Jun 20 21:24 arc -> ../../../arch/arc/boot/dts                                                          
lrwxrwxrwx 1 martin martin   26 Jun 20 21:24 arm -> ../../../arch/arm/boot/dts                                                          
lrwxrwxrwx 1 martin martin   28 Jun 20 21:24 arm64 -> ../../../arch/arm64/boot/dts                                                      
lrwxrwxrwx 1 martin martin   26 Jun 20 21:24 c6x -> ../../../arch/c6x/boot/dts                                                          
lrwxrwxrwx 1 martin martin   27 Jun 20 21:24 cris -> ../../../arch/cris/boot/dts                                                        
lrwxrwxrwx 1 martin martin   28 Jun 20 21:24 dt-bindings -> ../../../include/dt-bindings                                                
lrwxrwxrwx 1 martin martin   28 Jun 20 21:24 h8300 -> ../../../arch/h8300/boot/dts                                                      
lrwxrwxrwx 1 martin martin   28 Jun 20 21:24 metag -> ../../../arch/metag/boot/dts                                                      
lrwxrwxrwx 1 martin martin   33 Jun 20 21:24 microblaze -> ../../../arch/microblaze/boot/dts                                            
lrwxrwxrwx 1 martin martin   27 Jun 20 21:24 mips -> ../../../arch/mips/boot/dts                                                        
lrwxrwxrwx 1 martin martin   28 Jun 20 21:24 nios2 -> ../../../arch/nios2/boot/dts                                                      
lrwxrwxrwx 1 martin martin   31 Jun 20 21:24 openrisc -> ../../../arch/openrisc/boot/dts                                                
lrwxrwxrwx 1 martin martin   30 Jun 20 21:24 powerpc -> ../../../arch/powerpc/boot/dts                                                  
lrwxrwxrwx 1 martin martin   25 Jun 20 21:24 sh -> ../../../arch/sh/boot/dts                                                            
lrwxrwxrwx 1 martin martin   29 Jun 20 21:24 xtensa -> ../../../arch/xtensa/boot/dts                                                    

martin at dell:~/work/z7000-distro_sumo/build$ file tmp/work-shared/nanomind-ultra-zu6eg-uv1/kernel-source/include/dt-bindings/gpio/gpio.h 
tmp/work-shared/nanomind-ultra-zu6eg-uv1/kernel-source/include/dt-bindings/gpio/gpio.h: C source, ASCII text                            

The include part of the device tree being built:

#include "zynqmp.dtsi"
#include "zynqmp-clk-ccf.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/pinctrl-zynqmp.h>
#include <dt-bindings/phy/phy.h>

AFAICS from the Xilinx machines, there are no zynqmp variants utilizing out-of-tree device trees, only zynq which do not include any of the above header files. This is why I suspected the scenario to be untested by Xilinx.

Thanks,
Martin


>                 "
>
>  DTS_FILES_PATH ?= "${S}"
> --
> 2.14.1
>
> --
> _______________________________________________
> meta-xilinx mailing list
> meta-xilinx at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-xilinx