[meta-xilinx] [PATCH] device-tree.bb: add missing include path
This patch add a missing include path for dt-bindings header-files (i.e. gpio, pinctrl etc.) Signed-off-by: Martin Siegumfeldt --- 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 \ " DTS_FILES_PATH ?= "${S}" -- 2.14.1 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH] device-tree.bb: add missing include path
On 20 June 2018 at 21:14, Martin Siegumfeldt wrote: > This patch add a missing include path for dt-bindings header-files > (i.e. gpio, pinctrl etc.) > > Signed-off-by: Martin Siegumfeldt > --- > 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 > " > > DTS_FILES_PATH ?= "${S}" > -- > 2.14.1 > > -- > ___ > meta-xilinx mailing list > meta-xilinx@yoctoproject.org > https://lists.yoctoproject.org/listinfo/meta-xilinx -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [meta-xilinx-bsp][PATCH 2/2] linux-firmware_git.bbappend: Add hook for wl18xx and bts file
Ultra96 board needs the wl8xx and bts file to enable wireless and bluetooth on the TI part. This recipe uses linux-firmware and modify to include only wl18xx binaries. We also depend on TIInit_11.8.32 bts, add an append to fetch the right bt firmware Signed-off-by: Manjukumar Matha --- meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf | 2 +- .../linux-firmware/linux-firmware_git.bbappend | 28 ++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_git.bbappend diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf index b5e3f8b..6e61b78 100644 --- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf @@ -32,4 +32,4 @@ EXTRA_IMAGEDEPENDS += " \ virtual/pmu-firmware \ virtual/boot-bin \ " - +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "linux-firmware-wl18xx" diff --git a/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_git.bbappend b/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_git.bbappend new file mode 100644 index 000..a1e4cb0 --- /dev/null +++ b/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_git.bbappend @@ -0,0 +1,28 @@ +# TIInit_11.8.32.bts is required for bluetooth support but this particular +# version is not available in the linux-firmware repository. +# +SRC_URI_append_ultra96-zynqmp = "\ + https://git.ti.com/ti-bt/service-packs/blobs/raw/c290f8af9e388f37e509ecb111a1b64572b7c225/initscripts/TIInit_11.8.32.bts;name=TIInit_11.8.32 \ + " + +SRC_URI[TIInit_11.8.32.md5sum] = "b1e142773e8ef0537b93895ebe2fcae3" +SRC_URI[TIInit_11.8.32.sha256sum] = "962322c05857ad6b1fb81467bdfc59c125e04a6a8eaabf7f24b742ddd68c3bfa" + +do_install_append_ultra96-zynqmp() { + cp ${WORKDIR}/TIInit_11.8.32.bts ${D}${nonarch_base_libdir}/firmware/ti-connectivity/ + ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . ) + rm -f ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_7* + rm -f ${D}${nonarch_base_libdir}/firmware/TIInit_7* +} + +INSANE_SKIP_${PN} += "installed-vs-shipped" + +PACKAGES_remove_ultra96-zynqmp = "${PN}-wl12xx" + +FILES_${PN}-wl18xx_ultra96-zynqmp = " \ + ${nonarch_base_libdir}/firmware/wl18* \ + ${nonarch_base_libdir}/firmware/TI* \ + ${nonarch_base_libdir}/firmware/ti-connectivity/wl18* \ + ${nonarch_base_libdir}/firmware/ti-connectivity/TI* \ + " + -- 2.7.4 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH] device-tree.bb: add missing include path
On 20 June 2018 at 21:14, Martin Siegumfeldt wrote: > This patch add a missing include path for dt-bindings header-files > (i.e. gpio, pinctrl etc.) > > Signed-off-by: Martin Siegumfeldt > --- > 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@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@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 #include #include 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@yoctoproject.org > https://lists.yoctoproject.org/listinfo/meta-xilinx -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [meta-xilinx-bsp][PATCH 1/2] ultra96-zynqmp.conf: Add support for Ultra96 evaluation board
From: Sai Hari Chandana Kalluri Ultra96™ is an Arm-based, Xilinx Zynq UltraScale+™ MPSoC development board based on the Linaro 96Boards specification. The 96Boards’ specifications are open and define a standard board layout for development platforms that can be used by software application, hardware device, kernel, and other system software developers. Ultra96 represents a unique position in the 96Boards community with a wide range of potential peripherals and acceleration engines in the programmable logic that is not available from other offerings More info: http://zedboard.org/product/ultra96 This patch adds machine configuration file for Ultra96 board with required setting of board specific yocto variables needed for compilation of bootloader, kernel and device-tree. - linux-xlnx is the kernel provider - u-boot-xlnx is the u-boot provider which will also generate SPL boot.bin While using SPL flow, you may need to provide additional hack to pass the PMU config object. This is similar to all ZU+ boards, due to gap in SPL flow unable to load PMU config object. Signed-off-by: Sai Hari Chandana Kalluri Signed-off-by: Manjukumar Matha --- meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf | 35 ++ .../recipes-bsp/u-boot/u-boot-xlnx_2018.1.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf new file mode 100644 index 000..b5e3f8b --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf @@ -0,0 +1,35 @@ +#@TYPE: Machine +#@NAME: ultra96-zynqmp +#@DESCRIPTION: Machine support for Ultra96 Evaluation Board. +# + +SOC_VARIANT ?= "eg" + +require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/machine-xilinx-overrides.inc +require conf/machine/include/machine-xilinx-default.inc +require conf/machine/include/machine-xilinx-board.inc +require conf/machine/include/machine-xilinx-qemu.inc +include conf/machine/include/zynqmp-pmu-config.inc + +MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth" + +UBOOT_MACHINE = "xilinx_zynqmp_zcu100_revC_defconfig" +SPL_BINARY = "spl/boot.bin" + +SERIAL_CONSOLE = "115200 ttyPS0" + +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" + +KERNEL_DEVICETREE = "xilinx/zynqmp-zcu100-revC.dtb" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" +PREFERRED_PROVIDER_virtual/pmu-firmware ?= "zynqmp-pmu-pmu-firmware" + +EXTRA_IMAGEDEPENDS += " \ + arm-trusted-firmware \ + virtual/pmu-firmware \ + virtual/boot-bin \ + " + diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2018.1.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2018.1.bb index fb2c618..7ad504d 100644 --- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2018.1.bb +++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2018.1.bb @@ -23,5 +23,6 @@ HAS_PLATFORM_INIT ?= " \ xilinx_zynqmp_zcu102_rev1_0_config \ xilinx_zynqmp_zcu106_revA_config \ xilinx_zynqmp_zcu104_revC_config \ + xilinx_zynqmp_zcu100_revC_config \ " -- 2.7.4 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx