[meta-xilinx] [meta-xilinx-bsp][RFC] xf86-video-armsoc: Remove the recipe for xf86-video-armsoc
From: Madhurkiran Harikrishnan meta-openembedded holds xf86-video-armsoc recipe, meta-xilinx need not have the same. Also, move the patches to a bbappend file, so that it can be used by any xf86-video-armsoc recipe. Signed-off-by: Madhurkiran Harikrishnan Signed-off-by: Manjukumar Matha --- .../xorg-driver/xf86-video-armsoc_%.bbappend | 3 +++ .../xorg-driver/xf86-video-armsoc_git.bb | 23 -- 2 files changed, 3 insertions(+), 23 deletions(-) create mode 100644 meta-xilinx-bsp/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend delete mode 100644 meta-xilinx-bsp/recipes-graphics/xorg-driver/xf86-video-armsoc_git.bb diff --git a/meta-xilinx-bsp/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend b/meta-xilinx-bsp/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend new file mode 100644 index 000..3ddcf0b --- /dev/null +++ b/meta-xilinx-bsp/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/xf86-video-armsoc:" + +SRC_URI_append = " file://0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch" diff --git a/meta-xilinx-bsp/recipes-graphics/xorg-driver/xf86-video-armsoc_git.bb b/meta-xilinx-bsp/recipes-graphics/xorg-driver/xf86-video-armsoc_git.bb deleted file mode 100644 index 7a671fe..000 --- a/meta-xilinx-bsp/recipes-graphics/xorg-driver/xf86-video-armsoc_git.bb +++ /dev/null @@ -1,23 +0,0 @@ -require recipes-graphics/xorg-driver/xorg-driver-video.inc - -SUMMARY = "X.Org X server -- Xilinx ARM SOC display driver" -DESCRIPTION = "Xilinx ARM SOC display driver " - -LICENSE = "MIT-X & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" - -DEPENDS += "virtual/libx11 libdrm xf86driproto" -RDEPENDS_${PN} += "xserver-xorg-module-exa" - -PV = "1.4.1+git${SRCPV}" - -SRCREV = "8bbdb2ae3bb8ef64a8da33ddbe11a04763b8" -SRC_URI = " \ - git://anongit.freedesktop.org/xorg/driver/xf86-video-armsoc \ - file://0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch \ - " - -S = "${WORKDIR}/git" - -EXTRA_OECONF = " --enable-maintainer-mode" -CFLAGS += " -I${STAGING_INCDIR}/xorg " -- 2.7.4 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [meta-xilinx-bsp][RFC 1/2] zc1254-zynqmp.conf: Add support for zc1254 evaluation board
From: Jaewon Lee Add initial support for the zc1254 evaluation board which has the following main features: * RFSoC XCZU28DR-FFVE1156 * Samtec BullsEye cable access to: * 8 high speed analog-to-digital converters (HSADC) * 8 high speed digital-to-analog converters (HSDAC) * 8 GTY transceivers * 4 GTR transceivers This patch adds machine configuration file for ZC1254 Evaluation Kit 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: Jaewon Lee Signed-off-by: Manjukumar Matha --- meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf | 38 + 1 file changed, 38 insertions(+) create mode 100644 meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf diff --git a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf new file mode 100644 index 000..51dd2a9 --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf @@ -0,0 +1,38 @@ +#@TYPE: Machine +#@NAME: zc1254-zynqmp +#@DESCRIPTION: Machine support for ZC1254 Evaluation Board. +# + +SOC_VARIANT ?= "dr" + +require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/machine-xilinx-overrides.inc +require conf/machine/include/machine-xilinx-default.inc + +MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" + +UBOOT_MACHINE = "xilinx_zynqmp_zc1254_revA_defconfig" +SPL_BINARY ?= "spl/boot.bin" + +SERIAL_CONSOLE ?= "115200 ttyPS0" + +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" + +KERNEL_DEVICETREE = "xilinx/zynqmp-zc1254-revA.dtb" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" + +PMU_FIRMWARE_IMAGE_NAME ?= "pmu-firmware-zynqmp-pmu" +PMU_FIRMWARE_DEPLOY_DIR ?= "${TOPDIR}/pmutmp/deploy/images/zynqmp-pmu" + +EXTRA_IMAGEDEPENDS += " \ + u-boot-zynq-uenv \ + arm-trusted-firmware \ + virtual/boot-bin \ + virtual/bootloader \ + " +IMAGE_BOOT_FILES += " \ + uEnv.txt \ + atf-uboot.ub \ + " -- 2.7.4 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] Buildign PMU firmware in thud
I tried to build the PMU firmware using multiconfig, but all I get is this: ERROR: Uninative selected but not configured correctly, please set UNINATIVE_CHECKSUM[x86_64] -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] Fwd: [OE-core] [thud][PATCH] yocto-uninative: Correct sha256sum for aarch64
Mike does this help? Forwarded Message Subject: [OE-core] [thud][PATCH] yocto-uninative: Correct sha256sum for aarch64 Date: Tue, 12 Mar 2019 21:03:44 -0700 From: Robert Joslyn To: openembedded-c...@lists.openembedded.org From: Michael Halstead Avoid uninative checksum warnings when building on aarch64 hardware. Signed-off-by: Michael Halstead Signed-off-by: Richard Purdie --- meta/conf/distro/include/yocto-uninative.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc index c9d502ba4f..0d484f6c3c 100644 --- a/meta/conf/distro/include/yocto-uninative.inc +++ b/meta/conf/distro/include/yocto-uninative.inc @@ -9,7 +9,7 @@ UNINATIVE_MAXGLIBCVERSION = "2.28" UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/2.3/; -UNINATIVE_CHECKSUM[aarch64] ?= "b7fbbaad1ec86d76eca84d83098f50525b8a4124cc8685eaed" +UNINATIVE_CHECKSUM[aarch64] ?= "e495046969c796b7fbbaad1ec86d76eca84d83098f50525b8a4124cc8685eaed" UNINATIVE_CHECKSUM[i686] ?= "44253cddbf629082568cea4fff59419106871a0cf81b4845b5d34e7014887b20" UNINATIVE_CHECKSUM[x86_64] ?= "c6954563dad3c95608117c6fc328099036c832bbd924ebf5fdccb622fc0a8684" -- 2.19.2 -- ___ Openembedded-core mailing list openembedded-c...@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] devtmpfs: error mounting -2
Hi All - I'm using Yocto version rocko with a custom layer to run on the Zynq+ SoC on a custom board. When trying to boot I'm getting an error like: [4.178864] devtmpfs: error mounting -2 in the boot output. Even after rolling back to a previous working version I still get this error in the boot output. After this error, the boot process seems to stop, and I am directly given a terminal input, but no login, or anything. The /dev and /proc folders seem to be missing as does specifically /etc/network/ among others. I'm booting from an SD card and flashing it using a wic image made with the "sdimage-bootpart.wks" from yocto. This method has worked fine before now. Are there obvious things I should check to make sure devtmpfs can be mounted properly? I have not messed with bootargs or anything since the working version of the OS, so I'm not sure why I am suddenly seeing this error. A comparison output from the working OS and the bad OS can be seen below. Any ideas are greatly appreciated! Thanks, Emily Bad OS: [4.125754] EXT4-fs (mmcblk0p2): couldn't mount as ext3 due to feature incompatibilities [4.163579] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null) [4.171613] VFS: Mounted root (ext4 filesystem) on device 179:2. [4.178864] devtmpfs: error mounting -2 [4.182766] Freeing unused kernel memory: 640K (ffc000d2 - ffc000dc) /bin/sh: can't access tty; job control turned off / # Working OS: [4.089697] EXT4-fs (mmcblk0p2): couldn't mount as ext3 due to feature incompatibilities [5.324662] EXT4-fs (mmcblk0p2): recovery complete [5.404047] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null) [5.412083] VFS: Mounted root (ext4 filesystem) on device 179:2. [5.418084] devtmpfs: mounted [5.421106] Freeing unused kernel memory: 512K (ffc000c1 - ffc000c9) ... (boot continues) -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [meta-xilinx-bsp][RFC] linux-xlnx.inc: Use KBUILD_DEFCONFIG in externalsrc mode if defined
When external source is used for kernel, we need a starting point for kernel configuration, use KBUILD_DEFCONFIG if it is defined. Signed-off-by: Manjukumar Matha --- meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc | 8 1 file changed, 8 insertions(+) diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc index a597dca..4cc3a9e 100644 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc @@ -18,11 +18,19 @@ require linux-microblaze.inc DESCRIPTION = "Xilinx Kernel" +EXTKERNELSRC = "${@'1' if d.getVar('EXTERNALSRC') else ''}" + # Force the use of the KBUILD_DEFCONFIG even if some other defconfig was generated in the ${WORKDIR} do_kernel_metadata_prepend () { [ -n "${KBUILD_DEFCONFIG}" ] && [ -e ${WORKDIR}/defconfig ] && rm ${WORKDIR}/defconfig } +do_configure_prepend () { + if [ -n "${KBUILD_DEFCONFIG}" ] && [ -n "${EXTKERNELSRC}" ]; then + cp ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig + fi +} + inherit kernel-simpleimage # Default to be only compatible with specific machines or soc families -- 2.7.4 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [meta-xilinx-bsp][RFC] libmali: Use update-alternatives to switch between GL backends
From: Alejandro Enedino Hernandez Samaniego libmali provides GL backends based on x11, fbdev and wayland, we should be able to switch between them at runtime since it is the same ABI, it should only be a matter of loading the correct shared library by the interpreter (dynamic linker). Use the update-alternatives class, to provide a way for the user to choose the desired backend at runtime, do this by setting priorities, the package with the highest priority will be chosen as default at build time, but it can easily be changed at runtime afterwards. This change implies that the libmali package will install all backends regardless of which one was chosen, but it will only use one as default. Use the x11 backend by default at build time; given that it is the same ABI, applications which depend on libmali, can build regardless of the chosen backend at build time. Update-alternatives uses a set of commands on the postinst scripts when creating the root filesystem, which basically create the soft link between the chosen alternative and the binary/library. This usually works seamlessly (for binaries), but it does not in the case of libraries, because ldconfig is run at the end of the do_rootfs task, and it removes the link that was just created, it is important to note that this is simply normal ldconfig behavior and its not something we can fix, so we defer execution of update-alternatives until the first boot, hence avoiding the link removal by ldconfig. Switching backends at build time will also help to avoid longer build times, since it will only invalidate the do_package task, rebuilding an image after switching a backend (at build time) should only execute the do_package task along with the do_rootfs task. Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Manjukumar Matha --- .../recipes-graphics/libgles/libmali-xlnx.bb | 101 ++--- 1 file changed, 67 insertions(+), 34 deletions(-) diff --git a/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb b/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb index 504ea6d..7191c25 100644 --- a/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb +++ b/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb @@ -4,9 +4,9 @@ LICENSE = "Proprietary" LICENSE_FLAGS = "xilinx" LIC_FILES_CHKSUM = "file://README.md;md5=d5750ae6496dd931669b454b5aaae2cd" -inherit distro_features_check +inherit distro_features_check update-alternatives -ANY_OF_DISTRO_FEATURES = "fbdev x11" +REQUIRED_DISTRO_FEATURES = "x11 fbdev wayland" PROVIDES += "virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgbm" @@ -40,22 +40,14 @@ PACKAGE_ARCH = "${SOC_FAMILY}" S = "${WORKDIR}/git" -X11RDEPENDS = "libxdamage libxext libx11 libdrm libxfixes" -X11DEPENDS = "libxdamage libxext virtual/libx11 libdrm libxfixes" +# If were switching at runtime, we need all RDEPENDS needed for all backends available +RDEPENDS_${PN} = " kernel-module-mali libxdamage libxext libx11 libdrm libxfixes" -RDEPENDS_${PN} = " \ - kernel-module-mali \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11RDEPENDS}', '', d)} \ - " +# We dont build anything but we want to avoid QA warning build-deps +DEPENDS = "wayland" -DEPENDS = "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland libdrm', '', d)} \ - " - -USE_X11 = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" -USE_FB = "${@bb.utils.contains("DISTRO_FEATURES", "fbdev", "yes", "no", d)}" -USE_WL = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" +# x11 is default, set to "fbdev" , "wayland", or "headless" if required +MALI_BACKEND_DEFAULT ?= "x11" do_install() { #Identify the ARCH type @@ -87,25 +79,66 @@ do_install() { cp -a --no-preserve=ownership ${S}/${PV}/${ARCH_PLATFORM_DIR}/common/*.so* ${D}${libdir} -if [ "${USE_WL}" = "yes" ]; then - install -m 0644 ${S}/${PV}/glesHeaders/GBM/gbm.h ${D}${includedir}/ - install -m 0644 ${WORKDIR}/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc - install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/wayland/libMali.so.8.0 ${D}${libdir}/wayland/libMali.so.8.0 - ln -snf wayland/libMali.so.8.0 ${D}${libdir}/libMali.so.8.0 -elif [ "${USE_X11}" = "yes" ]; then - install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/x11/libMali.so.8.0 ${D}${libdir}/x11/libMali.so.8.0 - ln -snf x11/libMali.so.8.0 ${D}${libdir}/libMali.so.8.0 -elif [ "${USE_FB}" = "yes" ]; then - install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/fbdev/libMali.so.8.0 ${D}${libdir}/fbdev/libMali.so.8.0 - ln -snf fbdev/libMali.so.8.0 ${D}${libdir}/libMali.so.8.0 -else - install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/headless/libMali.so.8.0 ${D}${libdir}/headless/libMali.so.8.0 - ln -snf headless/libMali.so.8.0 ${D}${libdir}/libMali.so.8.0 -fi -
[meta-xilinx] [meta-xilinx-bsp][RFC] machine-xilinx-default.inc: Make u-boot.elf as UBOOT_ELF for zynq
From: Sreeja Vadakattu CONFIG_REMAKE_ELF is enabled for all zynq boards. Also, using CONFIG_OF_SEPERATE is recommeneded by u-boot release v2019.01. So, Deploy u-boot.elf instead of u-boot as u-boot.elf contains dtb. This would solve the following boot issue: No valid device tree binary found - please append one to U-Boot binary, use u-boot-dtb.bin or define CONFIG_OF_EMBED. For sandbox, use -d initcall sequence 00461b18 failed at call 004582e0 (err=-1) Signed-off-by: Sreeja Vadakattu Signed-off-by: Jaewon Lee Signed-off-by: Manjukumar Matha --- meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc index 153a47f..f714a21 100644 --- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc @@ -23,6 +23,7 @@ UBOOT_SUFFIX_microblaze ?= "bin" UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" UBOOT_ELF ?= "u-boot" +UBOOT_ELF_zynq ?= "u-boot.elf" UBOOT_ELF_aarch64 ?= "u-boot.elf" #Hardware accelaration -- 2.7.4 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH v2] kernel-module-mali: add patch to check dma_map_page error
> -Original Message- > From: meta-xilinx-boun...@yoctoproject.org [mailto:meta-xilinx- > boun...@yoctoproject.org] On Behalf Of Hyun Kwon > Sent: Tuesday, March 12, 2019 11:24 AM > To: Jean-Francois Dagenais ; meta- > xil...@lists.yoctoproject.org > Cc: Madhurkiran Harikrishnan > Subject: Re: [meta-xilinx] [PATCH v2] kernel-module-mali: add patch to check > dma_map_page error > > Hi JFD, > > + Mads > > Thanks for the patch. > > > -Original Message- > > From: Jean-Francois Dagenais [mailto:jeff.dagen...@gmail.com] > > Sent: Tuesday, March 12, 2019 11:17 AM > > To: meta-xil...@lists.yoctoproject.org > > Cc: Hyun Kwon ; Jean-Francois Dagenais > > > > Subject: [PATCH v2] kernel-module-mali: add patch to check > > dma_map_page error > > > > This fixes an error when using the module in a kernel configured with > > the CONFIG_DMA_API_DEBUG flag. > > > > utgard fd4b.gpu: DMA-API: device driver failed to check map > > error[device address=0x325b] [size=4096 bytes] [mapped as > > page] ... > > [] check_unmap+0x44c/0x7e8 [] > > debug_dma_unmap_page+0x60/0x68 [] > > mali_mem_os_alloc_pages+0x230/0x498 [mali] ... > > > > Acked-by: Hyun Kwon > > Signed-off-by: Jean-Francois Dagenais > > --- > > .../recipes-graphics/mali/kernel-module-mali.bb | 1 + > > .../0007-fix-driver-failed-to-check-map-error.patch | 17 > > + > > 2 files changed, 18 insertions(+) > > create mode 100644 > > meta-xilinx-bsp/recipes-graphics/mali/kernel-module- > > mali/0007-fix-driver-failed-to-check-map-error.patch > > > > diff --git > > a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb > > b/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb > > index 0f44d25..5833239 100644 > > --- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb > > +++ b/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb > > @@ -16,6 +16,7 @@ SRC_URI = " \ > > file://0004-staging-mali-r8p0-01rel0-Don-t-include- > > mali_read_phy.patch \ > > file://0005-linux-mali_kernel_linux.c-Handle-clock-when-probed- > > a.patch \ > > file://0006-arm.c-global-variable-dma_ops-is-removed-from-the- > > ke.patch \ > > + file://0007-fix-driver-failed-to-check-map-error.patch \ > > file://0010-common-mali_pm.c-Add-PM-runtime-barrier-after- > > removi.patch \ > > file://0011-linux-mali_kernel_linux.c-Enable-disable-clock-for- > > r.patch\ > > " > > I'm still not sure why this list looks different here, unless I'm missing > something: > > https://github.com/Xilinx/meta-xilinx/blob/rel-v2018.3/meta-xilinx-bsp/recipes- > graphics/mali/kernel-module-mali.bb This is based on Rocko release > https://github.com/Xilinx/meta-xilinx/blob/master-next/meta-xilinx-bsp/recipes- > graphics/mali/kernel-module-mali.bb > master-next is WIP tree, may not be in sync with master. > If that is the case, it'll probably fail to apply. The patch should be apply to master tree, if not it will fail Thanks, Manju -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [meta-xilinx-bsp][RFC 2/2] zc1275-zynqmp.conf: Add support for zc1275 evaluation board
From: Jaewon Lee Add initial support for the zc1275 evaluation board which has the following main features: * XCZU29DR-FFVF1760 * Samtec BullsEye cable access to: * 16 GTY transceivers * 4 GTR transceivers * 16 ADCs * 16 DACs This patch adds machine configuration file for ZC1275 Evaluation Kit 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: Jaewon Lee Signed-off-by: Manjukumar Matha --- meta-xilinx-bsp/conf/machine/zc1275-zynqmp.conf | 38 + 1 file changed, 38 insertions(+) create mode 100644 meta-xilinx-bsp/conf/machine/zc1275-zynqmp.conf diff --git a/meta-xilinx-bsp/conf/machine/zc1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1275-zynqmp.conf new file mode 100644 index 000..1e5cd0d --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/zc1275-zynqmp.conf @@ -0,0 +1,38 @@ +#@TYPE: Machine +#@NAME: zc1275-zynqmp +#@DESCRIPTION: Machine support for ZC1275 Evaluation Board. +# + +SOC_VARIANT ?= "dr" + +require conf/machine/include/tune-zynqmp.inc +require conf/machine/include/machine-xilinx-overrides.inc +require conf/machine/include/machine-xilinx-default.inc + +MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" + +UBOOT_MACHINE = "xilinx_zynqmp_zc1275_revB_defconfig" +SPL_BINARY ?= "spl/boot.bin" + +SERIAL_CONSOLE ?= "115200 ttyPS0" + +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" + +KERNEL_DEVICETREE = "xilinx/zynqmp-zc1275-revB.dtb" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" + +PMU_FIRMWARE_IMAGE_NAME ?= "pmu-firmware-zynqmp-pmu" +PMU_FIRMWARE_DEPLOY_DIR ?= "${TOPDIR}/pmutmp/deploy/images/zynqmp-pmu" + +EXTRA_IMAGEDEPENDS += " \ + u-boot-zynq-uenv \ + arm-trusted-firmware \ + virtual/boot-bin \ + virtual/bootloader \ + " +IMAGE_BOOT_FILES += " \ + uEnv.txt \ + atf-uboot.ub \ + " -- 2.7.4 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [meta-xilinx-bsp][RFC] kernel-module-mali: Fix errors associated with kernel upgrade to 4.19
From: Madhurkiran Harikrishnan These patches fixes errors caused by removal of ancient init_timer API. Also, addresses the removal of hot/cold cache pages in the kernel. Signed-off-by: Madhurkiran Harikrishnan Signed-off-by: Manjukumar Matha --- .../recipes-graphics/mali/kernel-module-mali.bb| 3 + ...ux-mali_memory_os_alloc-Remove-__GFP_COLD.patch | 33 + ...memory_secure-Add-header-file-dma-direct..patch | 34 + ...4-linux-mali_-timer-Get-rid-of-init_timer.patch | 156 + 4 files changed, 226 insertions(+) create mode 100644 meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch create mode 100644 meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch create mode 100644 meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0014-linux-mali_-timer-Get-rid-of-init_timer.patch diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb b/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb index 327f8f0..fe2fbdc 100644 --- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb +++ b/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb @@ -21,6 +21,9 @@ SRC_URI = " \ file://0009-mali_memory_swap_alloc.c-Rename-global_page_state-wi.patch \ file://0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch \ file://0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch\ + file://0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch\ + file://0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch\ + file://0014-linux-mali_-timer-Get-rid-of-init_timer.patch\ " SRC_URI[md5sum] = "8f04ae86957fd56197ad5a9d017b84ff" SRC_URI[sha256sum] = "bfd14fa3f75a71d4ba313534e651ca1c58dc354e882c0b39867e335882a06350" diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch b/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch new file mode 100644 index 000..24f0a22 --- /dev/null +++ b/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch @@ -0,0 +1,33 @@ +From 779b1883d56804ecd08fe7f57d6c01e3db4e893b Mon Sep 17 00:00:00 2001 +From: Madhurkiran Harikrishnan +Date: Wed, 5 Dec 2018 18:07:29 -0800 +Subject: [PATCH 1/3] linux: mali_memory_os_alloc: Remove __GFP_COLD + +The support for Cache hot and cold pages are removed from the kernel. +For more information refer kernel commit 453f85d43fa9ee243f0fc3ac4e1be45615301e3f + +Signed-off-by: Madhurkiran Harikrishnan +Reviewed-by: Hyun Kwon +Upstream Status: Pending +--- + driver/src/devicedrv/mali/linux/mali_memory_os_alloc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/driver/src/devicedrv/mali/linux/mali_memory_os_alloc.c b/driver/src/devicedrv/mali/linux/mali_memory_os_alloc.c +index 1602371..830e8c6 100644 +--- linux/mali_memory_os_alloc.c b/linux/mali_memory_os_alloc.c +@@ -202,7 +202,9 @@ int mali_mem_os_alloc_pages(mali_mem_os_mem *os_mem, u32 size) + /* Allocate new pages, if needed. */ + for (i = 0; i < remaining; i++) { + dma_addr_t dma_addr; +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++ gfp_t flags = __GFP_ZERO | __GFP_RETRY_MAYFAIL | __GFP_NOWARN; ++#elif LINUX_VERSION_CODE == KERNEL_VERSION(4, 14, 0) + gfp_t flags = __GFP_ZERO | __GFP_RETRY_MAYFAIL | __GFP_NOWARN | __GFP_COLD; + #else + gfp_t flags = __GFP_ZERO | __GFP_REPEAT | __GFP_NOWARN | __GFP_COLD; +-- +2.7.4 + diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch b/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch new file mode 100644 index 000..c28a83f --- /dev/null +++ b/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch @@ -0,0 +1,34 @@ +From d20b6eb3e48e56558488dbdda98875b1aed0c29f Mon Sep 17 00:00:00 2001 +From: Madhurkiran Harikrishnan +Date: Wed, 5 Dec 2018 18:13:28 -0800 +Subject: [PATCH 2/3] linux: mali_memory_secure: Add header file dma-direct.h + +Add dma-direct.h header, as API dma_to_phys is defined here. +refer kernel commit ea8c64ace86647260ec4255f483e5844d62af2df + +Signed-off-by: Madhurkiran Harikrishnan +Reviewed-by: Hyun Kwon +Upstream Status: Pending +--- + driver/src/devicedrv/mali/linux/mali_memory_secure.c | 4 + 1 file changed, 4 insertions(+) + +diff --git a/driver/src/devicedrv/mali/linux/mali_memory_secure.c b/driver/src/devicedrv/mali/linux/mali_memory_secure.c +index 2836b1b..4f55fa5 100644 +---