Re: [meta-xilinx] [PATCH 00/12] Updates for Kernels, and changes in OE-Core master
On Thu, Jan 7, 2016 at 3:23 PM, Robert Berger <gm...@reliableembeddedsystems.com> wrote: > > > > Hi, > > On 12/28/2015 02:46 PM, Nathan Rossi wrote: >> This series adds a number of updates to kernel configuration and kernel >> recipes >> as well as updating (and removing) recipes which have been updated in OE-Core >> master. >> >> The most interesting changes in this series are: >> * linux-yocto-dev (which is 4.4-rc*) has support for FPGA Manager >> * linux-yocto-dev - Much better performance for Zynq GEM (see below >> stats, >> performs on par or better that emacps from linux-xlnx) >> * Dropped linux-yocto 3.14, 3.19 in-line with changes in oe-core master >> * No more ZynqMP patches required to any recipes :) > > ... > > Should I be worries about the warning? This specific warning is ok to ignore. It is just informing you that it failed to enable the config/driver for the Xilinx AXI Ethernet (aka the soft-ip ethernet core that is available from the Xilinx IP library in Vivado/XPS), the reason it fails to enable it is because in the mainline kernel the driver has not been updated to work for Zynq/ZynqMP yet. Regards, Nathan > > Build Configuration: > BB_VERSION= "1.28.0" > BUILD_SYS = "x86_64-linux" > NATIVELSBSTRING = "Ubuntu-14.04" > TARGET_SYS= "arm-poky-linux-gnueabi" > MACHINE = "zedboard-zynq7" > DISTRO= "poky" > DISTRO_VERSION= "2.0+snapshot-20160106" > TUNE_FEATURES = "arm armv7a vfp neon cortexa9" > TARGET_FPU= "vfp-neon" > meta > meta-yocto > meta-yocto-bsp= "heads/master:f8185ff9f8ac697733b41f023cb3a4b98b2f823f" > meta-xilinx = "heads/master:b98e9384d61f8e19a1028c68abe7dcafd4871de8" > > NOTE: Preparing RunQueue > NOTE: Executing SetScene Tasks > NOTE: Executing RunQueue Tasks > WARNING: [kernel config]: specified values did not make it into the > kernel's final configuration: > > Value requested for CONFIG_XILINX_AXI_EMAC not in final ".config" > Requested value: "CONFIG_XILINX_AXI_EMAC=y" > Actual value set: "" > > Regards, > > Robert > > ...Discipline is the best tool.Design first, then code.Don't patch bugs > out, rewrite them out.Don't test bugs out, design them out.- Jack Ganssle > > My public pgp key is available,at: > http://pgp.mit.edu:11371/pks/lookup?op=get=0x90320BF1 > > > -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH] recipes-zynqmp: qemu: Change the UART reset values
On Wed, Jun 8, 2016 at 10:59 AM, Alistair Franciswrote: > Update the QEMU Cadence UART reset values to enable a direct Linux boot > without u-boot. Hi Alistair, Could you expand a bit on this, I don't see any issues where direct booting is broken with the cadence uart for zynq or zynqmp. I did notice however that the earlycon for the cadence uart driver (in the kernel) does not set txen, which is possibly the cause for the delayed console output. Also I do see that there is a regression for xlnx-ep108 with qemu 2.6.0 where bringing up the additional cpus causes a RAM/ROM exec error (see below). If i remove cpu@1,2,3 from the dt it boots fine (ep108 kernel dt). qemu: fatal: Trying to execute code outside RAM or ROM at 0xffc82000 PC=ffc82000 SP= X00=34d5d91d X01=1122 X02= X03= X04= X05=ffc84000 X06=34d5d91d X07= X08= X09= X10=0032b5193519 X11= X12= X13= X14= X15= X16= X17= X18= X19= X20=0e11 X21=ffc000ae8688 X22= X23= X24= X25=00b43000 X26=00b46000 X27=ffc82000 X28= X29= X30=00081fec PSTATE=63cd -ZC- EL3h --- ffc82000 <__secondary_switched>: ffc82000: f94002a0 ldr x0, [x21] ffc82004: 911f mov sp, x0 ffc82008: d280001d mov x29, #0x0 // #0 ffc8200c: 14002d0b b ffc8d438 Regards, Nathan > > Signed-off-by: Alistair Francis > --- > In future versions of QEMU we can hopefully change the reset values from > the command line, but at the moment this is the best we can do. > > .../d3d0ed0cc451232fd5037d41d8e73de469c83cf6.patch | 31 > ++ > recipes-zynqmp/qemu/qemu_2.5%.bbappend | 1 + > 2 files changed, 32 insertions(+) > create mode 100644 > recipes-zynqmp/qemu/files/d3d0ed0cc451232fd5037d41d8e73de469c83cf6.patch > > diff --git > a/recipes-zynqmp/qemu/files/d3d0ed0cc451232fd5037d41d8e73de469c83cf6.patch > b/recipes-zynqmp/qemu/files/d3d0ed0cc451232fd5037d41d8e73de469c83cf6.patch > new file mode 100644 > index 000..930fcfc > --- /dev/null > +++ b/recipes-zynqmp/qemu/files/d3d0ed0cc451232fd5037d41d8e73de469c83cf6.patch > @@ -0,0 +1,31 @@ > +From d3d0ed0cc451232fd5037d41d8e73de469c83cf6 Mon Sep 17 00:00:00 2001 > +From: Alistair Francis > +Date: Tue, 7 Jun 2016 17:14:27 -0700 > +Subject: [PATCH] cadence_uart: Enable transmitter by default > + > +On hardware Linux relies on u-boot to enable the transmitter for the > +Cadence UART device. To allow direct Linux boots on QEMU change the > +default reset values to enable the transmitter by default. > + > +Signed-off-by: Alistair Francis > +Upstream-Status: Not Applicable > +--- > + hw/char/cadence_uart.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c > +index 9d379e5..c72ceb7 100644 > +--- a/hw/char/cadence_uart.c > b/hw/char/cadence_uart.c > +@@ -440,7 +440,7 @@ static void cadence_uart_reset(DeviceState *dev) > + { > + CadenceUARTState *s = CADENCE_UART(dev); > + > +-s->r[R_CR] = 0x0128; > ++s->r[R_CR] = 0x0118; > + s->r[R_IMR] = 0; > + s->r[R_CISR] = 0; > + s->r[R_RTRIG] = 0x0020; > +-- > +2.7.4 > + > diff --git a/recipes-zynqmp/qemu/qemu_2.5%.bbappend > b/recipes-zynqmp/qemu/qemu_2.5%.bbappend > index 6f7cb50..73ed23d 100644 > --- a/recipes-zynqmp/qemu/qemu_2.5%.bbappend > +++ b/recipes-zynqmp/qemu/qemu_2.5%.bbappend > @@ -5,5 +5,6 @@ SRC_URI += " \ > file://4054bfa9e7986c9b7d2bf70f9e10af9647e376fc.patch \ > file://8a83ffc2dafad3499b87a736b17ab1b203fdb00b.patch \ > file://978364f12adebb4b8d90fdeb71242cb3c1405740.patch \ > + file://d3d0ed0cc451232fd5037d41d8e73de469c83cf6.patch \ > " > > -- > 2.7.4 > > -- > ___ > 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
Re: [meta-xilinx] [PATCH] recipes-zynqmp: qemu: Change the UART reset values
On Tue, Jun 14, 2016 at 2:49 AM, Alistair Francis <alistair.fran...@xilinx.com> wrote: > On Fri, Jun 10, 2016 at 10:53 AM, Alistair Francis > <alistair.fran...@xilinx.com> wrote: >> On Fri, Jun 10, 2016 at 4:02 AM, Nathan Rossi <nat...@nathanrossi.com> wrote: >>> On Wed, Jun 8, 2016 at 10:59 AM, Alistair Francis >>> <alistair.fran...@xilinx.com> wrote: >>>> Update the QEMU Cadence UART reset values to enable a direct Linux boot >>>> without u-boot. >>> >>> Hi Alistair, >>> >>> Could you expand a bit on this, I don't see any issues where direct >>> booting is broken with the cadence uart for zynq or zynqmp. I did >>> notice however that the earlycon for the cadence uart driver (in the >>> kernel) does not set txen, which is possibly the cause for the delayed >>> console output. >> >> Hey Nathan, >> >> At the moment on the Krogoth branch I don't see any console output >> when booting the ZCU102 machine if I don't have this patch. Ah ok, i understand the issue you are referring to, this issue appears whenever the kernel panics/hangs before the serial devices are initialized fully. Since this patch is a feature, I don't see a need to apply this to the krogoth branch. But I would like to see this fixed for master if possible. However i'm not sure if applying a workaround to QEMU (I would like to avoid maintaining a non-upstream patch in meta-xilinx for it) is the best solution to resolve this. I think this might best be solved by improving the support for cadence uart earlycon in the kernel. Whilst from a QEMU use stance the earlycon driver merely needs to setup the TXEN bit, it looks as though it might be possible to solve the JTAG boot earlycon side as well by adding a clock rate param to the earlycon arg so that the driver can do a simple baud calc and setup the uart with a static clock. Have you considered? if not what is your opinion of solving the the issue this way? > > Hey Nathan, > > On Krogoth branch with this patch for the ZCU102 this is what I see: Just to note that using the linux-xlnx kernel with the "xilinx_zynqmp_defconfig" config has issues booting on QEMU which is why I asked Manju to make the use of that defconfig specific for the zcu102 only. See this post: https://lists.yoctoproject.org/pipermail/meta-xilinx/2016-May/001691.html. You are missing the rest of the log after the bootconsole is disabled (VT_CONSOLE is enabled on that kernel also, which causes it to switch to tty0). Add "keep_bootcon" or "console=ttyPS0 earlycon" to see the full log, or use QEMU monitor to dump the logbuf (http://www.wiki.xilinx.com/QEMU-Linux+Kernel+logbuf+Extraction). Regards, Nathan > > alistai@xsjalistai50:/work/alistai/poky/build (detached*)$ > ./tmp/sysroots/x86_64-linux/usr/bin/qemu-system-aarch64 -M > xlnx-ep108 -nographic -kernel > ./tmp/deploy/images/zcu102-zynqmp/Image -initrd > ./tmp/deploy/images/zcu102-zynqmp/core-image-minimal-zcu102-zynqmp.cpio > -dtb ./tmp/deploy/images/zcu102-zynqmp/Image-zynqmp-zcu102-revB.dtb > [0.00] Booting Linux on physical CPU 0x0 > [0.00] Linux version 4.4.0-xilinx (alistai@xsjalistai50) (gcc > version 5.3.0 (GCC) ) #1 SMP PREEMPT Mon Jun 6 18:44:26 PDT 2016 > [0.00] Boot CPU: AArch64 Processor [410fd034] > [0.00] bootconsole [uart0] enabled > [0.00] cma: Failed to reserve 128 MiB > [0.00] psci: probing for conduit method from DT. > [0.00] psci: PSCIv0.2 detected in firmware. > [0.00] psci: Using standard PSCI v0.2 function IDs > [0.00] psci: Trusted OS migration not required > [0.00] PERCPU: Embedded 16 pages/cpu @ffc007f92000 s24728 > r8192 d32616 u65536 > [0.00] Detected VIPT I-cache on CPU0 > [0.00] CPU features: enabling workaround for ARM erratum 845719 > [0.00] Built 1 zonelists in Zone order, mobility grouping on. > Total pages: 32320 > [0.00] Kernel command line: earlycon > [0.00] PID hash table entries: 512 (order: 0, 4096 bytes) > [0.00] Dentry cache hash table entries: 16384 (order: 5, 131072 bytes) > [0.00] Inode-cache hash table entries: 8192 (order: 4, 65536 bytes) > [0.00] Cannot allocate SWIOTLB buffer > [0.00] Memory: 87152K/131072K available (7382K kernel code, > 532K rwdata, 3048K rodata, 272K init, 478K bss, 43920K reserved, 0K > cma-reserved) > [0.00] Virtual kernel memory layout: > [0.00] vmalloc : 0xff80 - 0xffbd > ( 247 GB) > [0.00] vmemmap : 0xffbe - 0xffbfc000 > ( 7 GB maximum) > [0.00] 0xffbe - 0xffbe0
Re: [meta-xilinx] [meta-xilinx 0/3] MALI 400 kernel module recipe
On Thu, May 26, 2016 at 10:31 AM, Manjukumar Harthikote Mathawrote: > Ping > > On 05/16/2016 02:48 PM, Manjukumar Matha wrote: >> >> Build MALI 400 kernel module from source for ZynqMP.This patch series >> disabled >> the default MALI kernel present in Xilinx kernel and builds the MALI >> kernel >> module from source provided by ARM. >> >> Manjukumar Matha (3): >>zynqmp.cfg: Disable MALI in kernel >>mali-modules.bb: MALI kernel module recipe >>machine-xilinx-default.inc: Add MALI kernel module Applied, see comment on the last patch. Thanks, Nathan >> >> conf/machine/include/machine-xilinx-default.inc| 1 + >> recipes-graphics/mali/mali-modules.bb | 35 >> + >> recipes-graphics/mali/mali-modules/Makefile.patch | 36 >> ++ >> .../bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.cfg | 1 + >> 4 files changed, 73 insertions(+) >> create mode 100644 recipes-graphics/mali/mali-modules.bb >> create mode 100644 recipes-graphics/mali/mali-modules/Makefile.patch >> > -- > ___ > 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
Re: [meta-xilinx] [meta-xilinx 3/3] machine-xilinx-default.inc: Add MALI kernel module
On Tue, May 17, 2016 at 7:48 AM, Manjukumar Mathawrote: > Enable adding the MALI kernel module to the image for ZynqMP machines > > Signed-off-by: Manjukumar Matha > --- > conf/machine/include/machine-xilinx-default.inc | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/conf/machine/include/machine-xilinx-default.inc > b/conf/machine/include/machine-xilinx-default.inc > index 1b41aa1..58f5890 100644 > --- a/conf/machine/include/machine-xilinx-default.inc > +++ b/conf/machine/include/machine-xilinx-default.inc > @@ -32,3 +32,4 @@ UBOOT_BINARY ?= "u-boot${UBOOT_OFEMBED}.${UBOOT_SUFFIX}" > UBOOT_ELF ?= "u-boot" > UBOOT_ELF_aarch64 ?= "u-boot.elf" > > +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_zynqmp += "kernel-module-mali-modules" Applied, but i changed your patch so that it appends via "_append_zynqmp" (so that it appends instead of overwriting). Thanks, Nathan > -- > 2.1.4 > > -- > ___ > 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
Re: [meta-xilinx] [PATCH 2/2] qemuzynmp: Add the qemuzynqmp machine
On Thu, Jun 16, 2016 at 4:50 AM, Alistair Franciswrote: > Add the qemuzynqmp machine based on the EP108 board. > > Signed-off-by: Alistair Francis > --- > conf/machine/ep108-zynqmp.conf | 2 ++ > conf/machine/qemuzynqmp.conf| 9 + > recipes-kernel/linux/linux-xlnx.inc | 4 +++- > 3 files changed, 14 insertions(+), 1 deletion(-) > create mode 100644 conf/machine/qemuzynqmp.conf > > diff --git a/conf/machine/ep108-zynqmp.conf b/conf/machine/ep108-zynqmp.conf > index 73a357f..17363ef 100644 > --- a/conf/machine/ep108-zynqmp.conf > +++ b/conf/machine/ep108-zynqmp.conf > @@ -21,3 +21,5 @@ UBOOT_ENTRYPOINT = "0x8" > > EXTRA_IMAGEDEPENDS += "arm-trusted-firmware" > > +QEMU_DTB = > "${KERNEL_IMAGETYPE}-${@os.path.splitext(os.path.basename(d.getVar("KERNEL_DEVICETREE",True)))[0]}" > + > diff --git a/conf/machine/qemuzynqmp.conf b/conf/machine/qemuzynqmp.conf > new file mode 100644 > index 000..5177b6c > --- /dev/null > +++ b/conf/machine/qemuzynqmp.conf > @@ -0,0 +1,9 @@ > +#@TYPE: Machine > +#@NAME: qemuzynqmp > +#@DESCRIPTION: Zynq UltraScale+ QEMU machine support ('xlnx-ep108' model) > + Please add the MACHINEOVERRIDES addition here so that any ep108 overrides that are done anywhere in this layer apply to this machine as well. MACHINEOVERRIDES =. "ep108-zynqmp:" > +require conf/machine/include/tune-zynqmp.inc > +require conf/machine/include/machine-xilinx-default.inc > +require conf/machine/include/machine-xilinx-board.inc These three are included in ep108-zynqmp.conf so no need to double include them. > +require conf/machine/ep108-zynqmp.conf > + > diff --git a/recipes-kernel/linux/linux-xlnx.inc > b/recipes-kernel/linux/linux-xlnx.inc > index c0c2bd5..92ecb2d 100644 > --- a/recipes-kernel/linux/linux-xlnx.inc > +++ b/recipes-kernel/linux/linux-xlnx.inc > @@ -19,6 +19,9 @@ require recipes-kernel/linux/linux-yocto.inc > > DESCRIPTION = "Xilinx Kernel" > > +KBUILD_DEFCONFIG_qemuzynqmp = "xilinx_zynqmp_defconfig" > +KCONFIG_MODE_qemuzynqmp = "--alldefconfig" This kernel config still has the kernel panic during boot where it attempts to call into PMU firmware. So leave this part out of this patch. If you manage to solve the issues with this kernel config and QEMU, create a separate patch that simply sets up the use of this kernel config for all zynqmp machines (just update the overrides that are there for _zcu102-zynqmp to be for _zynqmp). Regards, Nathan > + > require linux-xilinx-configs.inc > require linux-xilinx-machines.inc > > @@ -28,4 +31,3 @@ KCONFIG_MODE_zcu102-zynqmp = "--alldefconfig" > KERNEL_FEATURES_append = " bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc" > KERNEL_FEATURES_append_zynq = " bsp/xilinx/soc/linux-xlnx/drivers/zynq7.scc" > KERNEL_FEATURES_append_zynqmp = " > bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc" > - > -- > 2.7.4 > > -- > ___ > 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
Re: [meta-xilinx] [PATCH 1/2] recipes-zynqmp/qemu_2.6%: Disable EL3 for the A53s
On Thu, Jun 16, 2016 at 4:50 AM, Alistair Franciswrote: > The Xilinx kernel doesn't support having EL3 enabled and EL2 disabled. > As EL2 is not yet supported on mainline QEMU disable EL3 until we can > support a complete boot flow. > > Signed-off-by: Alistair Francis > --- > .../8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch | 29 > ++ > recipes-zynqmp/qemu/qemu_2.6%.bbappend | 8 ++ > 2 files changed, 37 insertions(+) > create mode 100644 > recipes-zynqmp/qemu/files/8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch > create mode 100644 recipes-zynqmp/qemu/qemu_2.6%.bbappend > > diff --git > a/recipes-zynqmp/qemu/files/8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch > b/recipes-zynqmp/qemu/files/8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch > new file mode 100644 > index 000..61a4f0a > --- /dev/null > +++ b/recipes-zynqmp/qemu/files/8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch > @@ -0,0 +1,29 @@ > +From 8fa2346723fb74e8220ac9f186dabc2f57e4cb43 Mon Sep 17 00:00:00 2001 > +From: Alistair Francis > +Date: Wed, 15 Jun 2016 10:39:55 -0700 > +Subject: [PATCH] target-arm: Disable EL3 on A53 > + > +The Xilinx kernel doesn't support having EL3 enabled and EL2 disabled. > +As EL2 is not yet supported on mainline QEMU disable EL3 until we can > +support a complete boot flow. > + > +Signed-off-by: Alistair Francis Missing the upstream-status info. Is the following correct? Upstream-Status: Inappropriate [workaround feature incompatibility] If so I can just add it to the patch when I merge it. Regards, Nathan > +--- > + target-arm/cpu64.c | 1 - > + 1 file changed, 1 deletion(-) > + > +diff --git a/target-arm/cpu64.c b/target-arm/cpu64.c > +index 1635deb..0896259 100644 > +--- a/target-arm/cpu64.c > b/target-arm/cpu64.c > +@@ -165,7 +165,6 @@ static void aarch64_a53_initfn(Object *obj) > + set_feature(>env, ARM_FEATURE_V8_SHA256); > + set_feature(>env, ARM_FEATURE_V8_PMULL); > + set_feature(>env, ARM_FEATURE_CRC); > +-set_feature(>env, ARM_FEATURE_EL3); > + cpu->kvm_target = QEMU_KVM_ARM_TARGET_CORTEX_A53; > + cpu->midr = 0x410fd034; > + cpu->revidr = 0x; > +-- > +2.7.4 > + > diff --git a/recipes-zynqmp/qemu/qemu_2.6%.bbappend > b/recipes-zynqmp/qemu/qemu_2.6%.bbappend > new file mode 100644 > index 000..074f6cf > --- /dev/null > +++ b/recipes-zynqmp/qemu/qemu_2.6%.bbappend > @@ -0,0 +1,8 @@ > + > +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" > + > +SRC_URI += " \ > + file://8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch > \ > + " > + > + > -- > 2.7.4 > > -- > ___ > 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
Re: [meta-xilinx] [PATCH 2/2] qemuzynmp: Add the qemuzynqmp machine
On Tue, Jun 21, 2016 at 4:59 AM, Alistair Francis <alistair.fran...@xilinx.com> wrote: > On Thu, Jun 16, 2016 at 4:36 AM, Nathan Rossi <nat...@nathanrossi.com> wrote: >> On Thu, Jun 16, 2016 at 4:50 AM, Alistair Francis >> <alistair.fran...@xilinx.com> wrote: >>> Add the qemuzynqmp machine based on the EP108 board. >>> >>> Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com> >>> --- >>> conf/machine/ep108-zynqmp.conf | 2 ++ >>> conf/machine/qemuzynqmp.conf| 9 + >>> recipes-kernel/linux/linux-xlnx.inc | 4 +++- >>> 3 files changed, 14 insertions(+), 1 deletion(-) >>> create mode 100644 conf/machine/qemuzynqmp.conf >>> >>> diff --git a/conf/machine/ep108-zynqmp.conf b/conf/machine/ep108-zynqmp.conf >>> index 73a357f..17363ef 100644 >>> --- a/conf/machine/ep108-zynqmp.conf >>> +++ b/conf/machine/ep108-zynqmp.conf >>> @@ -21,3 +21,5 @@ UBOOT_ENTRYPOINT = "0x8" >>> >>> EXTRA_IMAGEDEPENDS += "arm-trusted-firmware" >>> >>> +QEMU_DTB = >>> "${KERNEL_IMAGETYPE}-${@os.path.splitext(os.path.basename(d.getVar("KERNEL_DEVICETREE",True)))[0]}" >>> + >>> diff --git a/conf/machine/qemuzynqmp.conf b/conf/machine/qemuzynqmp.conf >>> new file mode 100644 >>> index 000..5177b6c >>> --- /dev/null >>> +++ b/conf/machine/qemuzynqmp.conf >>> @@ -0,0 +1,9 @@ >>> +#@TYPE: Machine >>> +#@NAME: qemuzynqmp >>> +#@DESCRIPTION: Zynq UltraScale+ QEMU machine support ('xlnx-ep108' model) >>> + >> >> Please add the MACHINEOVERRIDES addition here so that any ep108 >> overrides that are done anywhere in this layer apply to this machine >> as well. >> >> MACHINEOVERRIDES =. "ep108-zynqmp:" >> >>> +require conf/machine/include/tune-zynqmp.inc >>> +require conf/machine/include/machine-xilinx-default.inc >>> +require conf/machine/include/machine-xilinx-board.inc >> >> These three are included in ep108-zynqmp.conf so no need to double include >> them. > > I'll fix these two. > >> >>> +require conf/machine/ep108-zynqmp.conf >>> + >>> diff --git a/recipes-kernel/linux/linux-xlnx.inc >>> b/recipes-kernel/linux/linux-xlnx.inc >>> index c0c2bd5..92ecb2d 100644 >>> --- a/recipes-kernel/linux/linux-xlnx.inc >>> +++ b/recipes-kernel/linux/linux-xlnx.inc >>> @@ -19,6 +19,9 @@ require recipes-kernel/linux/linux-yocto.inc >>> >>> DESCRIPTION = "Xilinx Kernel" >>> >>> +KBUILD_DEFCONFIG_qemuzynqmp = "xilinx_zynqmp_defconfig" >>> +KCONFIG_MODE_qemuzynqmp = "--alldefconfig" >> >> This kernel config still has the kernel panic during boot where it >> attempts to call into PMU firmware. So leave this part out of this >> patch. > > I don't see any issues with this config on the current master. I can > boot to login without any panics. The ep108 machine defaults to linux-yocto. So to test the linux-xlnx, override the preferred_provider in local.conf: PREFERRED_PROVIDER_virtual/kernel = "linux-xlnx" Regards, Nathan > >> >> If you manage to solve the issues with this kernel config and QEMU, >> create a separate patch that simply sets up the use of this kernel >> config for all zynqmp machines (just update the overrides that are >> there for _zcu102-zynqmp to be for _zynqmp). > > Ok, I'll double check and send it out as a separate patch. > > Thanks, > > Alistair > >> >> Regards, >> Nathan >> >>> + >>> require linux-xilinx-configs.inc >>> require linux-xilinx-machines.inc >>> >>> @@ -28,4 +31,3 @@ KCONFIG_MODE_zcu102-zynqmp = "--alldefconfig" >>> KERNEL_FEATURES_append = " bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc" >>> KERNEL_FEATURES_append_zynq = " >>> bsp/xilinx/soc/linux-xlnx/drivers/zynq7.scc" >>> KERNEL_FEATURES_append_zynqmp = " >>> bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc" >>> - >>> -- >>> 2.7.4 >>> >>> -- >>> ___ >>> 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 mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 1/2] linux-yocto_4.4: Add bbappend to enable Xilinx machine support
Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- recipes-kernel/linux/linux-yocto_4.4.bbappend | 4 1 file changed, 4 insertions(+) create mode 100644 recipes-kernel/linux/linux-yocto_4.4.bbappend diff --git a/recipes-kernel/linux/linux-yocto_4.4.bbappend b/recipes-kernel/linux/linux-yocto_4.4.bbappend new file mode 100644 index 000..651e0d7 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto_4.4.bbappend @@ -0,0 +1,4 @@ + +require linux-xilinx-configs.inc +require linux-xilinx-machines.inc + -- 2.7.0.rc3 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 2/2] linux/configs: Update zynqmp.cfg for newer kernels
* Fix up GPIOLIB to enable GPIO driver support * Fix up USB configs Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- .../linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.cfg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.cfg index 3c50e48..ae562fa 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.cfg @@ -15,6 +15,7 @@ CONFIG_RTC_DRV_ZYNQMP=y CONFIG_MACB=y # GPIO +CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_ZYNQ=y @@ -42,8 +43,8 @@ CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_OF_ARASAN=y # USB +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y CONFIG_USB_DWC3=y -CONFIG_USB_DWC3_ULPI=y -CONFIG_USB_OTG=y CONFIG_USB_GADGET=y -- 2.7.0.rc3 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] u-boot Commit 81ec69066b270c62a6468662314728cc8b7008f9 breaks SPL
On Mon, Jan 18, 2016 at 8:43 PM, Mike Looijmans <mike.looijm...@topic.nl> wrote: > I just tried with current xilinx/master u-boot. > > QSPI support is still broken. > > This makes the current bootloader useless, we ALWAYS boot from QSPI. > > > Any news on this front? Anything we can do? Try u-boot mainline master, it has fixes for QSPI booting. I have it working well on the Zybo, but the fixes were not specific to that board. Regards, Nathan > > > On 23-11-15 11:43, Nathan Rossi wrote: >> >> On Fri, Nov 20, 2015 at 11:53 PM, Michal Simek <michal.si...@xilinx.com> >> wrote: >>> >>> On 20.11.2015 14:23, Philip Balister wrote: >>>> >>>> On 11/20/2015 04:31 AM, Michal Simek wrote: >>>>> >>>>> Hi Mike, >>>>> >>>>> SPL is officially unsupported flow that's why it is not tested and it >>>>> is >>>>> fixed only when developers have time to fix it. >> >> >> I've been focusing my efforts on upstream u-boot for Zynq and >> MicroBlaze, and Zynq SPL seems to be functional there. Note: there is >> a QSPI driver available upstream but I have not tested it myself. >> >>>> >>>> Any suggestions who we should talk to about getting unsupported things >>>> supported? I realize you are doing the best you can, but it is really >>>> annoying that really useful things like SPL do not receive the proper >>>> attention. >>> >>> >>> Marketing. >> >> >> Last I heard of 'Marketing' responsible for Linux/U-Boot it was in a >> tail spin, have you got a contact that Xilinx customers can correspond >> with on this area specifically? might be useful to get them looped in >> on this list or at least let them know of the discussions that are >> being had. >> >> Regards, >> Nathan >> >>> >>> Thanks, >>> Michal >>> >>> -- >>> > > Kind regards, > > Mike Looijmans > System Expert > > TOPIC Embedded Products > Eindhovenseweg 32-C, NL-5683 KH Best > Postbus 440, NL-5680 AK Best > Telefoon: +31 (0) 499 33 69 79 > E-mail: mike.looijm...@topicproducts.com > Website: www.topicproducts.com > > Please consider the environment before printing this e-mail > > > > > > ___ >>> >>> 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
Re: [meta-xilinx] mainline u-boot on zedboard
On Mon, Jan 18, 2016 at 9:35 PM, <gm...@reliableembeddedsystems.com> wrote: > Hi, > > On 2016-01-11 02:08, Nathan Rossi wrote: >> >> >> You will need to modify zynq-common.h to enable it. >> >> diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h >> index 0ab6083..a844062 100644 >> --- a/include/configs/zynq-common.h >> +++ b/include/configs/zynq-common.h >> @@ -199,6 +199,8 @@ >> #ifndef CONFIG_ENV_IS_NOWHERE >> # ifndef CONFIG_SYS_NO_FLASH >> # define CONFIG_ENV_IS_IN_FLASH >> +# elif defined(CONFIG_ZYNQ_QSPI) >> +# define CONFIG_ENV_IS_IN_SPI_FLASH >> # elif defined(CONFIG_SYS_NO_FLASH) >> # define CONFIG_ENV_IS_NOWHERE >> # endif >> >> This will use the QSPI flash if available for storing the environment. >> After this saveenv/etc. will work. I quickly tested on a Zybo (I don't >> have a Zedboard) and it works quite well albeit slowing the boot a bit >> (~1 second or so). > > > I tried this on a zedboard with v2016.01 and it "kind of worked". > What I mean is, it saved all my environment, but it looks like I need to set > modeboot for it to pick up my uenvcmd. > > => set modeboot 'uenvcmd' > => saveenv > Saving Environment to SPI Flash... > SF: Detected S25FL256S_64K with page size 256 Bytes, erase size 64 KiB, > total 32 MiB > Erasing SPI flash...Writing to SPI flash...done > => print modeboot > modeboot=uenvcmd > => boot > > works > > ... but .. > > after a reboot I noticed that modeboot did not keep the value I wanted which > most likely means that it was not poperly stored in the SPI flash: > > Hit any key to stop autoboot: 0 > => > => > => > => printe modeboot > modeboot=sdboot > => > > so I tried: > > => > => setenv bootcmd 'run uenvcmd' > => saveenv > Saving Environment to SPI Flash... > SF: Detected S25FL256S_64K with page size 256 Bytes, erase size 64 KiB, > total 32 MiB > Erasing SPI flash...Writing to SPI flash...done > => boot > > ... which did the trick for me ... > > Since I guess you want to choose between norboot/sdboot/jtagboot/usbboot via > the modeboot variable you might want to check why it's not saved in the SPI > flash. modeboot is a special environment variable that the zynq 'board_late_init' function sets based on the SLCR status. It is set after the environment is loaded so its impossible to override via the saved environment itself. But as you discovered 'bootcmd' is the actual command that u-boot runs automatically. Regards, Nathan > > Regards, > > Robert > -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH 0/5] Updates to u-boot-xlnx
On Sat, Jan 16, 2016 at 4:19 AM, andreywrote: > Hello Nathan, > > We are now starting production of our Zynq-based product and are trying to > update a 2-year old software to the current state of Yocto. We do not use > Vivado to manage the project, for the FPGA development we use alternative > Eclipse-based integration that remotely launches specific Vivado tools. We > had to replace some of the Xilinx primitives models (such as > https://github.com/Elphel/gtxe2_gpl ) to be able to simulate the complete > project (it is now above 80% utilization) with the GPL-ed tools > (Icarus+GTKWave). In 2013 we made a replacement for Xilinx FSBL that at > that time was violating the GNU GPL of the U-Boot. Later Xilinx had to > comply with GPL and modified the license for the generated files, but we > would still like to avoid Vivado for FSBL generation - it is extra work for > us and is inconvenient to learn new GUI, re-enter the project data just to > be able to generate boot loader. It was you guys that got the ball rolling for the ps7_init_gpl files, thanks for that :). At the moment I do not think it is possible to completely avoid Vivado for generating SPL/FSBL. Essentially the way that the upstream U-Boot handles the FSBL equivalent parts is by relying on the ps7_init_gpl.[ch] files that Vivado generates from a Zynq design. For some specific boards the ps7_init files are in the U-Boot source repo, this is what allows for generating those bootloaders without needing Vivado. I suppose if you changed nothing on the PS you could do the same for your board, have static ps7_init_gpl files stored in your source control. Although keep in mind that it is only the Zynq configuration that is needed by Vivado to generate the ps7_init files, so it might be possible to write a tcl script of some such to automate Vivado to generate the ps7_init files without needing to have your actual design in Vivado. > > The question is - does the current upstream U-Boot have all what is needed > to create an alternative bootloader for Zynq (by updating our > https://github.com/Elphel/meta-ezynq ) or there are still some important > functionality (common to all boards, not specific to particular ones and/or > Vivado releases) in u-boot-xlnx that is not yet in available in the > upstream? Apart from the ps7_init stuff, everything else is pretty much there in U-Boot to have SPL start in local ram, call ps7_init and then load the full U-Boot from any device (or 'falcon' boot the kernel directly). However my understanding is that ezynq doesn't need the ps7_init files from Vivado, and has its own configuration/setup for those values. I imagine if there is nothing against updating the ezynq codebase to be a replacement for the ps7_init code?, it would be a great way to go if the Vivado route is not reasonable. I have always been curious as to how much of the early register setup could be done by U-Boot itself as well as additional device tree properties at different levels (U-Boot/Kernel) via e.g. pinmuxing. Unfortunately since ps7_init files got GPL'd that has been the easiest solution. Regards, Nathan > > Andrey Filippov > > > -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] mainline u-boot on zedboard
On Wed, Jan 13, 2016 at 4:17 AM, <gm...@reliableembeddedsystems.com> wrote: > Hi, > > On 2016-01-11 02:08, Nathan Rossi wrote: >> >> uEnv.txt is something that is only in u-boot-xlnx. I do not believe it >> will make an appearance as the default environment in mainline, this >> is because the FIT format is much more complete and relies less on >> magic environment configuration. In the future I was intending on >> having meta-xilinx generate fit images (using wic) which would include >> the main image components in a single binary and u-boot would just >> load the default configuration. > > > You mean that everything like kernel/fdt/fpga.bin/rootfs would be part of > the fit image? Yes, although not everything needs to be, aka if you are using a SD rootfs the rootfs would not be part of the fit image. Or if you are managing the fpga bitstream from kernel/userspace it likely would not be in the fit image. > > How would you be able to support a setup where kernel/fdt/fpga.bin are > loaded from tftp and the rootfs from nfs with a mainline u-boot then? Assuming by rootfs from nfs your are referring to a NFS root (in which the kernel handles mounting the NFS during boot). The kernel, dtb and fpga bitstream would be stored in the fit image, since TFTP is not a default boot mechanism U-Boot would need to be setup via environment to load from TFTP (which at the moment would be setting modeboot=jtagboot). Alternatively there might be a way to take advantage of embedding scripts into the fit image to handle custom boot sequences without needing to change the environment. Regards, Nathan > > This is my (and most likely not only my) preferred development setup for all > the boards I have lying around. Like this it's very easy to access my boards > remotely and change everything (except for the boot loader) without needing > manual intervention if I screw up things;) > >> >> As for saveenv and general environment stored in flash support. The >> QSPI driver was only added to mainline u-boot within the past few >> months as such the surrounding setup still has to be completed. >> >> You will need to modify zynq-common.h to enable it. >> >> diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h >> index 0ab6083..a844062 100644 >> --- a/include/configs/zynq-common.h >> +++ b/include/configs/zynq-common.h >> @@ -199,6 +199,8 @@ >> #ifndef CONFIG_ENV_IS_NOWHERE >> # ifndef CONFIG_SYS_NO_FLASH >> # define CONFIG_ENV_IS_IN_FLASH >> +# elif defined(CONFIG_ZYNQ_QSPI) >> +# define CONFIG_ENV_IS_IN_SPI_FLASH >> # elif defined(CONFIG_SYS_NO_FLASH) >> # define CONFIG_ENV_IS_NOWHERE >> # endif >> >> This will use the QSPI flash if available for storing the environment. >> After this saveenv/etc. will work. I quickly tested on a Zybo (I don't >> have a Zedboard) and it works quite well albeit slowing the boot a bit >> (~1 second or so). > > > I would not mind about that. > > Unfortunately I am currently on the road and my Zedboard is not yet in my > lab (where you or me could access it remotely). Hopefully next week I'll > have some time and play with it. > > Regards, > > Robert > -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH] gcc-source_5.3: Fix MicroBlaze musl libc support
On Wed, Jan 6, 2016 at 11:21 PM, Nathan Rossi <nat...@nathanrossi.com> wrote: > Backport the patch from GCC to handle musl libc for MicroBlaze, this > patch sets up the correct path for ld. Applied. Regards, Nathan > > Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> > --- > .../gcc/files/microblaze-musl-support.patch| 44 > ++ > recipes-microblaze/gcc/gcc-source_5.3.bbappend | 1 + > 2 files changed, 45 insertions(+) > create mode 100644 recipes-microblaze/gcc/files/microblaze-musl-support.patch > > diff --git a/recipes-microblaze/gcc/files/microblaze-musl-support.patch > b/recipes-microblaze/gcc/files/microblaze-musl-support.patch > new file mode 100644 > index 000..08370c1 > --- /dev/null > +++ b/recipes-microblaze/gcc/files/microblaze-musl-support.patch > @@ -0,0 +1,44 @@ > +From: nsz <nsz@138bc75d-0d04-0410-961f-82ee72b054a4> > +Date: Thu, 15 Oct 2015 19:12:15 + > +Subject: [PATCH] microblaze musl support > + > + * config/microblaze/linux.h (MUSL_DYNAMIC_LINKER): Define. > + (DYNAMIC_LINKER): Renamed to ... > + (GLIBC_DYNAMIC_LINKER): This. > + (SUBTARGET_EXTRA_SPECS): Use GNU_USER_DYNAMIC_LINKER. > + > +Upstream-Status: Backport > +--- > + gcc/config/microblaze/linux.h | 14 -- > + 1 file changed, 12 insertions(+), 2 deletions(-) > + > +diff --git a/gcc/config/microblaze/linux.h b/gcc/config/microblaze/linux.h > +index 655a70f..a8a3f3e 100644 > +--- a/gcc/config/microblaze/linux.h > b/gcc/config/microblaze/linux.h > +@@ -28,10 +28,20 @@ > + #undef TLS_NEEDS_GOT > + #define TLS_NEEDS_GOT 1 > + > +-#define DYNAMIC_LINKER "/lib/ld.so.1" > ++#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" > ++ > ++#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */ > ++#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:;:el}" > ++#else > ++#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:el}" > ++#endif > ++ > ++#undef MUSL_DYNAMIC_LINKER > ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E > ".so.1" > ++ > + #undef SUBTARGET_EXTRA_SPECS > + #define SUBTARGET_EXTRA_SPECS \ > +- { "dynamic_linker", DYNAMIC_LINKER } > ++ { "dynamic_linker", GNU_USER_DYNAMIC_LINKER } > + > + #undef LINK_SPEC > + #define LINK_SPEC "%{shared:-shared} \ > +-- > +2.6.4 > + > diff --git a/recipes-microblaze/gcc/gcc-source_5.3.bbappend > b/recipes-microblaze/gcc/gcc-source_5.3.bbappend > index 50075f0..63681d1 100644 > --- a/recipes-microblaze/gcc/gcc-source_5.3.bbappend > +++ b/recipes-microblaze/gcc/gcc-source_5.3.bbappend > @@ -3,5 +3,6 @@ > FILESEXTRAPATHS_append := "${THISDIR}/files:" > SRC_URI_append = " \ > > file://microblaze.md-Improve-adddi3-and-subdi3-insn-definit.patch \ > + file://microblaze-musl-support.patch \ > " > > -- > 2.6.4 > -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] Build fitImage for Zynq zc706
On Thu, Jan 14, 2016 at 8:00 PM, Maciej Sobkowskiwrote: > Hi, > > I am failing to configure meta-xilinx to produce image in fitImage > format. I want image for ZYNQ zc706. I did following change: > > diff --git a/conf/machine/include/tune-zynq.inc > b/conf/machine/include/tune-zynq.inc > index 6ecfe89..705b0a5 100644 > --- a/conf/machine/include/tune-zynq.inc > +++ b/conf/machine/include/tune-zynq.inc > @@ -5,8 +5,8 @@ require conf/machine/include/tune-cortexa9.inc > require conf/machine/include/soc-family.inc > > # Linux Configuration > -KERNEL_IMAGETYPE ?= "uImage" > - > +KERNEL_CLASSES += "kernel-fitimage" > +KERNEL_IMAGETYPE = "fitImage" > # Set default load address. > # Override with KERNEL_EXTRA_ARGS_ += "..." in machine file if > required > KERNEL_EXTRA_ARGS_zynq += "UIMAGE_LOADADDR=0x8000" > > But after rebuilding core-image-minimal, I get following error: > > ERROR: Unbuildable tasks were found. These are usually caused by > circular dependencies and any circular dependency chains found will be > printed below. Increase the debug level to see a list of unbuildable > tasks. > > I pasted found dependency loops to pastebin, due to large size of > output: http://pastebin.com/raw/piraEyD9 > > Do I have an error in configuration? I tried using the fitimage class by setting just the these variables in local.conf: KERNEL_CLASSES += "kernel-fitimage" KERNEL_IMAGETYPE = "fitImage" I did not see any task dependency issues and got a fitimage result. However as soon as I tried to get it to embed the rootfs with the "INITRAMFS_IMAGE = "core-image-minimal"" setup it hit the errors you see. I suspect this is a bug with the class and how the task dependencies are setup (since there is a loop). Looking at the kernel-fitimage.bbclass it appears as though this was never intended to work since the do_assemble_fitimage is put between the install and compile tasks of the kernel but the rootfs image depends on a compiled and installed kernel, aka circular task dependencies. You might have to create the fit image outside of the kernel recipe manually, for reference that kernel-fitimage.bbclass will generate a .its in the deploy directory that you can use as a reference. Regards, Nathan > > -- > Maciej Sobkowski > -- > ___ > 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
Re: [meta-xilinx] u-boot Commit 81ec69066b270c62a6468662314728cc8b7008f9 breaks SPL
On Tue, Jan 19, 2016 at 7:05 PM, Michal Simek <michal.si...@xilinx.com> wrote: > On 19.1.2016 09:07, Mike Looijmans wrote: >> On 19-01-16 08:46, Michal Simek wrote: >>> On 18.1.2016 13:59, Mike Looijmans wrote: >>>> On 18-01-16 13:51, Nathan Rossi wrote: >>>>> On Mon, Jan 18, 2016 at 9:45 PM, Mike Looijmans >>>>> <mike.looijm...@topic.nl> wrote: >>>>>> On 18-01-16 11:59, Nathan Rossi wrote: >>>>>>> >>>>>>> On Mon, Jan 18, 2016 at 8:43 PM, Mike Looijmans >>>>>>> <mike.looijm...@topic.nl> >>>>>>> wrote: >>>>>>>> >>>>>>>> I just tried with current xilinx/master u-boot. >>>>>>>> >>>>>>>> QSPI support is still broken. >>>>>>>> >>>>>>>> This makes the current bootloader useless, we ALWAYS boot from QSPI. >>>>>>>> >>>>>>>> >>>>>>>> Any news on this front? Anything we can do? >>>>>>> >>>>>>> >>>>>>> Try u-boot mainline master, it has fixes for QSPI booting. I have it >>>>>>> working well on the Zybo, but the fixes were not specific to that >>>>>>> board. >>>>>> >>>>>> >>>>>> That's what I did. QSPI works, but it's broken in SPL. >>>>>> >>>>>> So you can boot from SD and access the QSPI flash, but you cannot >>>>>> boot from >>>>>> QSPI flash. >>>>> >>>>> Ok, so I am a little confused, is it that SPL does not boot when using >>>>> QSPI (aka SPL never starts)? or is the issue that QSPI does not work >>>>> from within SPL aka it fails to load the image(s) from the flash? >>>> >>>> The latter. It loads the SPL code, and then bails out with "invalid boot >>>> mode" because it cannot read the QSPI from within the SPL. >>>> >>>>> Also which board are you using out of curiosity? >>>> >>>> topic-miami >>>> >>>> It's not in your list, but the QSPI is connected in the same way as the >>>> Zed. >>>> >>>>> you wouldn't happen >>>>> to be using the zedboard? I just noticed that it is missing the >>>>> u-boot,dm-pre-reloc for the qspi node in the device tree in u-boot, >>>>> which is needed (see >>>>> http://git.denx.de/?p=u-boot.git;a=blob;f=arch/arm/dts/zynq-zybo.dts;h=fbbb8911910bcd1905f60811aa582966f16b3133;hb=HEAD >>>>> >>>>> >>>>> vs >>>>> http://git.denx.de/?p=u-boot.git;a=blob;f=arch/arm/dts/zynq-zed.dts;h=5ec59e2b4c6fdcf5deec58bd4d04effa2c094704;hb=HEAD). >>>>> >>>>> >>>> >>>> Ah, wait... You're talking about u-boot from denx.de. I didn't know that >>>> the Xilinx code had already merged into that. I was looking at the >>>> u-boot-xlnx repository. >>>> >>>> In that case, no I haven't tried current master yet. Will do. >>>> >>>> I might want to put some effort into mainlining our u-boot code for the >>>> board then. >>> >>> Xilinx tree is not that far from mainline. >>> >> >> Okay, just to get things clear: >> >> >> SHOULD u-boot SPL be able to boot from QSPI with current master on the >> u-boot-xlnx repo? In other words, does it work with other boards? >> >> >> I mean, is there something that I missed in my code and should I fix it >> myself, of is the SPL support for QSPI still broken as it was after the >> aforementioned commit? >> > > I don't think it is working. But it should work when I push upgrade to > 2016.01 Note though that 2016.01 does not include the SPL_DM_ALIAS patches which are needed for QSPI flash. http://git.denx.de/?p=u-boot.git;a=commit;h=4f627c5a59f4f69df156c199d6238849f26fe9af http://git.denx.de/?p=u-boot.git;a=commit;h=5c9b1d735ea782c2d0ad97496d74cb1fdd27c2d9 Regards, Nathan > > Thanks, > Michal > > -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] u-boot Commit 81ec69066b270c62a6468662314728cc8b7008f9 breaks SPL
On Sat, Feb 6, 2016 at 7:25 AM, Moritz Fischer <moritz.fisc...@ettus.com> wrote: > Hi Nathan, > > On Mon, Jan 18, 2016 at 2:59 AM, Nathan Rossi <nat...@nathanrossi.com> wrote: >> On Mon, Jan 18, 2016 at 8:43 PM, Mike Looijmans <mike.looijm...@topic.nl> >> wrote: >>> I just tried with current xilinx/master u-boot. >>> >>> QSPI support is still broken. >>> >>> This makes the current bootloader useless, we ALWAYS boot from QSPI. >>> >>> >>> Any news on this front? Anything we can do? >> >> Try u-boot mainline master, it has fixes for QSPI booting. I have it >> working well on the Zybo, but the fixes were not specific to that >> board. > > So I built off of master (94985cc9d3d7ed991ca8b2627d5894df5ea68f49) > added the u-boot,dm-pre-reloc to the dts for the qspi node. > > I then boot off of mmc which works fine (on zedboard). Do you have any > pointers > as to which address I have to write my u-boot-dtb.img and boot.bin to > from u-boot > to boot from qspi (on zedboard?). boot.bin is always at 0x0, since it is loaded by the BootROM. As for the u-boot-dtb.img, that is loaded from whatever "CONFIG_SYS_SPI_U_BOOT_OFFS" is set to. It's defined in zynq-common.h as 0x10 by default. http://git.denx.de/?p=u-boot.git;a=blob;f=include/configs/zynq-common.h;h=e8c3ef0c387222ad0c507a90451bd09ae68d058c;hb=HEAD#l350 Regards, Nathan > > I tried to follow: http://www.wiki.xilinx.com/U-Boot+Secondary+Program+Loader > > I also tried to adapt sizes to fit my file sizes, with no luck. > > Thanks, > > Moritz -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 05/12] kc705-trd-microblazeel: Move device tree to device-tree recipe
* Move the device tree into the source files directory for the device-tree recipe * Use non-immediate set for MACHINE_DEVICETREE Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- .../boards/kc705/kc705-trd-microblazeel.dts| 526 - conf/machine/kc705-trd-microblazeel.conf | 2 +- .../files/kc705/kc705-trd-microblazeel.dts | 526 + 3 files changed, 527 insertions(+), 527 deletions(-) delete mode 100644 conf/machine/boards/kc705/kc705-trd-microblazeel.dts create mode 100644 recipes-bsp/device-tree/files/kc705/kc705-trd-microblazeel.dts diff --git a/conf/machine/boards/kc705/kc705-trd-microblazeel.dts b/conf/machine/boards/kc705/kc705-trd-microblazeel.dts deleted file mode 100644 index c087433..000 --- a/conf/machine/boards/kc705/kc705-trd-microblazeel.dts +++ /dev/null @@ -1,526 +0,0 @@ -/dts-v1/; -/ { - #address-cells = <1>; - #size-cells = <1>; - compatible = "xlnx,microblaze"; - model = "Xilinx-KC705-TRD"; - ddr3_sdram: memory@8000 { - device_type = "memory"; - reg = < 0x8000 0x4000 >; - } ; - aliases { - ethernet0 = _ethernet_mac; - serial0 = _uart_1; - } ; - chosen { - bootargs = "console=ttyS0,115200 root=/dev/ram rw udev.children-max=1"; - linux,stdout-path = "/axi@2/serial@4040"; - } ; - cpus { - #address-cells = <1>; - #cpus = <0x1>; - #size-cells = <0>; - microblaze_0: cpu@0 { - bus-handle = <_mm_mb>, <_0>, <_0>; - clock-frequency = <15000>; - clocks = <_cpu>; - compatible = "xlnx,microblaze-8.50.a"; - d-cache-baseaddr = <0x8000>; - d-cache-highaddr = <0x>; - d-cache-line-size = <0x20>; - d-cache-size = <0x2000>; - device_type = "cpu"; - i-cache-baseaddr = <0x8000>; - i-cache-highaddr = <0x>; - i-cache-line-size = <0x20>; - i-cache-size = <0x2000>; - model = "microblaze,8.50.a"; - reg = <0>; - timebase-frequency = <15000>; - xlnx,addr-tag-bits = <0x12>; - xlnx,allow-dcache-wr = <0x1>; - xlnx,allow-icache-wr = <0x1>; - xlnx,area-optimized = <0x0>; - xlnx,avoid-primitives = <0x0>; - xlnx,base-vectors = <0x0>; - xlnx,branch-target-cache-size = <0x0>; - xlnx,cache-byte-size = <0x2000>; - xlnx,d-axi = <0x1>; - xlnx,d-lmb = <0x1>; - xlnx,d-plb = <0x0>; - xlnx,data-size = <0x20>; - xlnx,dcache-addr-tag = <0x12>; - xlnx,dcache-always-used = <0x1>; - xlnx,dcache-byte-size = <0x2000>; - xlnx,dcache-data-width = <0x0>; - xlnx,dcache-force-tag-lutram = <0x1>; - xlnx,dcache-interface = <0x0>; - xlnx,dcache-line-len = <0x8>; - xlnx,dcache-use-fsl = <0x0>; - xlnx,dcache-use-writeback = <0x0>; - xlnx,dcache-victims = <0x0>; - xlnx,debug-enabled = <0x1>; - xlnx,div-zero-exception = <0x0>; - xlnx,dynamic-bus-sizing = <0x1>; - xlnx,ecc-use-ce-exception = <0x0>; - xlnx,edge-is-positive = <0x1>; - xlnx,endianness = <0x1>; - xlnx,family = "kintex7"; - xlnx,fault-tolerant = <0x0>; - xlnx,fpu-exception = <0x0>; - xlnx,freq = <0x8f0d180>; - xlnx,fsl-data-size = <0x20>; - xlnx,fsl-exception = <0x0>; - xlnx,fsl-links = <0x0>; - xlnx,i-axi = <0x0>; - xlnx,i-lmb = <0x1>; - xlnx,i-plb = <0x0>; - xlnx,icache-always-used = <0x1>; - xlnx,ica
[meta-xilinx] [PATCH 03/12] qemuzynq: Rework device tree to use kernel source include
* Rework the qemuzynq.dts device tree to use the kernel source include 'zynq-7000.dtsi' * Store the new device tree in the device-tree recipe directory Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- conf/machine/qemuzynq.conf | 5 +- recipes-bsp/device-tree/files/qemu/qemuzynq.dts | 87 + 2 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 recipes-bsp/device-tree/files/qemu/qemuzynq.dts diff --git a/conf/machine/qemuzynq.conf b/conf/machine/qemuzynq.conf index 1391439..5c62256 100644 --- a/conf/machine/qemuzynq.conf +++ b/conf/machine/qemuzynq.conf @@ -11,10 +11,7 @@ EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" SERIAL_CONSOLE = "115200 ttyPS0" -MACHINE_DEVICETREE := " \ - qemu/qemuzynq.dts \ - qemu/qemuzynq-base.dtsi \ - " +MACHINE_DEVICETREE = "qemu/qemuzynq.dts" # Use the networking setup from qemuarm FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm" diff --git a/recipes-bsp/device-tree/files/qemu/qemuzynq.dts b/recipes-bsp/device-tree/files/qemu/qemuzynq.dts new file mode 100644 index 000..5b242c5 --- /dev/null +++ b/recipes-bsp/device-tree/files/qemu/qemuzynq.dts @@ -0,0 +1,87 @@ +/dts-v1/; +/include/ "zynq-7000.dtsi" + +/ { + model = "Zynq A9 QEMU"; + compatible = "qemu,xilinx-zynq-a9", "xlnx,zynq-7000"; + + aliases { + ethernet0 = + serial0 = + }; + + memory { + device_type = "memory"; + reg = <0x0 0x4000>; + }; + + chosen { + bootargs = "earlyprintk"; + stdout-path = "serial0:115200n8"; + }; +}; + + { + /* Setup a fixed 25 MHz clock (100Mbps) to trick the ethernet driver */ + fixednetclk: clock { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <2500>; + }; + + /* empty defintion for kernels that don't have qspi node */ + qspi: spi@e000d000 { }; +}; + + { + status = "okay"; + clocks = < 30>, < 30>, <>, <>, < 30>; + phy-mode = "rgmii-id"; + phy-handle = <_phy>; + + ethernet_phy: ethernet-phy@23 { + device_type = "ethernet-phy"; + reg = <23>; + }; +}; + + { + status = "okay"; +}; + + { + status = "okay"; +}; + + { + status = "okay"; + is-dual = <1>; + primary_flash: ps7-qspi@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "st,m25p80"; + reg = <0x0>; + spi-max-frequency = <5000>; + partition@0x { + label = "boot"; + reg = <0x 0x0050>; + }; + partition@0x0050 { + label = "bootenv"; + reg = <0x0050 0x0002>; + }; + partition@0x0052 { + label = "config"; + reg = <0x0052 0x0002>; + }; + partition@0x0054 { + label = "image"; + reg = <0x0054 0x00a8>; + }; + partition@0x00fc { + label = "spare"; + reg = <0x00fc 0x>; + }; + }; +}; + -- 2.7.0 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 08/12] zc702-zynq7: Switch over to in kernel device tree
* Switch to the device tree that is available in the kernel source tree * Remove the in layer device tree and configuration for the in layer device tree * Setup IMAGE_BOOT_FILES with the correct target device tree from the kernel source/recipe * Setup U-Boot uEnv.txt to use the correct target device tree Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- conf/machine/boards/zc702/zc702-zynq7-board.dtsi | 149 - conf/machine/boards/zc702/zc702-zynq7.dts | 5 - conf/machine/zc702-zynq7.conf | 10 +- .../u-boot/u-boot-xlnx/zc702-zynq7/uEnv.txt| 2 +- 4 files changed, 4 insertions(+), 162 deletions(-) delete mode 100644 conf/machine/boards/zc702/zc702-zynq7-board.dtsi delete mode 100644 conf/machine/boards/zc702/zc702-zynq7.dts diff --git a/conf/machine/boards/zc702/zc702-zynq7-board.dtsi b/conf/machine/boards/zc702/zc702-zynq7-board.dtsi deleted file mode 100644 index 686aa9f..000 --- a/conf/machine/boards/zc702/zc702-zynq7-board.dtsi +++ /dev/null @@ -1,149 +0,0 @@ -/* - * ZC702 DTS file header for generic boot. - */ - -/ { - model = "Xilinx ZC702"; - chosen { - bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/ram rw"; - linux,stdout-path = "/amba@0/serial@e0001000"; - } ; - ps7_ddr_0: memory@0 { - device_type = "memory"; - reg = <0x0 0x4000>; - } ; - ps7_axi_interconnect_0: amba@0 { - ps7_ethernet_0: ps7-ethernet@e000b000 { - phy-handle = <>; - phy-mode = "rgmii-id"; - phy0: phy@7 { - compatible = "marvell,88e1116r"; - device_type = "ethernet-phy"; - reg = <7>; - } ; - } ; - ps7_qspi_0: ps7-qspi@e000d000 { - flash@0 { - compatible = "micron,n25q128a11", "jedec,spi-nor"; - reg = <0x0>; - spi-tx-bus-width = <1>; - spi-rx-bus-width = <4>; - spi-max-frequency = <5000>; - #address-cells = <1>; - #size-cells = <1>; - partition@qspi-fsbl-uboot { - label = "qspi-fsbl-uboot"; - reg = <0x0 0x10>; - }; - partition@qspi-linux { - label = "qspi-linux"; - reg = <0x10 0x50>; - }; - partition@qspi-device-tree { - label = "qspi-device-tree"; - reg = <0x60 0x2>; - }; - partition@qspi-rootfs { - label = "qspi-rootfs"; - reg = <0x62 0x5E>; - }; - partition@qspi-bitstream { - label = "qspi-bitstream"; - reg = <0xC0 0x40>; - }; - }; - } ; - ps7_i2c_0: ps7-i2c@e0004000 { - /* I2C Switch */ - i2cswitch@74 { - compatible = "nxp,pca9548"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x74>; - - i2c@0 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0>; - osc@5d { - #clock-cells = <0>; - compatible = "silabs,si570"; - temperature-stability = <50>; - reg = <0x5d>; - factory-fout = <15625>; - initial-fout = <14850>; - }; - }; - -
[meta-xilinx] [PATCH 07/12] picozed-zynq7: Rework device tree to use kernel source include
* Rework the picozed-zynq7.dts device tree to use the kernel source include 'zynq-7000.dtsi' * Store the new device tree in the device-tree recipe directory * Remove existing device tree from conf/machine/boards Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- .../boards/picozed/picozed-zynq7-board.dtsi| 76 --- conf/machine/boards/picozed/picozed-zynq7.dts | 5 - conf/machine/picozed-zynq7.conf| 7 +- .../device-tree/files/picozed/picozed-zynq7.dts| 102 + 4 files changed, 104 insertions(+), 86 deletions(-) delete mode 100644 conf/machine/boards/picozed/picozed-zynq7-board.dtsi delete mode 100644 conf/machine/boards/picozed/picozed-zynq7.dts create mode 100644 recipes-bsp/device-tree/files/picozed/picozed-zynq7.dts diff --git a/conf/machine/boards/picozed/picozed-zynq7-board.dtsi b/conf/machine/boards/picozed/picozed-zynq7-board.dtsi deleted file mode 100644 index 19d5052..000 --- a/conf/machine/boards/picozed/picozed-zynq7-board.dtsi +++ /dev/null @@ -1,76 +0,0 @@ -/ { - model = "Avnet picoZed"; - chosen { - bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/ram rw"; - linux,stdout-path = "/axi@0/serial@e0001000"; - } ; - ps7_ddr_0: memory@0 { - device_type = "memory"; - reg = <0x0 0x4000>; - } ; - ps7_axi_interconnect_0: amba@0 { - ps7_ethernet_0: ps7-ethernet@e000b000 { - phy-handle = <>; - phy-mode = "rgmii-id"; - phy0: phy@0 { - compatible = "marvell,88e1512"; - device_type = "ethernet-phy"; - reg = <0>; - } ; - } ; - ps7_qspi_0: ps7-qspi@e000d000 { - flash@0 { - compatible = "micron,m25p80", "spansion,s25fl128s", "jedec,spi-nor"; - reg = <0x0>; - spi-max-frequency = <5000>; - #address-cells = <1>; - #size-cells = <1>; - partition@qspi-fsbl-uboot { - label = "qspi-fsbl-uboot"; - reg = <0x0 0x10>; - }; - partition@qspi-linux { - label = "qspi-linux"; - reg = <0x10 0x50>; - }; - partition@qspi-device-tree { - label = "qspi-device-tree"; - reg = <0x60 0x2>; - }; - partition@qspi-rootfs { - label = "qspi-rootfs"; - reg = <0x62 0x5E>; - }; - partition@qspi-bitstream { - label = "qspi-bitstream"; - reg = <0xC0 0x40>; - }; - }; - } ; - ps7_usb_0: ps7-usb@e0002000 { - xlnx,phy-reset-gpio = <_gpio_0 7 0>; /* MIO USB PHY Reset */ - usb-phy = <_phy>; - } ; - ps7_sd_1: ps7-sdio@e0101000 { - /* The SD1 interface is connected to the non-removable eMMC */ - non-removable; - } ; - - /* Disabled Devices */ - ps7_sd_0: ps7-sdio@e010 { compatible = "invalid"; }; - ps7_uart_0: serial@e000 { compatible = "invalid"; }; - ps7_ethernet_1: ps7-ethernet@e000c000 { compatible = "invalid"; }; - ps7_i2c_0: ps7-i2c@e0004000 { compatible = "invalid"; }; - ps7_i2c_1: ps7-i2c@e0005000 { compatible = "invalid"; }; - ps7_wdt_0: ps7-wdt@f8005000 { compatible = "invalid"; }; - ps7_can_0: ps7-can@e0008000 { compatible = "invalid"; }; - ps7_can_1: ps7-can@e0009000 { compatible = "invalid"; }; - ps7_usb_1: ps7-usb@e0003000 { compatible = "invalid"; }; - } ; - - usb0_phy: usb-phy { - #phy-cells = <0>; - compatible = "usb-nop-xceiv"; -
[meta-xilinx] [PATCH 01/12] device-tree.bb: Add support to use kernel source tree includes
* Add support to use the base platform includes directly from the currently selected kernel source tree * Setup 'zynq-7000.dtsi' as default for 'zynq' targets * Setup 'zynqmp.dtsi' as default for 'zynqmp' targets * Remove use of awk, use basename -s instead Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- recipes-bsp/device-tree/device-tree.bb | 27 +++ 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/recipes-bsp/device-tree/device-tree.bb b/recipes-bsp/device-tree/device-tree.bb index 3cd6b26..6332e9c 100644 --- a/recipes-bsp/device-tree/device-tree.bb +++ b/recipes-bsp/device-tree/device-tree.bb @@ -15,7 +15,26 @@ DEVICETREE_FLAGS ?= "-R 8 -p 0x3000" S = "${WORKDIR}" +KERNEL_DTS_INCLUDE ??= "" +KERNEL_DTS_INCLUDE_zynq = "arch/arm/boot/dts/skeleton.dtsi arch/arm/boot/dts/zynq-7000.dtsi" +KERNEL_DTS_INCLUDE_zynqmp = "arch/arm/boot/dts/skeleton.dtsi arch/arm64/boot/dts/xilinx/zynqmp.dtsi" + +python () { +# auto add dependency on kernel tree +if d.getVar("KERNEL_DTS_INCLUDE", True) != "": +d.setVarFlag("do_compile", "depends", +" ".join([d.getVarFlag("do_compile", "depends", True) or "", "virtual/kernel:do_shared_workdir"])) +} + do_compile() { + for i in ${KERNEL_DTS_INCLUDE}; do + DTSI_NAME=`basename $i` + if test -e ${STAGING_KERNEL_DIR}/$i; then + mkdir -p ${WORKDIR}/devicetree + cp ${STAGING_KERNEL_DIR}/$i ${WORKDIR}/devicetree/${DTSI_NAME} + fi + done + if test -n "${MACHINE_DEVICETREE}"; then mkdir -p ${WORKDIR}/devicetree for i in ${MACHINE_DEVICETREE}; do @@ -27,7 +46,7 @@ do_compile() { fi for DTS_FILE in ${DEVICETREE}; do - DTS_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'` + DTS_NAME=`basename -s .dts ${DTS_FILE}` dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DTS_NAME}.dtb ${DTS_FILE} done } @@ -38,7 +57,7 @@ do_install() { echo "Warning: ${DTS_FILE} is not available!" continue fi - DTS_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'` + DTS_NAME=`basename -s .dts ${DTS_FILE}` install -d ${D}/boot/devicetree install -m 0644 ${B}/${DTS_NAME}.dtb ${D}/boot/devicetree/${DTS_NAME}.dtb done @@ -50,7 +69,7 @@ do_deploy() { echo "Warning: ${DTS_FILE} is not available!" continue fi - DTS_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'` + DTS_NAME=`basename -s .dts ${DTS_FILE}` install -d ${DEPLOY_DIR_IMAGE} install -m 0644 ${B}/${DTS_NAME}.dtb ${DEPLOY_DIR_IMAGE}/${DTS_NAME}.dtb done @@ -61,7 +80,7 @@ DEPLOY_KERNEL_DTB_qemuzynq = "1" do_deploy_append() { if [ ! -z "${DEPLOY_KERNEL_DTB}" -a ! -z "${KERNEL_IMAGETYPE}" ]; then for DTS_FILE in ${DEVICETREE}; do - DTS_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'` + DTS_NAME=`basename -s .dts ${DTS_FILE}` KERNELDTBPATH=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_NAME}.dtb if [ ! -e ${KERNELDTBPATH} -o -h ${KERNELDTBPATH} ]; then ln -sf ${DTS_NAME}.dtb ${KERNELDTBPATH} -- 2.7.0 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] No recipes available for gcc-source_5.3.bbappend?
On Fri, Jan 22, 2016 at 4:17 AM, Giordon Starkwrote: > Hi all, > > I started a new VM at a different location to set up a test image on a > zedboard-zynq7 machine definition. > > When it parses it, it runs into the following error: > > ERROR: No recipes available for: > /home/osboxes/meta-xilinx/recipes-microblaze/gcc/gcc-source_5.3.bbappend This error is an inverse missing error, aka the recipe that meta-xilinx is trying to append to does not exist. Aka gcc-source_5.3.bb does not exist in poky/meta. > > I'm not entirely sure what is happening -- I've checked out master of > meta-xilinx and the layers look like: > > layer path priority > == > meta /home/osboxes/poky/meta 5 > meta-yocto/home/osboxes/poky/meta-yocto 5 > meta-yocto-bsp/home/osboxes/poky/meta-yocto-bsp 5 > meta /home/osboxes/poky/meta 5 > meta-xilinx /home/osboxes/meta-xilinx 5 > meta-oe /home/osboxes/meta-openembedded/meta-oe 6 > meta-python /home/osboxes/meta-openembedded/meta-python 7 > meta-l1calo /home/osboxes/meta-l1calo 7 > > so it's not entirely clear what went wrong. I see the file exists in the > recipes, so I'm not sure why bitbake has a problem with it? I noticed it had > a recent change (~15 days ago). Make sure you have checked out meta-xilinx on the same branch/version as the rest of your layers. If you would like to use meta-xilinx master you will also need to use poky and meta-oe master. (Use https://wiki.yoctoproject.org/wiki/Releases as a reference for the Yocto/Poky/OE releases and codename/branch names) Regards, Nathan > > Giordon > > -- > ___ > 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
Re: [meta-xilinx] [PATCH 05/20] Add basic Xilinx HDF support
On Tue, Apr 12, 2016 at 10:36 PM, Jason Wu <jason.wu.m...@gmail.com> wrote: > > > On 12/04/2016 7:02 PM, Nathan Rossi wrote: >> >> On Mon, Apr 11, 2016 at 11:23 PM, Jason Wu <jason.wu.m...@gmail.com> >> wrote: >>> >>> This allows user to create bb to extract the bitstream and >>> ps7_init_gpl.[h|c] >>> file from hdf file. >> >> >> This looks good, but I think it would be more useful as a bbclass >> instead of an include. > > I can do it as bbclas and will do in v2 >> >> >>> >>> Signed-off-by: Jason Wu <jason.wu.m...@gmail.com> >>> --- >>> recipes-bsp/hardware-definition-file/hdf.inc | 46 >>> >>> 1 file changed, 46 insertions(+) >>> create mode 100644 recipes-bsp/hardware-definition-file/hdf.inc >>> >>> diff --git a/recipes-bsp/hardware-definition-file/hdf.inc >>> b/recipes-bsp/hardware-definition-file/hdf.inc >>> new file mode 100644 >>> index 000..ba2e45c >>> --- /dev/null >>> +++ b/recipes-bsp/hardware-definition-file/hdf.inc >>> @@ -0,0 +1,46 @@ >>> +SECTION = "bsp" >>> +DEPENDS += "unzip" >>> + >>> +S ?= "${WORKDIR}/${MACHINE}" >>> + >>> +PROVIDES = "virtual/hdf virtual/bitstream virtual/zynq7-platform-init" >>> + >>> +FILESEXTRAPATHS_prepend := "${THISDIR}/bsps:" >> >> >> This shouldn't be there by default, in case "bsps" has different >> content than expected. > > I think this should be removed. This was a old code I had for testing the > local hdf. > >> >>> + >>> +PLATFORM_INIT ?= "ps7_init_gpl.c \ >>> + ps7_init_gpl.h" >>> + >>> +FILES_${PN} += " \ >>> + ${PLATFORM_INIT_DIR}/ps7_init_gpl.c \ >>> + ${PLATFORM_INIT_DIR}/ps7_init_gpl.h \ >>> + download.bit \ >> >> >> This can be split into two packages, ${PN}-platform-init and >> ${PN}-bitstream. So that it is easy to install either to the rootfs if >> that is desired. > > sure, will do it v2. The v2 will have something like the followings: > > +FILES_${PN}-platform-init += " \ > + ${PLATFORM_INIT_DIR}/ps7_init_gpl.c \ > + ${PLATFORM_INIT_DIR}/ps7_init_gpl.h \ > > +FILES_${PN}-bitstream += " \ > + download.bit \ > > Just to be sure this is what you after. > > >> >>> + " >>> + >>> +BITSTREAM ?= "bitstream-${PV}-${PR}.bit" >>> + >>> +INHIBIT_DEFAULT_DEPS = "1" >>> +PACKAGE_ARCH = "${MACHINE_ARCH}" >>> + >>> +inherit zynq7-platform-paths >>> + >>> +do_install() { >>> + fn=$(unzip -l ${S}/${HDF} | awk '{print $NF}' | grep ".bit$") >>> + unzip -o ${S}/${HDF} ${fn} -d ${D} >>> + [ "${fn}" == "download.bit"] || mv ${D}/${fn} ${D}/download.bit >>> + >>> + install -d ${PLATFORM_INIT_STAGE_DIR} >>> + for fn in ${PLATFORM_INIT}; do >>> + unzip -o ${S}/${HDF} ${fn} -d ${PLATFORM_INIT_STAGE_DIR} >>> + done >> >> >> I will have to double check, but I think this might not work correctly >> due to sysroot staging. Which is why the zynq7-platform-init.inc uses >> the sysroot stage task >> >> (http://git.yoctoproject.org/cgit/cgit.cgi/meta-xilinx/tree/recipes-bsp/platform-init/zynq7-platform-init.inc#n17) > > This was tested. So It may not work. I will have a look check with you > later. So I looked into it a bit and it appears to work fine to stage from the install task. However I noticed that this will only stage the files to the sysroot and it will never populate them into the install directory (${D}), so you will need to unzip them to ${D}${PLATFORM_INIT_DIR} as well. But it is probably worth setting this up to work in the expected tasks anyways, have install populate ${D} and then stage it in the sysroot via the sysroot_stage_all task. Something like below should work fine. install -d ${D}${PLATFORM_INIT_DIR} for fn in ${PLATFORM_INIT}; do unzip -o ${S}/${HDF} ${fn} -d ${D}${PLATFORM_INIT_DIR} done } sysroot_stage_all_append () { sysroot_stage_dir ${D}${PLATFORM_INIT_DIR} ${SYSROOT_DESTDIR}/${PLATFORM_INIT_DIR} } Regards, Nathan > > Regards, > > Jason > > >> >> Regards, >> Nathan >> >>> +} >>> + >>> +do_deploy () { >>> + if [ -e ${D}/download.bit ]; then >>> + install -d ${DEPLOY_DIR_IMAGE} >>> + install -m 0644 ${D}/download.bit >>> ${DEPLOY_DIR_IMAGE}/${BITSTREAM} >>> + ln -sf ${BITSTREAM} ${DEPLOY_DIR_IMAGE}/download.bit >>> + # for u-boot 2016.3 with spl load bitstream patch >>> + ln -sf ${BITSTREAM} ${DEPLOY_DIR_IMAGE}/bitstream >>> + fi >>> +} >>> +addtask deploy before do_build after do_install >>> -- >>> 1.9.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
Re: [meta-xilinx] [PATCH 1/3] device-tree.bb: Update kernel include paths for zynq/zynqmp
On Tue, Apr 12, 2016 at 11:38 PM, Nathan Rossi <nat...@nathanrossi.com> wrote: > Update the paths for kernel device tree and pre-processor includes. Merged this series. Regards, Nathan > > Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> > --- > recipes-bsp/device-tree/device-tree.bb | 11 +-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/recipes-bsp/device-tree/device-tree.bb > b/recipes-bsp/device-tree/device-tree.bb > index 3733754..ddfa758 100644 > --- a/recipes-bsp/device-tree/device-tree.bb > +++ b/recipes-bsp/device-tree/device-tree.bb > @@ -19,8 +19,15 @@ SRC_URI_append_zynq = " file://common/zynq7-base.dtsi" > S = "${WORKDIR}" > > KERNEL_DTS_INCLUDE ??= "" > -KERNEL_DTS_INCLUDE_zynq = "${STAGING_KERNEL_DIR}/arch/arm/boot/dts" > -KERNEL_DTS_INCLUDE_zynqmp = "${STAGING_KERNEL_DIR}/arch/arm/boot/dts > ${STAGING_KERNEL_DIR}/arch/arm64/boot/dts/xilinx" > +KERNEL_DTS_INCLUDE_zynq = " \ > + ${STAGING_KERNEL_DIR}/arch/arm/boot/dts \ > + ${STAGING_KERNEL_DIR}/arch/arm/boot/dts/include \ > + " > +KERNEL_DTS_INCLUDE_zynqmp = " \ > + ${STAGING_KERNEL_DIR}/arch/arm64/boot/dts \ > + ${STAGING_KERNEL_DIR}/arch/arm64/boot/dts/include \ > + ${STAGING_KERNEL_DIR}/arch/arm64/boot/dts/xilinx \ > + " > > python () { > # auto add dependency on kernel tree > -- > 2.8.0.rc3 > -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH 10/20] linux-xlnx-dev: Add Digilent encoder and axi dynclk drivers
On Mon, Apr 11, 2016 at 11:23 PM, Jason Wuwrote: > Signed-off-by: Jason Wu Unfortunately I wont be able to accept this patch. The main reason is it is impossible to maintain applying patches to a moving target, of which linux-xlnx-dev is. It would be best to get these changes into linux-xlnx and/or mainline if possible. Regards, Nathan > --- > recipes-kernel/linux/linux-xlnx-dev.bb | 5 + > ...rm-xilinx-Add-encoder-for-Digilent-boards.patch | 294 ++ > ...002-clk-Add-driver-for-axi_dynclk-IP-Core.patch | 601 > + > 3 files changed, 900 insertions(+) > create mode 100644 > recipes-kernel/linux/linux-xlnx-dev/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch > create mode 100644 > recipes-kernel/linux/linux-xlnx-dev/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch > > diff --git a/recipes-kernel/linux/linux-xlnx-dev.bb > b/recipes-kernel/linux/linux-xlnx-dev.bb > index 1bfed49..a145b2a 100644 > --- a/recipes-kernel/linux/linux-xlnx-dev.bb > +++ b/recipes-kernel/linux/linux-xlnx-dev.bb > @@ -9,6 +9,11 @@ SRCBRANCH = "${KBRANCH}" > # Use the SRCREV for the last tagged revision of linux-xlnx. > SRCREV ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", > "linux-xlnx-dev", "${AUTOREV}", "3821a7bfdf7a4c697cac62f0157d8bf49467ea67", > d)}' > > +SRC_URI_append_zybo-linux-bd-zynq7 = " \ > + file://0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch \ > + file://0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch \ > +" > + > python () { > if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != > "linux-xlnx-dev": > raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to > linux-xlnx-dev to enable it") > diff --git > a/recipes-kernel/linux/linux-xlnx-dev/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch > > b/recipes-kernel/linux/linux-xlnx-dev/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch > new file mode 100644 > index 000..892455a > --- /dev/null > +++ > b/recipes-kernel/linux/linux-xlnx-dev/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch > @@ -0,0 +1,294 @@ > +From 3d1820b308dcc9344d8e7df4a8a712632fb77b97 Mon Sep 17 00:00:00 2001 > +Message-Id: > <3d1820b308dcc9344d8e7df4a8a712632fb77b97.1460291687.git.jason.wu.m...@gmail.com> > +From: Jason Wu > +Date: Sun, 10 Apr 2016 13:14:13 +1000 > +Subject: [LINUX] [PATCH] drm: xilinx: Add encoder for Digilent boards > + > +Add the dglnt_encoder driver that enables DRM support for the VGA and > +HDMI output ports found on many Digilent boards. > + > +Upstream-Status: Pending > + > +Signed-off-by: Sam Bobrowicz > +Signed-off-by: Jason Wu > +--- > +github.com () linux-xlnx.git xlnx/master > + > +diff --git a/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt > b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt > +new file mode 100644 > +index 000..242b24e > +--- /dev/null > b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt > +@@ -0,0 +1,23 @@ > ++Device-Tree bindings for Digilent DRM Encoder Slave > ++ > ++This driver provides support for VGA and HDMI outputs on Digilent FPGA > boards. > ++The VGA or HDMI port must be connected to a Xilinx display pipeline via an > ++axi2vid IP core. > ++ > ++Required properties: > ++ - compatible: Should be "digilent,drm-encoder". > ++ > ++Optional properties: > ++ - dglnt,edid-i2c: The I2C device connected to the DDC bus on the video > ++ connector. This is used to obtain the supported > resolutions > ++ of an attached monitor. If not defined, then a default > ++ set of resolutions is used and the display will > initialize > ++ to 720p. Note most VGA connectors on Digilent boards do > ++ not have the DDC bus routed out. > ++ > ++Example: > ++ > ++ encoder_0: digilent_encoder { > ++ compatible = "digilent,drm-encoder"; > ++ dglnt,edid-i2c = <>; > ++ }; > +diff --git a/drivers/gpu/drm/xilinx/Kconfig b/drivers/gpu/drm/xilinx/Kconfig > +index a713b17..c32a4a6 100644 > +--- a/drivers/gpu/drm/xilinx/Kconfig > b/drivers/gpu/drm/xilinx/Kconfig > +@@ -21,3 +21,9 @@ config DRM_XILINX_DP_SUB > + select DRM_XILINX_DP > + help > + DRM driver for Xilinx Display Port Subsystem. > ++ > ++config DRM_DIGILENT_ENCODER > ++ tristate "Digilent VGA/HDMI DRM Encoder Driver" > ++ depends on DRM_XILINX > ++ help > ++ DRM slave encoder for Video-out on Digilent boards. > +diff --git a/drivers/gpu/drm/xilinx/Makefile > b/drivers/gpu/drm/xilinx/Makefile > +index 705472c..a571bd9 100644 > +--- a/drivers/gpu/drm/xilinx/Makefile > b/drivers/gpu/drm/xilinx/Makefile > +@@ -10,3 +10,4 @@ xilinx_drm-y += xilinx_cresample.o xilinx_osd.o > xilinx_rgb2yuv.o xilinx_vtc.o > +
Re: [meta-xilinx] [PATCH 09/20] conf/machine: Add zybo-linux-bd-zynq7 machine support
On Mon, Apr 11, 2016 at 11:23 PM, Jason Wuwrote: > * base on Zybo linux_bd reference design > * Add device tree with required nodes > * hdf is fetch from Digilent github > > Signed-off-by: Jason Wu > --- > conf/machine/zybo-linux-bd-zynq7.conf | 30 +++ > .../device-tree/files/zybo-linux-bd/pcw.dtsi | 63 ++ > .../device-tree/files/zybo-linux-bd/pl.dtsi| 213 > + > .../files/zybo-linux-bd/zybo-linux-bd.dts | 185 ++ > .../hardware-definition-file/zybo-linux-bd.bb | 22 +++ > 5 files changed, 513 insertions(+) > create mode 100644 conf/machine/zybo-linux-bd-zynq7.conf > create mode 100644 recipes-bsp/device-tree/files/zybo-linux-bd/pcw.dtsi > create mode 100644 recipes-bsp/device-tree/files/zybo-linux-bd/pl.dtsi > create mode 100644 > recipes-bsp/device-tree/files/zybo-linux-bd/zybo-linux-bd.dts > create mode 100644 recipes-bsp/hardware-definition-file/zybo-linux-bd.bb > > diff --git a/conf/machine/zybo-linux-bd-zynq7.conf > b/conf/machine/zybo-linux-bd-zynq7.conf > new file mode 100644 > index 000..7c9c702 > --- /dev/null > +++ b/conf/machine/zybo-linux-bd-zynq7.conf > @@ -0,0 +1,30 @@ > +#@TYPE: Machine > +#@NAME: zybo-linux-bd-zynq7 > +#@DESCRIPTION: Machine support for zybo-linux-bd project. > +# > +# generated base on ZYBO linux-bd project > +# > + > +require conf/machine/include/tune-zynq.inc > +require conf/machine/include/machine-xilinx-default.inc > +require conf/machine/include/machine-xilinx-board.inc > + > +MACHINE_FEATURES = "ext2 vfat usbhost usbgadget keyboard screen alsa sdio" > +SERIAL_CONSOLE = "115200 ttyPS0" > + > +MACHINE_DEVICETREE = " \ > + zybo-linux-bd/pcw.dtsi \ > + zybo-linux-bd/pl.dtsi \ > + zybo-linux-bd/zybo-linux-bd.dts \ For consistency with other machines that output a dtb with the device-tree recipe, the dts/dtb should match the name of the machine. > + " > +KERNEL_IMAGETYPE = "zImage" > + > +UBOOT_MACHINE = "zynq_zybo_config" > +SPL_BINARY = "spl/boot.bin" > + > +EXTRA_IMAGEDEPENDS += "virtual/hdf" This should be just += "virtual/bitstream". Since the u-boot recipe handles depending on the platform-init. Also this .conf is missing: MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" > + > +IMAGE_BOOT_FILES += "boot.bin \ > + ${@bb.utils.contains('IMAGE_FSTYPES', 'xilinx-fitimage', > 'fit.itb', 'zybo-linux-bd.dtb', d)} \ This conditional should be added with patch 13, which adds xilinx-fitimage to this machine. Also this should be "${MACHINE}.dtb". > + bitstream \ > + " -- snip -- > diff --git a/recipes-bsp/hardware-definition-file/zybo-linux-bd.bb > b/recipes-bsp/hardware-definition-file/zybo-linux-bd.bb > new file mode 100644 > index 000..4eda840 > --- /dev/null > +++ b/recipes-bsp/hardware-definition-file/zybo-linux-bd.bb This should be under 'recipes-bsp/reference-design/'. Regards, Nathan > @@ -0,0 +1,22 @@ > +SUMMARY = "Xilinx Hardware Definition File for zybo-linux-bd" > +DESCRIPTION = "Contains the Reference Design Files and hardware software > hand-off files." > +SECTION = "bsp" > +DEPENDS += "unzip" > + > +include hdf.inc > + > +LICENSE = "Proprietary" > +LIC_FILES_CHKSUM = > "file://Projects/${HW_BD}/readme.txt;md5=e1cb7639bf00b6e730ff3a7f13714951" > + > +COMPATIBLE_MACHINE = "zybo-linux-bd-zynq7" > + > +HW_BD = "linux_bd" > + > +SRC_URI := "git://github.com/Digilent/ZYBO.git;protocol=https;nobranch=1" > +SRCREV = "63ca49fe027da49f3b0ac636bd404fd31fbbd945" > + > +PV = "+git${SRCPV}" > + > +S = "${WORKDIR}/git" > + > +HDF = "/Projects/${HW_BD}/hw_handoff/${HW_BD}_wrapper.hdf" > -- > 1.9.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
Re: [meta-xilinx] [RFC 00/20] Add zybo-linux-bd-zynq7 support
On Mon, Apr 11, 2016 at 11:23 PM, Jason Wuwrote: > This series has the following changes: > * Machine: > * Add zybo-linux-bd-zynq7 machine support. The hardware enables the > follows: > - HDMI output > - Sound > - AXI GPIO > * Kenrel: > * Add Digilent encoder driver and AXI Dynclk drivers for both linux-xlnx > and linux-xlnx-dev > * Add config fragments for: > - Xilinx DRM > - Keyboard GPIO > - V4L2 > - Digilent DRM > * U-boot: > * Add SPL load bitstream and uEnv.txt support to 2016.03 u-boot > * Add custom uEnv.txt file for zybo-linux-bd-zynq7 > * Add wic SD card kickstart image defintion and use it to generate wic image > for sd card. > * Add fitiamge generation support with xilinx-fitimage image type > * Add workaround recipes (X and console) for screen wakeup issue > * New recipe to fetch HDF from external website to provide bitstream and > ps7_init_gpl.h/c > > This series provides a working Zybo BSP support base on Digilent's linux_bd > poject design which can be found in github > (https://github.com/Digilent/ZYBO/tree/master/Projects/linux_bd). The key > feature of this hardware project is to provide HDMI out. > > Known issues: > - Audio play back get distortion after certain operation such as cancelling > playback or after recording > - Screen does not work up from screen saver (cosole blank). This can be > workarounded by enable the consoleblank package. Great work Jason, I have reviewed the patches in this series and I have provided some comments. However I would like to apply some of these changes from this series to master for this upcoming release, and hold off on some of the others until after that release. Specifically around the fit image support and u-boot patches. If you are able to update the series that would be great. Thanks, Nathan > > Jason Wu (20): > linux/config: Add config fragments for Xilinx DRM > linux/config: Add keyboard gpio cfg and scc > conf: Define XILINXBASE variable > Add xilinx-fitimage recipe > Add basic Xilinx HDF support > linux-xlnx-dev: Update kernel version from 4.0+ to 4.4+ > linux/config: Add config fragments for Zybo sound support > linux/config: Add config fragment for enabling v4l2 > conf/machine: Add zybo-linux-bd-zynq7 machine support > linux-xlnx-dev: Add Digilent encoder and axi dynclk drivers > linux-xlnx: Add Digilent encoder and axi dynclk drivers > linux/config: Add config fragments for Digilent DRM encoder > zybo-linux-bd-zynq7: Enable fitimage > zybo-linux-bd-zynq7: Enable required kernel drivers > Add consoleblank recipe > zybo-linux-bd-zynq7: Enable console-blank > u-boot_2016.03: Add SPL load bitstream and uEnv.txt support > u-boot: Add uEnv.txt suppor to zybo-linux-bd-zynq7 > Add xilinx-sdimg support > Add xserver-xf86-config_0.1 bbappend > > classes/xilinx-fitimage.bbclass| 89 +++ > classes/xilinx-sdimg.bbclass | 14 + > conf/layer.conf| 2 + > conf/machine/zybo-linux-bd-zynq7.conf | 46 ++ > .../device-tree/files/zybo-linux-bd/pcw.dtsi | 63 +++ > .../device-tree/files/zybo-linux-bd/pl.dtsi| 213 > .../files/zybo-linux-bd/zybo-linux-bd.dts | 185 +++ > recipes-bsp/hardware-definition-file/hdf.inc | 46 ++ > .../hardware-definition-file/zybo-linux-bd.bb | 22 + > .../configs-zynq-common-Add-uEnv.txt-support.patch | 66 +++ > .../u-boot/u-boot/zybo-linux-bd-zynq7/uEnv.txt | 2 + > .../zynq-Add-fpga-support-to-u-boot-SPL.patch | 130 + > recipes-bsp/u-boot/u-boot_2016.03.bbappend | 8 + > recipes-graphics/consoleblank/console-blank.bb | 25 + > recipes-graphics/consoleblank/files/console-blank | 27 + > .../xserver-xf86-config/zynq/xorg.conf | 6 + > .../zynq/xorg.conf.d/20-disable-screen-saver.conf | 10 + > .../xorg-xserver/xserver-xf86-config_0.1.bbappend | 11 + > .../xilinx-common/bsp/digilent/drm-digilent.cfg| 7 + > .../xilinx-common/bsp/digilent/drm-digilent.scc| 5 + > .../config/xilinx-common/bsp/digilent/zybo-snd.cfg | 9 + > .../config/xilinx-common/bsp/digilent/zybo-snd.scc | 4 + > .../xilinx-common/features/drm/drm-xilinx.cfg | 13 + > .../xilinx-common/features/drm/drm-xilinx.scc | 4 + > .../config/xilinx-common/features/gpio/kb-gpio.cfg | 3 + > .../config/xilinx-common/features/gpio/kb-gpio.scc | 4 + > .../xilinx-common/features/v4l2/v4l2-xilinx.cfg| 19 + > .../xilinx-common/features/v4l2/v4l2-xilinx.scc| 4 + > recipes-kernel/linux/linux-xlnx-dev.bb | 7 +- > ...rm-xilinx-Add-encoder-for-Digilent-boards.patch | 294 ++ > ...002-clk-Add-driver-for-axi_dynclk-IP-Core.patch | 601 > + > ...rm-xilinx-Add-encoder-for-Digilent-boards.patch | 294 ++ >
Re: [meta-xilinx] [PATCH 16/20] zybo-linux-bd-zynq7: Enable console-blank
On Mon, Apr 11, 2016 at 11:23 PM, Jason Wuwrote: > This prevent hdmi console goes to sleep mode. This is required as currently > the hdmi console won't wake up from sleep mode. > > Signed-off-by: Jason Wu > --- > conf/machine/zybo-linux-bd-zynq7.conf | 4 > 1 file changed, 4 insertions(+) > > diff --git a/conf/machine/zybo-linux-bd-zynq7.conf > b/conf/machine/zybo-linux-bd-zynq7.conf > index 4d1dee4..b594778 100644 > --- a/conf/machine/zybo-linux-bd-zynq7.conf > +++ b/conf/machine/zybo-linux-bd-zynq7.conf > @@ -33,6 +33,10 @@ IMAGE_BOOT_FILES += "boot.bin \ > IMAGE_CLASSES += "xilinx-fitimage" > IMAGE_FSTYPES += "xilinx-fitimage" > > +IMAGE_INSTALL_append += " \ > + console-blank \ > + " Use "MACHINE_EXTRA_RRECOMMENDS" or "MACHINE_EXTRA_RDEPENDS" (http://www.yoctoproject.org/docs/current/ref-manual/ref-manual.html#var-MACHINE_EXTRA_RDEPENDS). Regards, Nathan > + > KERNEL_FEATURES += " \ > bsp/digilent/drm-digilent.scc \ > bsp/digilent/zybo-snd.scc \ > -- > 1.9.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
Re: [meta-xilinx] [PATCH 11/20] linux-xlnx: Add Digilent encoder and axi dynclk drivers
On Mon, Apr 11, 2016 at 11:23 PM, Jason Wuwrote: > Add to both linux-xlnx_4.0.bb and linux-xlnx_4.4.bb. Just want to query what the plan is for upstreaming these patches to linux-xlnx or mainline linux? Regards, Nathan > > Signed-off-by: Jason Wu > --- > ...rm-xilinx-Add-encoder-for-Digilent-boards.patch | 294 ++ > ...002-clk-Add-driver-for-axi_dynclk-IP-Core.patch | 601 > + > recipes-kernel/linux/linux-xlnx_4.0.bb | 4 + > recipes-kernel/linux/linux-xlnx_4.4.bb | 4 + > 4 files changed, 903 insertions(+) > create mode 100644 > recipes-kernel/linux/linux-xlnx/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch > create mode 100644 > recipes-kernel/linux/linux-xlnx/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch > > diff --git > a/recipes-kernel/linux/linux-xlnx/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch > > b/recipes-kernel/linux/linux-xlnx/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch > new file mode 100644 > index 000..892455a > --- /dev/null > +++ > b/recipes-kernel/linux/linux-xlnx/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch > @@ -0,0 +1,294 @@ > +From 3d1820b308dcc9344d8e7df4a8a712632fb77b97 Mon Sep 17 00:00:00 2001 > +Message-Id: > <3d1820b308dcc9344d8e7df4a8a712632fb77b97.1460291687.git.jason.wu.m...@gmail.com> > +From: Jason Wu > +Date: Sun, 10 Apr 2016 13:14:13 +1000 > +Subject: [LINUX] [PATCH] drm: xilinx: Add encoder for Digilent boards > + > +Add the dglnt_encoder driver that enables DRM support for the VGA and > +HDMI output ports found on many Digilent boards. > + > +Upstream-Status: Pending > + > +Signed-off-by: Sam Bobrowicz > +Signed-off-by: Jason Wu > +--- > +github.com () linux-xlnx.git xlnx/master > + > +diff --git a/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt > b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt > +new file mode 100644 > +index 000..242b24e > +--- /dev/null > b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt > +@@ -0,0 +1,23 @@ > ++Device-Tree bindings for Digilent DRM Encoder Slave > ++ > ++This driver provides support for VGA and HDMI outputs on Digilent FPGA > boards. > ++The VGA or HDMI port must be connected to a Xilinx display pipeline via an > ++axi2vid IP core. > ++ > ++Required properties: > ++ - compatible: Should be "digilent,drm-encoder". > ++ > ++Optional properties: > ++ - dglnt,edid-i2c: The I2C device connected to the DDC bus on the video > ++ connector. This is used to obtain the supported > resolutions > ++ of an attached monitor. If not defined, then a default > ++ set of resolutions is used and the display will > initialize > ++ to 720p. Note most VGA connectors on Digilent boards do > ++ not have the DDC bus routed out. > ++ > ++Example: > ++ > ++ encoder_0: digilent_encoder { > ++ compatible = "digilent,drm-encoder"; > ++ dglnt,edid-i2c = <>; > ++ }; > +diff --git a/drivers/gpu/drm/xilinx/Kconfig b/drivers/gpu/drm/xilinx/Kconfig > +index a713b17..c32a4a6 100644 > +--- a/drivers/gpu/drm/xilinx/Kconfig > b/drivers/gpu/drm/xilinx/Kconfig > +@@ -21,3 +21,9 @@ config DRM_XILINX_DP_SUB > + select DRM_XILINX_DP > + help > + DRM driver for Xilinx Display Port Subsystem. > ++ > ++config DRM_DIGILENT_ENCODER > ++ tristate "Digilent VGA/HDMI DRM Encoder Driver" > ++ depends on DRM_XILINX > ++ help > ++ DRM slave encoder for Video-out on Digilent boards. > +diff --git a/drivers/gpu/drm/xilinx/Makefile > b/drivers/gpu/drm/xilinx/Makefile > +index 705472c..a571bd9 100644 > +--- a/drivers/gpu/drm/xilinx/Makefile > b/drivers/gpu/drm/xilinx/Makefile > +@@ -10,3 +10,4 @@ xilinx_drm-y += xilinx_cresample.o xilinx_osd.o > xilinx_rgb2yuv.o xilinx_vtc.o > + obj-$(CONFIG_DRM_XILINX) += xilinx_drm.o > + obj-$(CONFIG_DRM_XILINX_DP) += xilinx_drm_dp.o > + obj-$(CONFIG_DRM_XILINX_DP_SUB) += xilinx_drm_dp_sub.o > ++obj-$(CONFIG_DRM_DIGILENT_ENCODER) += dglnt_encoder.o > +diff --git a/drivers/gpu/drm/xilinx/dglnt_encoder.c > b/drivers/gpu/drm/xilinx/dglnt_encoder.c > +new file mode 100644 > +index 000..26a2398 > +--- /dev/null > b/drivers/gpu/drm/xilinx/dglnt_encoder.c > +@@ -0,0 +1,217 @@ > ++/* > ++ * dglnt_encoder.c - DRM slave encoder for Video-out on Digilent boards > ++ * > ++ * Copyright (C) 2015 Digilent > ++ * Author: Sam Bobrowicz > ++ * > ++ * Based on udl_encoder.c and udl_connector.c, Copyright (C) 2012 Red Hat. > ++ * Also based on xilinx_drm_dp.c, Copyright (C) 2014 Xilinx, Inc. > ++ * > ++ * This software is licensed under the terms of the GNU General Public > ++ * License version 2, as published by the Free Software Foundation, and > ++ * may be copied,
Re: [meta-xilinx] [PATCH 17/20] u-boot_2016.03: Add SPL load bitstream and uEnv.txt support
On Mon, Apr 11, 2016 at 11:23 PM, Jason Wuwrote: > Adds two patches that supports the follows: > - SPL loading bistream support > - Loading uEnv.txt via MMC or USB and enable u-boot to load uEnv.txt > from MMC when set to MMC boot mode. > > Signed-off-by: Jason Wu > --- > .../configs-zynq-common-Add-uEnv.txt-support.patch | 66 +++ > .../zynq-Add-fpga-support-to-u-boot-SPL.patch | 130 > + > recipes-bsp/u-boot/u-boot_2016.03.bbappend | 4 + > 3 files changed, 200 insertions(+) > create mode 100644 > recipes-bsp/u-boot/u-boot/configs-zynq-common-Add-uEnv.txt-support.patch > create mode 100644 > recipes-bsp/u-boot/u-boot/zynq-Add-fpga-support-to-u-boot-SPL.patch > > diff --git > a/recipes-bsp/u-boot/u-boot/configs-zynq-common-Add-uEnv.txt-support.patch > b/recipes-bsp/u-boot/u-boot/configs-zynq-common-Add-uEnv.txt-support.patch > new file mode 100644 > index 000..06d0b9d > --- /dev/null > +++ b/recipes-bsp/u-boot/u-boot/configs-zynq-common-Add-uEnv.txt-support.patch > @@ -0,0 +1,66 @@ > +From 4dd0f06c46085cacc607dabbdf288bef6ad67115 Mon Sep 17 00:00:00 2001 > +From: Michal Simek > +Date: Fri, 18 Mar 2016 23:43:39 +0100 > +Subject: [PATCH] configs: zynq-common: Add uEnv.txt support > + > +preboot macro load the uEnv.txt from mmc 0 when bootmode is mmc. uenvcmd is > +executed after load of uEnv.txt if it is defined in the uEnv.txt env text > +file. > + > +The default importbootenv macro reads the uEnv.txt from mmc. > + > +Additional to this, usb_loadbootenv is added to support loading uEnv.txt > +from usb dev 0. > + > +Upstream-Status: Pending This one looks like it is already upstream, this should be "Backport". http://git.denx.de/?p=u-boot.git;a=commit;h=4d1ed9c71561becbb9d612fe584bb6332eb24168 > + > +Signed-off-by: Michal Simek > +Signed-off-by: Jason Wu > + > +diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h > +index 4cb490b..5e3ce95 100644 > +--- a/include/configs/zynq-common.h > b/include/configs/zynq-common.h > +@@ -206,6 +206,9 @@ > + # define CONFIG_ENV_OFFSET0xE > + #endif > + > ++/* enable preboot to be loaded before CONFIG_BOOTDELAY */ > ++#define CONFIG_PREBOOT > ++ > + /* Default environment */ > + #ifndef CONFIG_EXTRA_ENV_SETTINGS > + #define CONFIG_EXTRA_ENV_SETTINGS \ > +@@ -216,6 +219,29 @@ > + "nor_flash_off=0xE210\0"\ > + "fdt_high=0x2000\0" \ > + "initrd_high=0x2000\0" \ > ++ "loadbootenv_addr=0x200\0" \ > ++ "bootenv=uEnv.txt\0" \ > ++ "bootenv_dev=mmc\0" \ > ++ "loadbootenv=load ${bootenv_dev} 0 ${loadbootenv_addr} ${bootenv}\0" \ > ++ "importbootenv=echo Importing environment from ${bootenv_dev} ...; " \ > ++ "env import -t ${loadbootenv_addr} $filesize\0" \ > ++ "bootenv_existence_test=test -e ${bootenv_dev} 0 /${bootenv}\0" \ > ++ "setbootenv=if env run bootenv_existence_test; then " \ > ++ "if env run loadbootenv; then " \ > ++ "env run importbootenv; " \ > ++ "fi; " \ > ++ "fi; \0" \ > ++ "sd_loadbootenv=set bootenv_dev mmc && " \ > ++ "run setbootenv \0" \ > ++ "usb_loadbootenv=set bootenv_dev usb && usb start && run setbootenv > \0" \ > ++ "preboot=if test $modeboot = sdboot; then " \ > ++ "run sd_loadbootenv; " \ > ++ "echo Checking if uenvcmd is set ...; " \ > ++ "if test -n $uenvcmd; then " \ > ++ "echo Running uenvcmd ...; " \ > ++ "run uenvcmd; " \ > ++ "fi; " \ > ++ "fi; \0" \ > + "norboot=echo Copying FIT from NOR flash to RAM... && " \ > + "cp.b ${nor_flash_off} ${load_addr} ${fit_size} && " \ > + "bootm ${load_addr}\0" \ > +-- > +1.9.1 > + > diff --git > a/recipes-bsp/u-boot/u-boot/zynq-Add-fpga-support-to-u-boot-SPL.patch > b/recipes-bsp/u-boot/u-boot/zynq-Add-fpga-support-to-u-boot-SPL.patch > new file mode 100644 > index 000..ab355af > --- /dev/null > +++ b/recipes-bsp/u-boot/u-boot/zynq-Add-fpga-support-to-u-boot-SPL.patch > @@ -0,0 +1,130 @@ > +From 14c84972b2c0a32664b3b392d18161998cd1200f Mon Sep 17 00:00:00 2001 > +From: Michal Simek > +Date: Fri, 18 Mar 2016 17:24:48 +0100 > +Subject: [PATCH] zynq: Add fpga support to u-boot SPL > + > +Load bitstream in SPL. "bitstream" can be in bit or bin format. > + > +Upstream-Status: Pending Whats the plan for upstreaming this patch? it does look like there is some Xilinx specific functions that are added to common code. Regards, Nathan > + > +Signed-off-by: Jason Wu > +Signed-off-by: Michal Simek > + > +diff --git
Re: [meta-xilinx] [PATCH 05/20] Add basic Xilinx HDF support
On Mon, Apr 11, 2016 at 11:23 PM, Jason Wuwrote: > This allows user to create bb to extract the bitstream and ps7_init_gpl.[h|c] > file from hdf file. This looks good, but I think it would be more useful as a bbclass instead of an include. > > Signed-off-by: Jason Wu > --- > recipes-bsp/hardware-definition-file/hdf.inc | 46 > > 1 file changed, 46 insertions(+) > create mode 100644 recipes-bsp/hardware-definition-file/hdf.inc > > diff --git a/recipes-bsp/hardware-definition-file/hdf.inc > b/recipes-bsp/hardware-definition-file/hdf.inc > new file mode 100644 > index 000..ba2e45c > --- /dev/null > +++ b/recipes-bsp/hardware-definition-file/hdf.inc > @@ -0,0 +1,46 @@ > +SECTION = "bsp" > +DEPENDS += "unzip" > + > +S ?= "${WORKDIR}/${MACHINE}" > + > +PROVIDES = "virtual/hdf virtual/bitstream virtual/zynq7-platform-init" > + > +FILESEXTRAPATHS_prepend := "${THISDIR}/bsps:" This shouldn't be there by default, in case "bsps" has different content than expected. > + > +PLATFORM_INIT ?= "ps7_init_gpl.c \ > + ps7_init_gpl.h" > + > +FILES_${PN} += " \ > + ${PLATFORM_INIT_DIR}/ps7_init_gpl.c \ > + ${PLATFORM_INIT_DIR}/ps7_init_gpl.h \ > + download.bit \ This can be split into two packages, ${PN}-platform-init and ${PN}-bitstream. So that it is easy to install either to the rootfs if that is desired. > + " > + > +BITSTREAM ?= "bitstream-${PV}-${PR}.bit" > + > +INHIBIT_DEFAULT_DEPS = "1" > +PACKAGE_ARCH = "${MACHINE_ARCH}" > + > +inherit zynq7-platform-paths > + > +do_install() { > + fn=$(unzip -l ${S}/${HDF} | awk '{print $NF}' | grep ".bit$") > + unzip -o ${S}/${HDF} ${fn} -d ${D} > + [ "${fn}" == "download.bit"] || mv ${D}/${fn} ${D}/download.bit > + > + install -d ${PLATFORM_INIT_STAGE_DIR} > + for fn in ${PLATFORM_INIT}; do > + unzip -o ${S}/${HDF} ${fn} -d ${PLATFORM_INIT_STAGE_DIR} > + done I will have to double check, but I think this might not work correctly due to sysroot staging. Which is why the zynq7-platform-init.inc uses the sysroot stage task (http://git.yoctoproject.org/cgit/cgit.cgi/meta-xilinx/tree/recipes-bsp/platform-init/zynq7-platform-init.inc#n17). Regards, Nathan > +} > + > +do_deploy () { > + if [ -e ${D}/download.bit ]; then > + install -d ${DEPLOY_DIR_IMAGE} > + install -m 0644 ${D}/download.bit > ${DEPLOY_DIR_IMAGE}/${BITSTREAM} > + ln -sf ${BITSTREAM} ${DEPLOY_DIR_IMAGE}/download.bit > + # for u-boot 2016.3 with spl load bitstream patch > + ln -sf ${BITSTREAM} ${DEPLOY_DIR_IMAGE}/bitstream > + fi > +} > +addtask deploy before do_build after do_install > -- > 1.9.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
Re: [meta-xilinx] [PATCH 15/20] Add consoleblank recipe
On Mon, Apr 11, 2016 at 11:23 PM, Jason Wuwrote: > This recipe installs a init script to disable console blank > > Signed-off-by: Jason Wu > --- > recipes-graphics/consoleblank/console-blank.bb| 25 + > recipes-graphics/consoleblank/files/console-blank | 27 > +++ > 2 files changed, 52 insertions(+) > create mode 100644 recipes-graphics/consoleblank/console-blank.bb > create mode 100644 recipes-graphics/consoleblank/files/console-blank > > diff --git a/recipes-graphics/consoleblank/console-blank.bb > b/recipes-graphics/consoleblank/console-blank.bb > new file mode 100644 > index 000..18001a2 > --- /dev/null > +++ b/recipes-graphics/consoleblank/console-blank.bb > @@ -0,0 +1,25 @@ > +DESCRIPTION = "Startup script - disable console blank" > +SECTION = "base" > +LICENSE = "MIT" > +LIC_FILES_CHKSUM = > "file://${XILINXBASE}/COPYING.MIT;md5=838c366f69b72c5df05c96dff79b35f2" Use the ${COREBASE}/files/common-licenses/MIT here instead of the one in the meta-xilinx layer. Regards, Nathan > + > +PR = "r0" > + > +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" > +SRC_URI = "file://console-blank" > + > +inherit update-rc.d > + > +INITSCRIPT_NAME = "console-blank" > +INITSCRIPT_PARAMS = "start 39 S . stop 31 0 6 ." > +#FILES_${PN} = "${sysconfdir}/init.d/console-blank" > + > +# # # add to build if system machine supports screen > +# PACKAGES += ' \ > +# ${@bb.utils.contains("MACHINE_FEATURES", "screen", "console-blank", > "",d)} \ > +# ' > + > +do_install () { > + install -d ${D}/${sysconfdir}/init.d/ > + install -m 0755 ${WORKDIR}/console-blank ${D}${sysconfdir}/init.d/ > +} > \ No newline at end of file > diff --git a/recipes-graphics/consoleblank/files/console-blank > b/recipes-graphics/consoleblank/files/console-blank > new file mode 100644 > index 000..58c2f33 > --- /dev/null > +++ b/recipes-graphics/consoleblank/files/console-blank > @@ -0,0 +1,27 @@ > +#!/bin/sh > +### BEGIN INIT INFO > +# Provides: consoleblank.sh > +# Required-Start: > +# Required-Stop: > +# Default-Start: S > +# Default-Stop: > +# Short-Description: disable console blank > +# Description: set consoleblank to 0 on tty1 > +### END INIT INFO > + > +cur_cb=$(cat /sys/module/kernel/parameters/consoleblank) > + > +if [ $cur_cb -ne 0 ]; then > + echo "Disable console blank" > + for i in {0..9}; do > + echo -e '\033[9;0]' > /dev/tty1 > + cb_chk=$(cat /sys/module/kernel/parameters/consoleblank) > + if [ $cb_chk -eq 0 ]; then > + exit 0 > + fi > + done > +fi > + > +if [ $cb_chk -ne 0 ]; then > + echo "Error: fail to disable console blank" > +fi > \ No newline at end of file > -- > 1.9.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
Re: [meta-xilinx] [PATCH 1/2] recipes-bsp:device-tree: Allow to reuse the dtses from kernel tree
On Mon, Apr 11, 2016 at 11:13 PM, Jason Wuwrote: > Use the -i set the include folder for dtc instead of copying file. Applied. Thanks, Nathan > > Signed-off-by: Jason Wu > > diff --git a/recipes-bsp/device-tree/device-tree.bb > b/recipes-bsp/device-tree/device-tree.bb > index 2cd47ce..c5dd2a6 100644 > --- a/recipes-bsp/device-tree/device-tree.bb > +++ b/recipes-bsp/device-tree/device-tree.bb > @@ -19,8 +19,8 @@ SRC_URI_append_zynq = " file://common/zynq7-base.dtsi" > S = "${WORKDIR}" > > KERNEL_DTS_INCLUDE ??= "" > -KERNEL_DTS_INCLUDE_zynq = "arch/arm/boot/dts/skeleton.dtsi > arch/arm/boot/dts/zynq-7000.dtsi" > -KERNEL_DTS_INCLUDE_zynqmp = "arch/arm/boot/dts/skeleton.dtsi > arch/arm64/boot/dts/xilinx/zynqmp.dtsi" > +KERNEL_DTS_INCLUDE_zynq = "${STAGING_KERNEL_DIR}/arch/arm/boot/dts" > +KERNEL_DTS_INCLUDE_zynqmp = "${STAGING_KERNEL_DIR}/arch/arm/boot/dts > ${STAGING_KERNEL_DIR}/arch/arm64/boot/dts/xilinx" > > python () { > # auto add dependency on kernel tree > @@ -30,14 +30,6 @@ python () { > } > > do_compile() { > - for i in ${KERNEL_DTS_INCLUDE}; do > - DTSI_NAME=`basename $i` > - if test -e ${STAGING_KERNEL_DIR}/$i; then > - mkdir -p ${WORKDIR}/devicetree > - cp ${STAGING_KERNEL_DIR}/$i > ${WORKDIR}/devicetree/${DTSI_NAME} > - fi > - done > - > if test -n "${MACHINE_DEVICETREE}"; then > mkdir -p ${WORKDIR}/devicetree > for i in ${MACHINE_DEVICETREE}; do > @@ -50,7 +42,11 @@ do_compile() { > > for DTS_FILE in ${DEVICETREE}; do > DTS_NAME=`basename -s .dts ${DTS_FILE}` > - dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DTS_NAME}.dtb > ${DTS_FILE} > + for d in ${KERNEL_DTS_INCLUDE}; do > + dtc_include="${dtc_include} -i $d" > + done > + dtc -I dts -O dtb ${DEVICETREE_FLAGS} -i > ${WORKDIR}/devicetree \ > + ${dtc_include} -o ${DTS_NAME}.dtb ${DTS_FILE} > done > } > > -- > 1.9.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
Re: [meta-xilinx] Can SPL be used instead of FSBL?
On Fri, Mar 4, 2016 at 7:48 PM, avallashwrote: > Hi, > That's great news. Could you point me in the right direction? > Is there a thread discussing this topic in detail? I don't think there is a thread discussing the recipe setup process although there are a few regarding using u-boot 2016.01 for QSPI boot. Although there are some patches/things missing from 2016.01 which are required for a QSPI boot specifically. You will want to use u-boot master the newest 2016.03 rc tag. Threads that might be useful: http://thread.gmane.org/gmane.linux.embedded.yocto.meta-xilinx/67 http://thread.gmane.org/gmane.linux.embedded.yocto.meta-xilinx/41 For getting a recipe, clone the http://git.openembedded.org/openembedded-core/tree/meta/recipes-bsp/u-boot/u-boot_2016.01.bb recipe (with updated version number) from oe-core into your layer/meta-xilinx and update it to the srcrev you want to use. Set UBOOT_BINARY = "u-boot-dtb.img", in local.conf (meta-xilinx sets this to just u-boot.img for u-boot-xlnx) Set SPL_BINARY = "", in local.conf (the u-boot recipe cant handle the nested spl/boot.bin at the moment) If you are using the zc706 then the ps7_init is already in u-boot, if you are using something else you will need to configure u-boot to use your custom ps7_init. After this you should be good to build, note the boot.bin will not be in deploy/ grab it from work/.../u-boot/.../spl/boot.bin. Regards, Nathan > If there isn't, can you recall what needed fixing? > > Best regards, > Avallash > > > --- > Pozdrawiam, > Bogusz Brodziński > > On Thu, Mar 3, 2016 at 8:49 PM, Philip Balister wrote: >> >> On 03/03/2016 01:58 PM, avallash wrote: >> > Hi, >> > >> > I'm working with zynq7000 based system (in many areas similar to zc706) >> > and >> > currently I rely on FSBL generated by petalinux and I'm thinking of >> > dropping it and using u-boot's SPL as one of steps on gong full >> > bitbake/yocto. I have spent some time trying to configure and use SPL, >> > but >> > with no progress so far, both on my setup and zc706. >> > >> >> We use SPL all the time. FSBL workflow is too painful. >> >> > As I understand from this thread >> > https://www.mail-archive.com/meta-xilinx@yoctoproject.org/msg00072.html >> > >> > SPL at this time can't boot from QSPI, correct? >> > >> >> It can with patches :) I have somethign very close to u-boot master >> working well on the pico zed and a carrier. >> >> Philip >> >> > I do not need to load bitstream during boot (so no need to package the >> > preloader with bootgen). >> > I have a layout of partitions, where I have 2 u-boot images (SW update >> > requires this) placed further in the flash (aligned to erase block >> > sizes). >> > I also get ps7_init_gpl.* from time to time, so I would prefer to use >> > them. >> > >> > What preloader should i use to boot the device, if SPL is not an option? >> > >> > Best regards, >> > avallash >> > >> > >> > > > > > -- > ___ > 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] [PATCH 2/6] linux-xlnx_4.0: Drop this version is it superseded
The 4.0/xilinx-v2015.4.01 version of the linux-xlnx is dropped in favour of the newer 4.4/xilinx-v2016.1 kernel. Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- recipes-kernel/linux/linux-xlnx_4.0.bb | 10 -- 1 file changed, 10 deletions(-) delete mode 100644 recipes-kernel/linux/linux-xlnx_4.0.bb diff --git a/recipes-kernel/linux/linux-xlnx_4.0.bb b/recipes-kernel/linux/linux-xlnx_4.0.bb deleted file mode 100644 index 689f0b9..000 --- a/recipes-kernel/linux/linux-xlnx_4.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -LINUX_VERSION = "4.0" -# This points at the 'xilinx-v2015.4.01' tag -SRCREV ?= "468329e7fac2b22e76897fbd40532cc0884ded2a" - -include linux-xlnx.inc - -SRC_URI_append_zybo-linux-bd-zynq7 = " \ - file://0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch \ - file://0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch \ -" \ No newline at end of file -- 2.8.1 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 1/6] machine-xilinx-default.inc: Update default linux-yocto version to 4.4
Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- conf/machine/include/machine-xilinx-default.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc index e4f9d7f..f645e48 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc @@ -13,7 +13,7 @@ XILINX_DEFAULT_KERNEL_zynqmp := "linux-yocto" PREFERRED_PROVIDER_virtual/kernel ??= "${XILINX_DEFAULT_KERNEL}" PREFERRED_VERSION_linux-xlnx ?= "4.4%" -PREFERRED_VERSION_linux-yocto ?= "4.1%" +PREFERRED_VERSION_linux-yocto ?= "4.4%" # U-Boot Configuration XILINX_DEFAULT_UBOOT := "u-boot-xlnx" -- 2.8.1 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH 0/6] Version changes and fixes
On Thu, May 12, 2016 at 12:22 AM, Nathan Rossi <nat...@nathanrossi.com> wrote: > This series contains a number of patches to update preferred versions, > drop older recipes as well as a number of fixes to a variety of issues. Merged. Regards, Nathan > > Nathan Rossi (6): > machine-xilinx-default.inc: Update default linux-yocto version to 4.4 > linux-xlnx_4.0: Drop this version is it superseded > linux/config: Clean up unused config fragments > linux-yocto_4.1: Fix up "amba" node label for Zynq include > device-tree: Add include for dummy qspi node > gcc-source_4.9: Backport MicroBlaze musl libc support > > conf/machine/include/machine-xilinx-default.inc| 2 +- > recipes-bsp/device-tree/device-tree.bb | 5 +++- > .../files/common/zynq-7000-qspi-dummy.dtsi | 4 > .../device-tree/files/microzed/microzed-zynq7.dts | 6 + > .../device-tree/files/picozed/picozed-zynq7.dts| 6 + > recipes-bsp/device-tree/files/qemu/qemuzynq.dts| 4 +--- > .../files/zybo-linux-bd/zybo-linux-bd-zynq7.dts| 3 ++- > .../bsp/xilinx/soc/linux-xlnx/xlnx-3.14-usb.cfg| 14 --- > .../bsp/xilinx/soc/linux-xlnx/xlnx-3.14-usb.scc| 5 > recipes-kernel/linux/linux-xlnx_4.0.bb | 10 > recipes-kernel/linux/linux-yocto_4.1.bbappend | 5 > .../ARM-dts-zynq-Add-label-for-amba-node.patch | 27 > ++ > recipes-microblaze/gcc/gcc-source_4.9.bbappend | 7 ++ > 13 files changed, 53 insertions(+), 45 deletions(-) > create mode 100644 > recipes-bsp/device-tree/files/common/zynq-7000-qspi-dummy.dtsi > delete mode 100644 > recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/xlnx-3.14-usb.cfg > delete mode 100644 > recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/xlnx-3.14-usb.scc > delete mode 100644 recipes-kernel/linux/linux-xlnx_4.0.bb > create mode 100644 > recipes-kernel/linux/linux/ARM-dts-zynq-Add-label-for-amba-node.patch > create mode 100644 recipes-microblaze/gcc/gcc-source_4.9.bbappend > > -- > 2.8.1 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH v2 00/14] Update KC705 kit recipes
On Fri, May 13, 2016 at 10:31 AM, Manjukumar Mathawrote: > KC705 reference design is outdated and no longer maintained. This patch series > updates the required components for KC705 kit. Hi Manju, I have applied this series. Thanks, Nathan > > Manjukumar Matha (14): > u-boot-xlnx_2016.01.bb: Remove kc705-trd > linux-xilinx-machines.inc: Remove kc705-trd > kc705-trd-microblazeel: Remove kc705-trd files > feature-microblaze-*.inc: Updated to v9.6 > kc705-microblazeel.scc: Add KC705 linux config > xilinx.cfg: Enable CONFIG_XILINX_PHY > kc705-microblazeel: Add u-boot patch for KC705 > kc705-bitstream_2016.1.bb: Add prebuilt bitstream > kc705-microblazeel.dts: Add KC705 dts > machine-xilinx-default.inc: uboot format is bin > linux-xilinx-machines.inc: Add KC705 cfg to kernel > u-boot-xlnx_2016.01.bb: Add KC705 definitions > kc705-microblazeel.conf: Support for KC705 kit > docs/BOOT.tftp: Update KC705 boot documentation > > conf/machine/include/machine-xilinx-default.inc|1 + > .../include/microblaze/feature-microblaze-v9.inc |4 + > .../microblaze/feature-microblaze-versions.inc | 17 +- > conf/machine/kc705-microblazeel.conf | 24 + > conf/machine/kc705-trd-microblazeel.conf | 29 - > docs/BOOT.tftp |4 +- > .../device-tree/files/kc705/kc705-microblazeel.dts | 51 + > .../files/kc705/kc705-trd-microblazeel.dts | 527 - > recipes-bsp/device-tree/files/kc705/pl.dtsi| 410 +++ > .../device-tree/files/kc705/system-conf.dtsi | 49 + > .../reference-design/kc705-bitstream_2016.1.bb | 42 + > recipes-bsp/reference-design/kc705-trd_2013.1.bb | 42 - > ...aze-kc705-Convert-microblaze-generic-to-k.patch | 1156 > > ...kc705-trd-Convert-microblaze-generic-to-k.patch | 656 --- > recipes-bsp/u-boot/u-boot-xlnx_2016.01.bb |2 +- > .../bsp/xilinx/soc/linux-xlnx/drivers/xilinx.cfg |1 + > .../bsp/kc705-microblazeel/kc705-microblazeel.cfg | 13 + > .../bsp/kc705-microblazeel/kc705-microblazeel.scc |4 + > .../kc705-trd-microblazeel.cfg | 14 - > .../kc705-trd-microblazeel.scc |4 - > recipes-kernel/linux/linux-xilinx-machines.inc |2 +- > 21 files changed, 1768 insertions(+), 1284 deletions(-) > create mode 100644 conf/machine/kc705-microblazeel.conf > delete mode 100644 conf/machine/kc705-trd-microblazeel.conf > create mode 100644 recipes-bsp/device-tree/files/kc705/kc705-microblazeel.dts > delete mode 100644 > recipes-bsp/device-tree/files/kc705/kc705-trd-microblazeel.dts > create mode 100644 recipes-bsp/device-tree/files/kc705/pl.dtsi > create mode 100644 recipes-bsp/device-tree/files/kc705/system-conf.dtsi > create mode 100644 recipes-bsp/reference-design/kc705-bitstream_2016.1.bb > delete mode 100644 recipes-bsp/reference-design/kc705-trd_2013.1.bb > create mode 100644 > recipes-bsp/u-boot/u-boot-xlnx/microblaze-kc705-Convert-microblaze-generic-to-k.patch > delete mode 100644 > recipes-bsp/u-boot/u-boot-xlnx/microblaze-kc705-trd-Convert-microblaze-generic-to-k.patch > create mode 100644 > recipes-kernel/linux/config/xilinx-machine/bsp/kc705-microblazeel/kc705-microblazeel.cfg > create mode 100644 > recipes-kernel/linux/config/xilinx-machine/bsp/kc705-microblazeel/kc705-microblazeel.scc > delete mode 100644 > recipes-kernel/linux/config/xilinx-machine/bsp/kc705-trd-microblazeel/kc705-trd-microblazeel.cfg > delete mode 100644 > recipes-kernel/linux/config/xilinx-machine/bsp/kc705-trd-microblazeel/kc705-trd-microblazeel.scc > > -- > 2.1.4 > > -- > ___ > 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
Re: [meta-xilinx] linux-xlnx_4.4.bb: Update to xilinx-v2016.1.01 tag
On Fri, May 13, 2016 at 5:58 AM, Manjukumar Mathawrote: > Update Xilinx kernel to release tag xilinx-v2016.1.01 Applied. Thanks, Nathan > > Signed-off-by: Manjukumar Matha > --- > recipes-kernel/linux/linux-xlnx_4.4.bb | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/recipes-kernel/linux/linux-xlnx_4.4.bb > b/recipes-kernel/linux/linux-xlnx_4.4.bb > index 2fc1cc5..195b9fb 100644 > --- a/recipes-kernel/linux/linux-xlnx_4.4.bb > +++ b/recipes-kernel/linux/linux-xlnx_4.4.bb > @@ -1,6 +1,6 @@ > LINUX_VERSION = "4.4" > -# This points to released tag xilinx-v2016.1 > -SRCREV ?="dd7c1f0b5c23bcac5046d77bd5e0631e657003a4" > +# This points to released tag xilinx-v2016.1.01 > +SRCREV ?="89cc643affcce18122373fe7c78e780526243fdf" > > include linux-xlnx.inc > > -- > 2.1.4 > > -- > ___ > 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
Re: [meta-xilinx] [PATCH v1] qemuzynmp: Add the qemuzynqmp machine
On Fri, May 13, 2016 at 6:11 AM, Alistair Franciswrote: > Add the qemuzynqmp machine based on the physical ZCU02 revB board. Hi Alistair, So I am a little confused, is this machine supposed to emulate the ep108 (the args to QEMU appear to be for the ep108) or the zcu102? or are both able to be emulated? > > Signed-off-by: Alistair Francis > --- > This patch relies on QEMU ZynqMP support in the Yocto scripts. > I am sending a patch for that as well. Also in regards to adding the qemu config to oe-core/runqemu. It might also be worth looking into a recent RFC that was posted for oe-core (http://patchwork.openembedded.org/patch/122049/). Regards, Nathan > > conf/machine/qemuzynqmp.conf| 21 + > recipes-kernel/linux/linux-xlnx.inc | 4 +++- > 2 files changed, 24 insertions(+), 1 deletion(-) > create mode 100644 conf/machine/qemuzynqmp.conf > > diff --git a/conf/machine/qemuzynqmp.conf b/conf/machine/qemuzynqmp.conf > new file mode 100644 > index 000..c5ca3c9 > --- /dev/null > +++ b/conf/machine/qemuzynqmp.conf > @@ -0,0 +1,21 @@ > +#@TYPE: Machine > +#@NAME: qemuzynqmp > +#@DESCRIPTION: Zynq UltraScale+ QEMU machine support ('xlnx-ep108' model) > + > +require conf/machine/include/tune-zynqmp.inc > +require conf/machine/include/machine-xilinx-default.inc > +require conf/machine/include/machine-xilinx-board.inc > + > +MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" > + > +EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" > + > +UBOOT_MACHINE = "xilinx_zynqmp_zcu102_revB_defconfig" > + > +SERIAL_CONSOLE = "115200 ttyPS0" > + > +KERNEL_DEVICETREE = "xilinx/zynqmp-zcu102-revB.dtb" > +QEMU_DTB = "Image-zynqmp-zcu102-revB" > + > +PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" > +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" > diff --git a/recipes-kernel/linux/linux-xlnx.inc > b/recipes-kernel/linux/linux-xlnx.inc > index fe0a2ad..f152a7d 100644 > --- a/recipes-kernel/linux/linux-xlnx.inc > +++ b/recipes-kernel/linux/linux-xlnx.inc > @@ -19,10 +19,12 @@ require recipes-kernel/linux/linux-yocto.inc > > DESCRIPTION = "Xilinx Kernel" > > +KBUILD_DEFCONFIG_qemuzynqmp = "xilinx_zynqmp_defconfig" > +KCONFIG_MODE_qemuzynqmp = "--alldefconfig" > + > require linux-xilinx-configs.inc > require linux-xilinx-machines.inc > > KERNEL_FEATURES_append = " bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc" > KERNEL_FEATURES_append_zynq = " bsp/xilinx/soc/linux-xlnx/drivers/zynq7.scc" > KERNEL_FEATURES_append_zynqmp = " > bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc" > - > -- > 2.7.4 > -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH v1] recipes-zynqmp: qemu: Update the backported patches
On Fri, May 13, 2016 at 3:07 AM, Alistair Franciswrote: > The meta layer has updated QEMU to version 2.5.1 which includes a patch > that touches some of the target-arm code. This causes the backported > QEMU patch included in meta-xilinx to not apply. > > This patch updates the patch to apply to QEMU 2.5.1. Looks good, will apply once I branch krogoth as the 2.5.1 update is only in master. Regards, Nathan > > Signed-off-by: Alistair Francis > --- > .../qemu/files/4054bfa9e7986c9b7d2bf70f9e10af9647e376fc.patch | 8 > > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git > a/recipes-zynqmp/qemu/files/4054bfa9e7986c9b7d2bf70f9e10af9647e376fc.patch > b/recipes-zynqmp/qemu/files/4054bfa9e7986c9b7d2bf70f9e10af9647e376fc.patch > index a8b4ffe..50a17c4 100644 > --- a/recipes-zynqmp/qemu/files/4054bfa9e7986c9b7d2bf70f9e10af9647e376fc.patch > +++ b/recipes-zynqmp/qemu/files/4054bfa9e7986c9b7d2bf70f9e10af9647e376fc.patch > @@ -1,4 +1,4 @@ > -From 4054bfa9e7986c9b7d2bf70f9e10af9647e376fc Mon Sep 17 00:00:00 2001 > +From 9b3c2f321954251e3eb0c908786d0b6953fe9f79 Mon Sep 17 00:00:00 2001 > From: Alistair Francis > Date: Thu, 18 Feb 2016 14:16:17 + > Subject: [PATCH] target-arm: Add the pmceid0 and pmceid1 registers > @@ -62,10 +62,10 @@ diff --git a/target-arm/helper.c b/target-arm/helper.c > index a420a2a..6a4ec01 100644 > --- a/target-arm/helper.c > +++ b/target-arm/helper.c > -@@ -4380,6 +4380,22 @@ void register_cp_regs_for_features(ARMCPU *cpu) > - .opc0 = 3, .opc1 = 0, .crn = 0, .crm = 3, .opc2 = 2, > +@@ -4324,6 +4324,22 @@ void register_cp_regs_for_features(ARMCPU *cpu) > + .opc0 = 3, .opc1 = 0, .crn = 0, .crm = 3, .opc2 = 7, > .access = PL1_R, .type = ARM_CP_CONST, > - .resetvalue = cpu->mvfr2 }, > + .resetvalue = 0 }, > +{ .name = "PMCEID0", .state = ARM_CP_STATE_AA32, > + .cp = 15, .opc1 = 0, .crn = 9, .crm = 12, .opc2 = 6, > + .access = PL0_R, .accessfn = pmreg_access, .type = > ARM_CP_CONST, > -- > 2.7.4 > -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH v1] recipes-zynqmp: qemu: Update the backported patches
On Sat, May 14, 2016 at 1:19 AM, Alistair Francis <alistair.fran...@xilinx.com> wrote: > On Fri, May 13, 2016 at 2:32 AM, Nathan Rossi <nat...@nathanrossi.com> wrote: >> On Fri, May 13, 2016 at 3:07 AM, Alistair Francis >> <alistair.fran...@xilinx.com> wrote: >>> The meta layer has updated QEMU to version 2.5.1 which includes a patch >>> that touches some of the target-arm code. This causes the backported >>> QEMU patch included in meta-xilinx to not apply. >>> >>> This patch updates the patch to apply to QEMU 2.5.1. >> >> Looks good, will apply once I branch krogoth as the 2.5.1 update is >> only in master. > > Thanks Nathan! > > I'm a little confused though, why can't you just apply it to master now? Sorry, your commit message confused me into thinking the update in the patch required that the patch only be applied to the 2.5.1 version of QEMU (and would not apply to 2.5.0 which is what is available in krogoth). Anyways, I have applied this patch. Thanks, Nathan > > Thanks, > > Alistair > >> >> Regards, >> Nathan >> >>> >>> Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com> >>> --- >>> .../qemu/files/4054bfa9e7986c9b7d2bf70f9e10af9647e376fc.patch | 8 >>> >>> 1 file changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git >>> a/recipes-zynqmp/qemu/files/4054bfa9e7986c9b7d2bf70f9e10af9647e376fc.patch >>> b/recipes-zynqmp/qemu/files/4054bfa9e7986c9b7d2bf70f9e10af9647e376fc.patch >>> index a8b4ffe..50a17c4 100644 >>> --- >>> a/recipes-zynqmp/qemu/files/4054bfa9e7986c9b7d2bf70f9e10af9647e376fc.patch >>> +++ >>> b/recipes-zynqmp/qemu/files/4054bfa9e7986c9b7d2bf70f9e10af9647e376fc.patch >>> @@ -1,4 +1,4 @@ >>> -From 4054bfa9e7986c9b7d2bf70f9e10af9647e376fc Mon Sep 17 00:00:00 2001 >>> +From 9b3c2f321954251e3eb0c908786d0b6953fe9f79 Mon Sep 17 00:00:00 2001 >>> From: Alistair Francis <alistair.fran...@xilinx.com> >>> Date: Thu, 18 Feb 2016 14:16:17 + >>> Subject: [PATCH] target-arm: Add the pmceid0 and pmceid1 registers >>> @@ -62,10 +62,10 @@ diff --git a/target-arm/helper.c b/target-arm/helper.c >>> index a420a2a..6a4ec01 100644 >>> --- a/target-arm/helper.c >>> +++ b/target-arm/helper.c >>> -@@ -4380,6 +4380,22 @@ void register_cp_regs_for_features(ARMCPU *cpu) >>> - .opc0 = 3, .opc1 = 0, .crn = 0, .crm = 3, .opc2 = 2, >>> +@@ -4324,6 +4324,22 @@ void register_cp_regs_for_features(ARMCPU *cpu) >>> + .opc0 = 3, .opc1 = 0, .crn = 0, .crm = 3, .opc2 = 7, >>> .access = PL1_R, .type = ARM_CP_CONST, >>> - .resetvalue = cpu->mvfr2 }, >>> + .resetvalue = 0 }, >>> +{ .name = "PMCEID0", .state = ARM_CP_STATE_AA32, >>> + .cp = 15, .opc1 = 0, .crn = 9, .crm = 12, .opc2 = 6, >>> + .access = PL0_R, .accessfn = pmreg_access, .type = >>> ARM_CP_CONST, >>> -- >>> 2.7.4 >>> >> -- >> ___ >> 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
Re: [meta-xilinx] linux-xlnx.inc: Use kernel defconfig for ZynqMP
On Sat, May 14, 2016 at 7:32 AM, Manjukumar Mathawrote: > Use Xilinx kernel defconfig settings for ZCU102 board Applied. Thanks, Nathan > > Signed-off-by: Manjukumar Matha > --- > recipes-kernel/linux/linux-xlnx.inc | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/recipes-kernel/linux/linux-xlnx.inc > b/recipes-kernel/linux/linux-xlnx.inc > index fe0a2ad..c0c2bd5 100644 > --- a/recipes-kernel/linux/linux-xlnx.inc > +++ b/recipes-kernel/linux/linux-xlnx.inc > @@ -22,6 +22,9 @@ DESCRIPTION = "Xilinx Kernel" > require linux-xilinx-configs.inc > require linux-xilinx-machines.inc > > +KBUILD_DEFCONFIG_zcu102-zynqmp = "xilinx_zynqmp_defconfig" > +KCONFIG_MODE_zcu102-zynqmp = "--alldefconfig" > + > KERNEL_FEATURES_append = " bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc" > KERNEL_FEATURES_append_zynq = " bsp/xilinx/soc/linux-xlnx/drivers/zynq7.scc" > KERNEL_FEATURES_append_zynqmp = " > bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc" > -- > 2.1.4 > > -- > ___ > 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
Re: [meta-xilinx] [PATCH v1] qemuzynmp: Add the qemuzynqmp machine
On Sat, May 14, 2016 at 2:54 AM, Alistair Francis <alistair.fran...@xilinx.com> wrote: > On Fri, May 13, 2016 at 2:35 AM, Nathan Rossi <nat...@nathanrossi.com> wrote: >> On Fri, May 13, 2016 at 6:11 AM, Alistair Francis >> <alistair.fran...@xilinx.com> wrote: >>> Add the qemuzynqmp machine based on the physical ZCU02 revB board. >> >> Hi Alistair, >> >> So I am a little confused, is this machine supposed to emulate the >> ep108 (the args to QEMU appear to be for the ep108) or the zcu102? or >> are both able to be emulated? > > Hey Nathan, > > This machine is supposed to be emulating the ZCU102. > > At the moment we only have the EP108 in upstream QEMU. It isn't worth > adding a ZCU102 model upstream yet as at the moment we don't have > enough modeled upstream to notice any differences between the boards. Ah ok, so in the future QEMU will have models for both the EP108 and the ZCU102 boards. In that case I don't actually see a need for a 'qemuzynqmp' machine, since the ep108-zynqmp already provides the setup for QEMU. The same can be done for the zcu102-zynqmp board, this would also make it easier to maintain consistency (aka changes only need to be made to the zcu102-zynqmp machine). > >> >>> >>> Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com> >>> --- >>> This patch relies on QEMU ZynqMP support in the Yocto scripts. >>> I am sending a patch for that as well. >> >> Also in regards to adding the qemu config to oe-core/runqemu. It might >> also be worth looking into a recent RFC that was posted for oe-core >> (http://patchwork.openembedded.org/patch/122049/). > > Hmm... interesting. Thanks for pointing that out. > > I don't follow the OE-core mailing list (until yesterday) do you know > if that series is gaining traction? I believe so, at least that is how it appears from the discussions on list. I am definitely interested in seeing it applied, I haven't had a chance to test it just yet though. Regarding getting a zynqmp machine into oe-core/runqemu. If this runqemu refactoring is going to make it into the next oe release then I recommend working towards that as opposed to just getting zynqmp support into runqemu. As it would also better work towards the ability to have both the ep108 and zcu102 models available in the future. Regards, Nathan > > Thanks, > > Alistair > >> >> Regards, >> Nathan >> >>> >>> conf/machine/qemuzynqmp.conf| 21 + >>> recipes-kernel/linux/linux-xlnx.inc | 4 +++- >>> 2 files changed, 24 insertions(+), 1 deletion(-) >>> create mode 100644 conf/machine/qemuzynqmp.conf >>> >>> diff --git a/conf/machine/qemuzynqmp.conf b/conf/machine/qemuzynqmp.conf >>> new file mode 100644 >>> index 000..c5ca3c9 >>> --- /dev/null >>> +++ b/conf/machine/qemuzynqmp.conf >>> @@ -0,0 +1,21 @@ >>> +#@TYPE: Machine >>> +#@NAME: qemuzynqmp >>> +#@DESCRIPTION: Zynq UltraScale+ QEMU machine support ('xlnx-ep108' model) >>> + >>> +require conf/machine/include/tune-zynqmp.inc >>> +require conf/machine/include/machine-xilinx-default.inc >>> +require conf/machine/include/machine-xilinx-board.inc >>> + >>> +MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" >>> + >>> +EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" >>> + >>> +UBOOT_MACHINE = "xilinx_zynqmp_zcu102_revB_defconfig" >>> + >>> +SERIAL_CONSOLE = "115200 ttyPS0" >>> + >>> +KERNEL_DEVICETREE = "xilinx/zynqmp-zcu102-revB.dtb" >>> +QEMU_DTB = "Image-zynqmp-zcu102-revB" >>> + >>> +PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" >>> +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" >>> diff --git a/recipes-kernel/linux/linux-xlnx.inc >>> b/recipes-kernel/linux/linux-xlnx.inc >>> index fe0a2ad..f152a7d 100644 >>> --- a/recipes-kernel/linux/linux-xlnx.inc >>> +++ b/recipes-kernel/linux/linux-xlnx.inc >>> @@ -19,10 +19,12 @@ require recipes-kernel/linux/linux-yocto.inc >>> >>> DESCRIPTION = "Xilinx Kernel" >>> >>> +KBUILD_DEFCONFIG_qemuzynqmp = "xilinx_zynqmp_defconfig" >>> +KCONFIG_MODE_qemuzynqmp = "--alldefconfig" >>> + >>> require linux-xilinx-configs.inc >>> require linux-xilinx-machines.inc >>> >>> KERNEL_FEATURES_append = " bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc" >>> KERNEL_FEATURES_append_zynq = " >>> bsp/xilinx/soc/linux-xlnx/drivers/zynq7.scc" >>> KERNEL_FEATURES_append_zynqmp = " >>> bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc" >>> - >>> -- >>> 2.7.4 >>> >> -- >> ___ >> 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
Re: [meta-xilinx] zynqmp-zcu102: Recipe for ZCU102 board
On Tue, May 3, 2016 at 3:28 AM, Manjukumar Harthikote Matha <manjukumar.harthikote-ma...@xilinx.com> wrote: > Hi Nathan, > > On 05/02/2016 08:27 AM, Nathan Rossi wrote: > <...> >>> >>> diff --git a/conf/machine/zynqmp-zcu102.conf >>> b/conf/machine/zynqmp-zcu102.conf >>> new file mode 100644 >>> index 000..a41679f >>> --- /dev/null >>> +++ b/conf/machine/zynqmp-zcu102.conf >>> @@ -0,0 +1,21 @@ >>> +#@TYPE: Machine >>> +#@NAME: zynqmp-zcu102 >> >> >> Please follow the existing convention for machine names in >> meta-xilinx. This should be "zcu102-zynqmp". >> > This was named to match with Xilinx kernel board information, dts, configs > etc. > > https://github.com/Xilinx/linux-xlnx/blob/18636b66d01d4f4c22d836226c04a57f2416e16f/arch/arm64/boot/dts/xilinx/zynqmp-zcu102.dts That's fine, but the convention in meta-xilinx is "--". > >>> +#@DESCRIPTION: Machine support for ZCU102 Evaluation Board. >>> +# >>> + >>> +require conf/machine/include/tune-zynqmp.inc >>> +require conf/machine/include/machine-xilinx-default.inc >>> +require conf/machine/include/machine-xilinx-board.inc >>> + >>> +MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" >>> + >>> +UBOOT_MACHINE = "xilinx_zynqmp_zcu102_revB_defconfig" >>> + >>> +SERIAL_CONSOLE = "115200 ttyPS0" >>> + >>> +KERNEL_DEVICETREE = "xilinx/zynqmp-zcu102-revB.dtb" >>> +KCONFIG_MODE = "--alldefconfig" >> >> >> This is a kernel variable, why does it need to be set at the machine >> level? >> > Will send a updated v2 patch. > The board configuration will be using the kernel configuration by default > KBUILD_DEFCONFIG_zynqmp = "xilinx_zynqmp_defconfig" > KCONFIG_MODE = "--alldefconfig" Those variables should be set in the corresponding kernel recipe and not in the machine config. Otherwise they will conflict with other kernels that provide support for this machine (e.g. linux-yocto). Regards, Nathan -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH v2] zcu102-zynqmp.conf: Add support for ZCU102 board
On Wed, May 4, 2016 at 8:30 AM, Manjukumar Mathawrote: > Add support for ZCU102 Zynq UltraScale+ MPSoC evaluation board > > Signed-off-by: Manjukumar Matha > --- > conf/machine/zcu102-zynqmp.conf | 23 +++ > 1 file changed, 23 insertions(+) > create mode 100644 conf/machine/zcu102-zynqmp.conf > > diff --git a/conf/machine/zcu102-zynqmp.conf b/conf/machine/zcu102-zynqmp.conf > new file mode 100644 > index 000..1d1a78e > --- /dev/null > +++ b/conf/machine/zcu102-zynqmp.conf > @@ -0,0 +1,23 @@ > +#@TYPE: Machine > +#@NAME: zynqmp-zcu102 > +#@DESCRIPTION: Machine support for ZCU102 Evaluation Board. > +# > + > +require conf/machine/include/tune-zynqmp.inc > +require conf/machine/include/machine-xilinx-default.inc > +require conf/machine/include/machine-xilinx-board.inc > + > +MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" > + > +UBOOT_MACHINE = "xilinx_zynqmp_zcu102_revB_defconfig" > + > +SERIAL_CONSOLE = "115200 ttyPS0" > + > +KERNEL_DEVICETREE = "xilinx/zynqmp-zcu102-revB.dtb" > + > +PREFERRED_PROVIDER_virtual/kernel = "linux-xlnx" > +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-xlnx" I modified your patch to change these to ?=, for easy setting in local.conf. But otherwise I have applied this patch. Thanks, Nathan > + > +EXTRA_IMAGEDEPENDS += "\ > + arm-trusted-firmware \ > + " > -- > 2.1.4 > > -- > ___ > 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
Re: [meta-xilinx] [RFC] machine-xilinx-default.inc: Include kernel modules
On Wed, May 4, 2016 at 4:04 PM, Manjukumar Mathawrote: > Include kernel modules for ZynqMP. Kernel modules will be needed when > including > mali modules. > > Signed-off-by: Manjukumar Matha > --- > conf/machine/include/machine-xilinx-default.inc | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/conf/machine/include/machine-xilinx-default.inc > b/conf/machine/include/machine-xilinx-default.inc > index 2df8f4d..ad5465d 100644 > --- a/conf/machine/include/machine-xilinx-default.inc > +++ b/conf/machine/include/machine-xilinx-default.inc > @@ -32,3 +32,4 @@ UBOOT_BINARY ?= "u-boot${UBOOT_OFEMBED}.${UBOOT_SUFFIX}" > UBOOT_ELF ?= "u-boot" > UBOOT_ELF_aarch64 ?= "u-boot.elf" > > +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_zynqmp = "kernel-modules" This looks fine, given the ZynqMP's storage and memory options the increase in rootfs size (for core-image-minimal) is not particularly problematic in my opinion. But if you do know the exact modules that are needed then setting just those to be included would work well too. I can apply this if you would like? Regards, Nathan > -- > 2.1.4 > > -- > ___ > 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
Re: [meta-xilinx] [RFC] machine-xilinx-default.inc: Add XSERVER
On Fri, May 6, 2016 at 2:42 AM, Manjukumar Harthikote Matha <manjukumar.harthikote-ma...@xilinx.com> wrote: > Hi Nathan > > On 05/05/2016 04:58 AM, Nathan Rossi wrote: >> >> On Thu, May 5, 2016 at 6:06 PM, Manjukumar Matha >> <manjukumar.harthikote-ma...@xilinx.com> wrote: >>> >>> Add X org X server configurations for ZynqMP. >> >> > [] >>> >>> +XSERVER = " \ >> >> >> ?= (since this is an include) > > Ok >> >> >>> + xserver-xorg \ >>> + xf86-input-evdev \ >>> + xf86-input-mouse \ >>> + xf86-input-keyboard \ >> >> >> Add 'xf86-video-fbdev' to match the default (set in >> packagegroup-core-x11-xserver). > > The reason was we need xf86-video-armsoc for ZynqMP. Maybe I need to > decouple for other architectures and ZynqMP It is fine, in general it is common to install multiple xf86-video-* packages, and zynqmp can use fbdev. The xf86-video-armsoc can be added to the zynqmp specific additions. The "Driver" setting from your other patch for xf86-video-armsoc which adds the "xf86-video-armsoc/20-zynqmp.conf" config will set xserver to use armsoc. > >> >>> + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', >>> 'xserver-xorg-extension-glx', '', d)} \ >> >> >> Not sure about this one specifically for Zynq and MicroBlaze, since >> neither have GL compatible hw. Probably worth setting this via another >> variable that can be expanded later for soc/arch/machine specifics, >> something like: > > > Mesa libraries work for Zynq but I am not sure about MicroBlaze As a software implementation sure, but I am not sure if it is worth including by default on those targets. For this patch, make it specific for zynqmp only, can add it for other targets later if it makes sense. >> >> >> XSERVER_EXT ?= "" >> XSERVER_EXT_zynqmp ?= "${@bb.utils.contains('DISTRO_FEATURES', >> 'opengl', 'xserver-xorg-extension-glx', '', d)}" >> > Ok thanks, I was thinking on similar lines to add xf86-video-armsoc in > tune-zynqmp. I will rework to add it in machine-xilinx-default Adding the 'xf86-video-armsoc' in machine-xilinx-default.inc is probably the best place to put it. The tune include is not really intended for these sorts of configs. Regards, Nathan -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH] machine-xilinx-default.inc: Default to xlnx kernel
On Tue, Apr 26, 2016 at 11:40 AM, Manjukumar Mathawrote: > Use Xilinx kernel by default for zynqmp. Hi Manju, Could you elaborate more on why this change is required? I would really like to keep the default as linux-yocto, but specific machines can select linux-xlnx when they need drivers/device-trees that are not yet in linux-yocto/mainline. Regards, Nathan > > Signed-off-by: Manjukumar Matha > --- > conf/machine/include/machine-xilinx-default.inc | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/conf/machine/include/machine-xilinx-default.inc > b/conf/machine/include/machine-xilinx-default.inc > index f8dc362..a8e0b34 100644 > --- a/conf/machine/include/machine-xilinx-default.inc > +++ b/conf/machine/include/machine-xilinx-default.inc > @@ -9,7 +9,6 @@ IMAGE_CLASSES += "image_types_uboot" > # Kernel Configuration > XILINX_DEFAULT_KERNEL := "linux-xlnx" > XILINX_DEFAULT_KERNEL_microblaze := "linux-yocto" > -XILINX_DEFAULT_KERNEL_zynqmp := "linux-yocto" > > PREFERRED_PROVIDER_virtual/kernel ??= "${XILINX_DEFAULT_KERNEL}" > PREFERRED_VERSION_linux-xlnx ?= "4.0%" > -- > 2.1.4 > > -- > ___ > 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
Re: [meta-xilinx] [PATCH] machine-xilinx-default.inc: Default to u-boot xlnx
On Tue, Apr 26, 2016 at 11:41 AM, Manjukumar Mathawrote: > Use Xilinx u-boot by default for ZynqMP. Hi Manju, Same for this one, could you elaborate more on why this change is required? Same as with the kernel I would really like to keep the default as upstream u-boot. Regards, Nathan > > Signed-off-by: Manjukumar Matha > --- > conf/machine/include/machine-xilinx-default.inc | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/conf/machine/include/machine-xilinx-default.inc > b/conf/machine/include/machine-xilinx-default.inc > index a8e0b34..1787039 100644 > --- a/conf/machine/include/machine-xilinx-default.inc > +++ b/conf/machine/include/machine-xilinx-default.inc > @@ -16,7 +16,6 @@ PREFERRED_VERSION_linux-yocto ?= "4.1%" > > # U-Boot Configuration > XILINX_DEFAULT_UBOOT := "u-boot-xlnx" > -XILINX_DEFAULT_UBOOT_zynqmp := "u-boot" > PREFERRED_PROVIDER_virtual/bootloader ??= "${XILINX_DEFAULT_UBOOT}" > > UBOOT_SUFFIX ?= "img" > -- > 2.1.4 > > -- > ___ > 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
Re: [meta-xilinx] [PATCH] machine-xilinx-default.inc: Default to v4.4 kernel
On Tue, Apr 26, 2016 at 11:41 AM, Manjukumar Mathawrote: > Default preferred version for Xilinx kernel is v4.4 Applied. Thanks, Nathan > > Signed-off-by: Manjukumar Matha > --- > conf/machine/include/machine-xilinx-default.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/conf/machine/include/machine-xilinx-default.inc > b/conf/machine/include/machine-xilinx-default.inc > index 1787039..dedb60d 100644 > --- a/conf/machine/include/machine-xilinx-default.inc > +++ b/conf/machine/include/machine-xilinx-default.inc > @@ -11,7 +11,7 @@ XILINX_DEFAULT_KERNEL := "linux-xlnx" > XILINX_DEFAULT_KERNEL_microblaze := "linux-yocto" > > PREFERRED_PROVIDER_virtual/kernel ??= "${XILINX_DEFAULT_KERNEL}" > -PREFERRED_VERSION_linux-xlnx ?= "4.0%" > +PREFERRED_VERSION_linux-xlnx ?= "4.4%" > PREFERRED_VERSION_linux-yocto ?= "4.1%" > > # U-Boot Configuration > -- > 2.1.4 > > -- > ___ > 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
Re: [meta-xilinx] [PATCH v2] u-boot-xlnx_2016.01.bb: v2016.01 release tag
On Wed, Apr 27, 2016 at 4:55 AM, Manjukumar Mathawrote: > Xilinx u-boot is tagged for release v2016.01 Applied. However I fixed up the version numbers for you. U-Boot version being 2016.01, and Xilinx release tag being 2016.1. Thanks, Nathan > > Signed-off-by: Manjukumar Matha > --- > recipes-bsp/u-boot/u-boot-xlnx_2016.01.bb | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/recipes-bsp/u-boot/u-boot-xlnx_2016.01.bb > b/recipes-bsp/u-boot/u-boot-xlnx_2016.01.bb > index 67c73da..6e696e6 100644 > --- a/recipes-bsp/u-boot/u-boot-xlnx_2016.01.bb > +++ b/recipes-bsp/u-boot/u-boot-xlnx_2016.01.bb > @@ -1,8 +1,8 @@ > include u-boot-xlnx.inc > include u-boot-spl-zynq-init.inc > > -# this matches u-boot-xlnx 'xilinx-v2016.?' release tag > -SRCREV = "68b454fbd9f7ce10e87e736888ea54c1655ce025" > +# this matches u-boot-xlnx 'xilinx-v2016.01' release tag > +SRCREV = "07b02489f2f11459bf5e402f34c5e84d20ebbbcf" > PV = "v2016.01${XILINX_EXTENSION}+git${SRCPV}" > > FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-xlnx:" > -- > 2.1.4 > > -- > ___ > 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
Re: [meta-xilinx] [meta-xilinx 09/14] kc705-microblazeel.dts: Add KC705 dts
On Tue, May 3, 2016 at 10:57 AM, Manjukumar Mathawrote: > Update the dts according to the hardware design > > Signed-off-by: Manjukumar Matha > --- > .../device-tree/files/kc705/kc705-microblazeel.dts | 523 > + > 1 file changed, 523 insertions(+) > create mode 100644 recipes-bsp/device-tree/files/kc705/kc705-microblazeel.dts > > diff --git a/recipes-bsp/device-tree/files/kc705/kc705-microblazeel.dts > b/recipes-bsp/device-tree/files/kc705/kc705-microblazeel.dts > new file mode 100644 > index 000..5de68e8 > --- /dev/null > +++ b/recipes-bsp/device-tree/files/kc705/kc705-microblazeel.dts > @@ -0,0 +1,523 @@ > +/dts-v1/; > + > +/ { > + model = "Xilinx MicroBlaze"; > + hard-reset-gpios = <0x1 0x0 0x1>; This dts looks like it is decompiled from a blob, it would be nice to have the original source (even if it is a set of split up dtsi's) so that all the values are in readable form, e.g. phandles as "" as well as having the ":" labels. Regards, Nathan -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [meta-xilinx 06/14] kc705-microblazeel.scc: Add KC705 linux config
On Tue, May 3, 2016 at 10:57 AM, Manjukumar Mathawrote: > Add kernel configuration for KC705 kit according to latest v9.6 MB support > > Signed-off-by: Manjukumar Matha > --- > .../bsp/kc705-microblazeel/kc705-microblazeel.cfg | 17 > + > .../bsp/kc705-microblazeel/kc705-microblazeel.scc | 4 > 2 files changed, 21 insertions(+) > create mode 100644 > recipes-kernel/linux/config/xilinx-machine/bsp/kc705-microblazeel/kc705-microblazeel.cfg > create mode 100644 > recipes-kernel/linux/config/xilinx-machine/bsp/kc705-microblazeel/kc705-microblazeel.scc > > diff --git > a/recipes-kernel/linux/config/xilinx-machine/bsp/kc705-microblazeel/kc705-microblazeel.cfg > > b/recipes-kernel/linux/config/xilinx-machine/bsp/kc705-microblazeel/kc705-microblazeel.cfg > new file mode 100644 > index 000..4752326 > --- /dev/null > +++ > b/recipes-kernel/linux/config/xilinx-machine/bsp/kc705-microblazeel/kc705-microblazeel.cfg > @@ -0,0 +1,17 @@ > +CONFIG_XILINX_MICROBLAZE0_FAMILY="kintex7" > + > +# CPU ISA Config > +CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1 > +CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1 > +CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1 > +CONFIG_XILINX_MICROBLAZE0_USE_DIV=1 > +CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2 > +CONFIG_XILINX_MICROBLAZE0_USE_FPU=0 > +CONFIG_XILINX_MICROBLAZE0_HW_VER="9.6" > + > +# Memory Base Address > +CONFIG_KERNEL_BASE_ADDR=0x8000 > + > +CONFIG_XILINX_AXI_EMAC=y > +CONFIG_BLK_DEV_INITRD=y > +CONFIG_XILINX_PHY=y These should be coming from the cfg fragments. CONFIG_XILINX_AXI_EMAC is enabled by 'xilinx-common/bsp/xilinx/soc/drivers/xilinx.cfg' CONFIG_BLK_DEV_INITRD is enabled by linux-yocto, linux-xlnx sets it via 'xilinx-base/ktypes/standard/standard.cfg' CONFIG_XILINX_PHY this config is linux-xlnx only, and this reference design does not need PCS/PMA as it is using GMII for the ethernet (at least with the default configuration of the board). However you can add this config option to 'xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/xilinx.cfg' for completeness, which will automatically be included when using the linux-xlnx kernel. Regards, Nathan > diff --git > a/recipes-kernel/linux/config/xilinx-machine/bsp/kc705-microblazeel/kc705-microblazeel.scc > > b/recipes-kernel/linux/config/xilinx-machine/bsp/kc705-microblazeel/kc705-microblazeel.scc > new file mode 100644 > index 000..aaf7c2a > --- /dev/null > +++ > b/recipes-kernel/linux/config/xilinx-machine/bsp/kc705-microblazeel/kc705-microblazeel.scc > @@ -0,0 +1,4 @@ > +define KFEATURE_DESCRIPTION "Kernel Config for kc705-microblazeel specific > setup" > +define KFEATURE_COMPATIBILITY board > + > +kconf hardware kc705-microblazeel.cfg > -- > 2.1.4 > > -- > ___ > 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
Re: [meta-xilinx] [RFC] xf86-video-armsoc_git.bb: Add xf86-video-armsoc
On Tue, May 3, 2016 at 11:30 AM, Manjukumar Mathawrote: > This patch adds support Xilinx ARM SOC display driver X server support > - Custom xorg config files for KB and Mouse > - X11 ARMSOC driver support Hi Manju, Just a few comments inline below. > > Signed-off-by: Manjukumar Matha > --- > ..._xilinx-Add-the-dumb-gem-support-for-Xili.patch | 99 > ++ > .../0002-enable-subdir-objects.patch | 13 +++ > .../xorg-driver/xf86-video-armsoc/10-input.conf| 11 +++ > .../xorg-driver/xf86-video-armsoc/20-zynqmp.conf | 15 > .../xorg-driver/xf86-video-armsoc_git.bb | 32 +++ > 5 files changed, 170 insertions(+) > create mode 100644 > recipes-graphics/xorg-driver/xf86-video-armsoc/0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch > create mode 100644 > recipes-graphics/xorg-driver/xf86-video-armsoc/0002-enable-subdir-objects.patch > create mode 100644 > recipes-graphics/xorg-driver/xf86-video-armsoc/10-input.conf > create mode 100644 > recipes-graphics/xorg-driver/xf86-video-armsoc/20-zynqmp.conf > create mode 100644 recipes-graphics/xorg-driver/xf86-video-armsoc_git.bb > > diff --git > a/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch > > b/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch > new file mode 100644 > index 000..0d8bb5c > --- /dev/null > +++ > b/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch > @@ -0,0 +1,99 @@ > +From 622db2862220b8fc2ae56e9caceac70cbb0c15ce Mon Sep 17 00:00:00 2001 > +From: Hyun Kwon > +Date: Wed, 21 Jan 2015 11:53:19 -0800 > +Subject: [PATCH 1/1] src: drmmode_xilinx: Add the dumb gem support for Xilinx > + > +Add the dumb gem support for Xilinx Out of query, what is the plan regarding this patch. Is the intention to contribute it to the upstream xf86-video-armsoc? > +--- > + src/drmmode_xilinx/drmmode_xilinx.c | 80 > + > + 1 file changed, 80 insertions(+) > + create mode 100644 src/drmmode_xilinx/drmmode_xilinx.c > + > +diff --git a/src/drmmode_xilinx/drmmode_xilinx.c > b/src/drmmode_xilinx/drmmode_xilinx.c > +new file mode 100644 > +index 000..2cd4e35 > +--- /dev/null > b/src/drmmode_xilinx/drmmode_xilinx.c > +@@ -0,0 +1,80 @@ > ++/* > ++ * Xilinx X11 ARMSOC driver > ++ * > ++ * Author: Hyun Woo Kwon > ++ * > ++ * Copyright (C) 2014 Xilinx, Inc. > ++ * > ++ * Based on drmmode_exynos.c > ++ * > ++ * Copyright © 2013 ARM Limited. > ++ * > ++ * Permission is hereby granted, free of charge, to any person obtaining a > ++ * copy of this software and associated documentation files (the > "Software"), > ++ * to deal in the Software without restriction, including without limitation > ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, > ++ * and/or sell copies of the Software, and to permit persons to whom the > ++ * Software is furnished to do so, subject to the following conditions: > ++ * > ++ * The above copyright notice and this permission notice (including the next > ++ * paragraph) shall be included in all copies or substantial portions of the > ++ * Software. > ++ * > ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS > OR > ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR > OTHER > ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > FROM, > ++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS > IN THE > ++ * SOFTWARE. > ++ * > ++ */ > ++ > ++#include > ++ > ++#include > ++#include > ++ > ++#include "../drmmode_driver.h" > ++ > ++static int create_custom_gem(int fd, struct armsoc_create_gem *create_gem) > ++{ > ++ struct drm_mode_create_dumb arg; > ++ int ret; > ++ > ++ memset(, 0, sizeof(arg)); > ++ arg.height = create_gem->height; > ++ arg.width = create_gem->width; > ++ arg.bpp = create_gem->bpp; > ++ > ++ ret = drmIoctl(fd, DRM_IOCTL_MODE_CREATE_DUMB, ); > ++ if (ret) > ++ return ret; > ++ > ++ create_gem->height = arg.height; > ++ create_gem->width = arg.width; > ++ create_gem->bpp = arg.bpp; > ++ create_gem->handle = arg.handle; > ++ create_gem->pitch = arg.pitch; > ++ create_gem->size = arg.size; > ++ > ++ return 0; > ++} > ++ > ++struct drmmode_interface xilinx_interface = { > ++ 1 /* use_page_flip_events */, > ++ 1 /* use_early_display */, > ++ 0 /* cursor width */, >
Re: [meta-xilinx] [RFC] mali-modules.bb: MALI kernel module recipe
On Tue, May 3, 2016 at 11:14 AM, Manjukumar Mathawrote: > This recipe builds kernel module for MALI 400. MALI 400 is supported in ZCU102 > UltraScale+ MPSoC evaluation board. > > Upstream status for Makefile patch : Pending You can just note that in the .patch file itself, above the first hunk like done with other patch files. > > Signed-off-by: Manjukumar Matha > --- > recipes-graphics/mali/mali-modules.bb | 35 > +++ > recipes-graphics/mali/mali-modules/Makefile.patch | 32 + > 2 files changed, 67 insertions(+) > create mode 100644 recipes-graphics/mali/mali-modules.bb > create mode 100644 recipes-graphics/mali/mali-modules/Makefile.patch > > diff --git a/recipes-graphics/mali/mali-modules.bb > b/recipes-graphics/mali/mali-modules.bb > new file mode 100644 > index 000..e5f78f7 > --- /dev/null > +++ b/recipes-graphics/mali/mali-modules.bb > @@ -0,0 +1,35 @@ > +SUMMARY = "A Mali 400 Linux Kernel module" > +SECTION = "kernel/modules" > + > +LICENSE = "GPLv2" > +LIC_FILES_CHKSUM = " \ > + > file://linux/license/gpl/mali_kernel_license.h;md5=68c66513a9dacef77a52c3d6c5e6afd5 > \ > + " > + > +PV = "r5p1-01rel0" > + > +SRC_URI = " \ > + > http://malideveloper.arm.com/downloads/drivers/DX910/${PV}/DX910-SW-99002-${PV}.tgz > \ > + file://Makefile.patch \ > + " > +SRC_URI[md5sum] = "9c85c113e4d41ae992e45ba27287d1ab" > +SRC_URI[sha256sum] = > "86209c99c36a7622402b016b6f764c212b738ccdec9cdc6d6f16758c013957a0" > + > +inherit module > + > +do_make_scripts[depends] += "virtual/kernel:do_unpack" > + > +S = "${WORKDIR}/driver/src/devicedrv/mali" > + > +COMPATIBLE_MACHINE = "(-)" > +COMPATIBLE_MACHINE_zynqmp = "(.*)" The normal trick is: COMPATIBLE_MACHINE = "^$" COMPATIBLE_MACHINE_zynqmp = "zynqmp" Since "^$" can never match (as no comparisons are against a empty string), but '-' could match any override with a '-' in it. Regards, Nathan > + > +EXTRA_OEMAKE = 'KDIR="${STAGING_KERNEL_DIR}" \ > + ARCH="${ARCH}" \ > + BUILD=release \ > + MALI_PLATFORM="arm" \ > + USING_DT=1 \ > + MALI_SHARED_INTERRUPTS=1 \ > + CROSS_COMPILE="${TARGET_PREFIX}" \ > + O=${STAGING_KERNEL_BUILDDIR} \ > + ' > diff --git a/recipes-graphics/mali/mali-modules/Makefile.patch > b/recipes-graphics/mali/mali-modules/Makefile.patch > new file mode 100644 > index 000..6cf301b > --- /dev/null > +++ b/recipes-graphics/mali/mali-modules/Makefile.patch > @@ -0,0 +1,32 @@ > +--- driver/src/devicedrv/mali/Makefile 2015-03-29 20:38:45.0 -0700 > b/Makefile 2016-01-26 20:13:56.053436042 -0800 > +@@ -85,7 +85,11 @@ > + # Define host system directory > + KDIR-$(shell uname -m):=/lib/modules/$(shell uname -r)/build > + > +-include $(KDIR)/.config > ++ifeq ($(O),) > ++ include $(KDIR)/.config > ++else > ++ include $(O)/.config > ++endif > + > + ifeq ($(ARCH), arm) > + # when compiling for ARM we're cross compiling > +@@ -170,10 +174,15 @@ > + EXTRA_DEFINES += -DPROFILING_SKIP_PP_JOBS=1 -DPROFILING_SKIP_GP_JOBS=1 > + endif > + > ++EXTRA_DEFINES += -Wno-error=date-time > ++ > + all: $(UMP_SYMVERS_FILE) > +- $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) modules > ++ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) O=$(O) modules > + @rm $(FILES_PREFIX)__malidrv_build_info.c > $(FILES_PREFIX)__malidrv_build_info.o > + > ++modules_install: > ++ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) modules_install > ++ > + clean: > + $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean > + > -- > 2.1.4 > > -- > ___ > 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
Re: [meta-xilinx] [RFC] machine-xilinx-default.inc: Add XSERVER
On Thu, May 5, 2016 at 6:06 PM, Manjukumar Mathawrote: > Add X org X server configurations for ZynqMP. This appears to be adding it for ZynqMP, Zynq and MicroBlaze. So it can be generalized. > > Signed-off-by: Manjukumar Matha > --- > conf/machine/include/machine-xilinx-default.inc | 7 +++ > 1 file changed, 7 insertions(+) > > diff --git a/conf/machine/include/machine-xilinx-default.inc > b/conf/machine/include/machine-xilinx-default.inc > index 2df8f4d..b1ad266 100644 > --- a/conf/machine/include/machine-xilinx-default.inc > +++ b/conf/machine/include/machine-xilinx-default.inc > @@ -32,3 +32,10 @@ UBOOT_BINARY ?= "u-boot${UBOOT_OFEMBED}.${UBOOT_SUFFIX}" > UBOOT_ELF ?= "u-boot" > UBOOT_ELF_aarch64 ?= "u-boot.elf" > > +XSERVER = " \ ?= (since this is an include) > + xserver-xorg \ > + xf86-input-evdev \ > + xf86-input-mouse \ > + xf86-input-keyboard \ Add 'xf86-video-fbdev' to match the default (set in packagegroup-core-x11-xserver). > + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', > 'xserver-xorg-extension-glx', '', d)} \ Not sure about this one specifically for Zynq and MicroBlaze, since neither have GL compatible hw. Probably worth setting this via another variable that can be expanded later for soc/arch/machine specifics, something like: XSERVER_EXT ?= "" XSERVER_EXT_zynqmp ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)}" Regards, Nathan > + " > -- > 2.1.4 > > -- > ___ > 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
Re: [meta-xilinx] [RFC] machine-xilinx-default.inc: Include kernel modules
On Wed, May 4, 2016 at 4:18 PM, Mike Looijmanswrote: > That looks like too much of a simplistic approach, as this will dump each > and every built module into any image. > > The proper solution would be to explicitly list the modules that are really > required. I agree that it would be best to only add the specific modules of interest. After a quick look it does appear that a common setup (in a variety of layers/machines) is to just add all modules to MACHINE_EXTRA_RRECOMMENDS (as opposed to ESSENTIAL_EXTRA). So in that case Manju, if you are not sure of the exact modules then setting this via MACHINE_EXTRA_RRECOMMENDS instead should work out better, since for mali related stuff it is very likely to be using a graphics enabled image (aka. one that includes packagegroup-base, like core-image-sato). Regards, Nathan > > > On 04-05-16 08:04, Manjukumar Matha wrote: >> >> Include kernel modules for ZynqMP. Kernel modules will be needed when >> including >> mali modules. >> >> Signed-off-by: Manjukumar Matha >> --- >> conf/machine/include/machine-xilinx-default.inc | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/conf/machine/include/machine-xilinx-default.inc >> b/conf/machine/include/machine-xilinx-default.inc >> index 2df8f4d..ad5465d 100644 >> --- a/conf/machine/include/machine-xilinx-default.inc >> +++ b/conf/machine/include/machine-xilinx-default.inc >> @@ -32,3 +32,4 @@ UBOOT_BINARY ?= "u-boot${UBOOT_OFEMBED}.${UBOOT_SUFFIX}" >> UBOOT_ELF ?= "u-boot" >> UBOOT_ELF_aarch64 ?= "u-boot.elf" >> >> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_zynqmp = "kernel-modules" >> > > > > Kind regards, > > Mike Looijmans > System Expert > > TOPIC Embedded Products > Eindhovenseweg 32-C, NL-5683 KH Best > Postbus 440, NL-5680 AK Best > Telefoon: +31 (0) 499 33 69 79 > E-mail: mike.looijm...@topicproducts.com > Website: www.topicproducts.com > > Please consider the environment before printing this e-mail > > > > > > > -- > ___ > 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
Re: [meta-xilinx] [meta-xilinx 00/14] Update KC705 kit recipes
On Tue, May 3, 2016 at 10:57 AM, Manjukumar Mathawrote: > KC705 reference design is outdated and no longer maintained. This patch series > updates the required components for KC705 kit. > > The changes are > - Use prebuilt v2016.1 bitstream > - Patch u-boot according to the hardware design > - Updated dts file for KC705 kit > - Update to the supported MB v9.6 > - Update the kernel cofigs for v9.6 > - Remove any references to old design kc705-trd Hi Manju, Apart from the comments on a couple of the patches this series is good to be applied. If you can follow up on comments and send updated patches that would be great, then I can apply the series. Thanks, Nathan > > Manjukumar Matha (14): > u-boot-xlnx_2016.01.bb: Remove kc705-trd > linux-xilinx-machines.inc: Remove kc705-trd > kc705-trd-microblazeel: Remove kc705-trd files > feature-microblaze-v9.inc: Updated to v9.6 > feature-microblaze-versions.inc: Update to v9.6 > kc705-microblazeel.scc: Add KC705 linux config > kc705-microblazeel: Add u-boot patch for KC705 > kc705-bitstream_2016.1.bb: Add prebuilt bitstream > kc705-microblazeel.dts: Add KC705 dts > machine-xilinx-default.inc: uboot format is bin > linux-xilinx-machines.inc: Add KC705 cfg to kernel > u-boot-xlnx_2016.01.bb: Add KC705 definitions > kc705-microblazeel.conf: Support for KC705 kit > docs/BOOT.tftp: Update KC705 boot documentation > > conf/machine/include/machine-xilinx-default.inc|1 + > .../include/microblaze/feature-microblaze-v9.inc |4 + > .../microblaze/feature-microblaze-versions.inc |1 + > conf/machine/kc705-microblazeel.conf | 21 + > conf/machine/kc705-trd-microblazeel.conf | 29 - > docs/BOOT.tftp |4 +- > .../device-tree/files/kc705/kc705-microblazeel.dts | 523 + > .../files/kc705/kc705-trd-microblazeel.dts | 527 - > .../reference-design/kc705-bitstream_2016.1.bb | 42 + > recipes-bsp/reference-design/kc705-trd_2013.1.bb | 42 - > ...aze-kc705-Convert-microblaze-generic-to-k.patch | 1156 > > ...kc705-trd-Convert-microblaze-generic-to-k.patch | 656 --- > recipes-bsp/u-boot/u-boot-xlnx_2016.01.bb |2 +- > .../bsp/kc705-microblazeel/kc705-microblazeel.cfg | 17 + > .../bsp/kc705-microblazeel/kc705-microblazeel.scc |4 + > .../kc705-trd-microblazeel.cfg | 14 - > .../kc705-trd-microblazeel.scc |4 - > recipes-kernel/linux/linux-xilinx-machines.inc |2 +- > 18 files changed, 1773 insertions(+), 1276 deletions(-) > create mode 100644 conf/machine/kc705-microblazeel.conf > delete mode 100644 conf/machine/kc705-trd-microblazeel.conf > create mode 100644 recipes-bsp/device-tree/files/kc705/kc705-microblazeel.dts > delete mode 100644 > recipes-bsp/device-tree/files/kc705/kc705-trd-microblazeel.dts > create mode 100644 recipes-bsp/reference-design/kc705-bitstream_2016.1.bb > delete mode 100644 recipes-bsp/reference-design/kc705-trd_2013.1.bb > create mode 100644 > recipes-bsp/u-boot/u-boot-xlnx/microblaze-kc705-Convert-microblaze-generic-to-k.patch > delete mode 100644 > recipes-bsp/u-boot/u-boot-xlnx/microblaze-kc705-trd-Convert-microblaze-generic-to-k.patch > create mode 100644 > recipes-kernel/linux/config/xilinx-machine/bsp/kc705-microblazeel/kc705-microblazeel.cfg > create mode 100644 > recipes-kernel/linux/config/xilinx-machine/bsp/kc705-microblazeel/kc705-microblazeel.scc > delete mode 100644 > recipes-kernel/linux/config/xilinx-machine/bsp/kc705-trd-microblazeel/kc705-trd-microblazeel.cfg > delete mode 100644 > recipes-kernel/linux/config/xilinx-machine/bsp/kc705-trd-microblazeel/kc705-trd-microblazeel.scc > > -- > 2.1.4 > > -- > ___ > 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
Re: [meta-xilinx] [PATCH 14/19 v2] Add consoleblank recipe
On Wed, Apr 27, 2016 at 5:46 PM, Jason Wuwrote: > This recipe installs a init script to disable console blank Hi Jason, I had a bit of a look at this DPMS issue, I might have a solution it is somewhat hacky but appears to allow for DPMS to function correctly. https://github.com/nathanrossi/linux/commit/e4264e80116684297e353f6da4156c4ad6f8a03a It would be nice to avoid this console blank + xorg config setup and have DPMS work (albeit with a kernel patch). Would you be able to confirm if the above linked patch fixes the DPMS issue with your setup too? Thanks, Nathan > > Signed-off-by: Jason Wu > --- > v2: > use MIT from ${COREBASE}/meta/files/common-licenses > > --- > recipes-graphics/consoleblank/console-blank.bb| 25 + > recipes-graphics/consoleblank/files/console-blank | 27 > +++ > 2 files changed, 52 insertions(+) > create mode 100644 recipes-graphics/consoleblank/console-blank.bb > create mode 100644 recipes-graphics/consoleblank/files/console-blank > > diff --git a/recipes-graphics/consoleblank/console-blank.bb > b/recipes-graphics/consoleblank/console-blank.bb > new file mode 100644 > index 000..ae7d09a > --- /dev/null > +++ b/recipes-graphics/consoleblank/console-blank.bb > @@ -0,0 +1,25 @@ > +DESCRIPTION = "Startup script - disable console blank" > +SECTION = "base" > +LICENSE = "MIT" > +LIC_FILES_CHKSUM = > "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" > + > +PR = "r0" > + > +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" > +SRC_URI = "file://console-blank" > + > +inherit update-rc.d > + > +INITSCRIPT_NAME = "console-blank" > +INITSCRIPT_PARAMS = "start 39 S . stop 31 0 6 ." > +#FILES_${PN} = "${sysconfdir}/init.d/console-blank" > + > +# # # add to build if system machine supports screen > +# PACKAGES += ' \ > +# ${@bb.utils.contains("MACHINE_FEATURES", "screen", "console-blank", > "",d)} \ > +# ' > + > +do_install () { > + install -d ${D}/${sysconfdir}/init.d/ > + install -m 0755 ${WORKDIR}/console-blank ${D}${sysconfdir}/init.d/ > +} > \ No newline at end of file > diff --git a/recipes-graphics/consoleblank/files/console-blank > b/recipes-graphics/consoleblank/files/console-blank > new file mode 100644 > index 000..58c2f33 > --- /dev/null > +++ b/recipes-graphics/consoleblank/files/console-blank > @@ -0,0 +1,27 @@ > +#!/bin/sh > +### BEGIN INIT INFO > +# Provides: consoleblank.sh > +# Required-Start: > +# Required-Stop: > +# Default-Start: S > +# Default-Stop: > +# Short-Description: disable console blank > +# Description: set consoleblank to 0 on tty1 > +### END INIT INFO > + > +cur_cb=$(cat /sys/module/kernel/parameters/consoleblank) > + > +if [ $cur_cb -ne 0 ]; then > + echo "Disable console blank" > + for i in {0..9}; do > + echo -e '\033[9;0]' > /dev/tty1 > + cb_chk=$(cat /sys/module/kernel/parameters/consoleblank) > + if [ $cb_chk -eq 0 ]; then > + exit 0 > + fi > + done > +fi > + > +if [ $cb_chk -ne 0 ]; then > + echo "Error: fail to disable console blank" > +fi > \ No newline at end of file > -- > 1.9.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
Re: [meta-xilinx] [PATCH 05/20] Add basic Xilinx HDF support
On Tue, Apr 19, 2016 at 7:04 PM, Jason Wuwrote: > Hi Cyril, > On 19/04/2016 3:13 AM, Cyril Chemparathy wrote: >> >> Hi Jason, >> >> On 4/13/2016 2:23 AM, Jason Wu wrote: >> [...] install -d ${D}${PLATFORM_INIT_DIR} for fn in ${PLATFORM_INIT}; do unzip -o ${S}/${HDF} ${fn} -d ${D}${PLATFORM_INIT_DIR} done >> >> >> Unfortunately, the approach of peeling open the HDF file and consuming >> its content is problematic. The HDF file contents are fundamentally in >> a tool dependent format, and these contents are meant to be accessed >> indirectly through HSI interfaces. > > Well, I have no problem using HSI to extract the hdf, however, I believe > Nathan does not want to have any xilinx tool dependency on the meta-xilinx. > Thus, I think this is the best solution for us at this point. I am open to > other suggestion on better way of handling without xilinx tool dependency. For a task this simple, I really don't see any benefits in using HSI, since it is not as if there is any platform processing it is simply extracting the pre-generated files. In fact I think there is a potential for more problems with using the HSI tools (version incompatibilities are the biggest issue) as opposed to simply extracting the HDF file, at least for this case. > > The other issue is if this patch is not accepted, the board support will be > missing. With the changes discussed previously, I am happy to apply it. I doubt there will be a better solution to this problem any time in the relatively near future. > >> >> Moving forward, we would like to implement a meta-xilinx-tools layer >> with dependencies on Xilinx maintained tools (e.g. HSI) instead of >> breaking open the HDF in this fashion. I have always been interested in having HSI available for use within Yocto/OE/meta-xilinx. The biggest problem has always been that HSI is tied to the Xilinx tools which is a really hefty dependency (and the implied issues with licensing, EULA, support, platform compatibility, version-ing, etc. that come with it) for what is a relatively simple task (comparatively to generated bitstreams). Maybe this is something Xilinx has a solution for? standalone distribution or open-source HSI? definitely would make it considerably easier for project like Yocto/OE and others to allow for tool automation. Regards, Nathan > > I am fine with meta-xilin-tools layer. Any idea when this layer will be > ready? > > Best regards, > > Jason > >> >> Thanks >> -- Cyril. -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] I could not download linux-xlnx.git from YOCTO.
On Tue, Jul 12, 2016 at 11:59 AM, Cai, Chuntian (GE Transportation) <chuntian@ge.com> wrote: > Hi Rossi, > > I am strange, I can download all the package except for > linux-xlnx-4.4-xilinx.git package with current proxy setting. > Since you are using poky, I suspect you might be getting a large percentage of your sources from the poky source mirror. This is fine, but it means that you only need to do http downloads even for some of the recipes that have git sources. > I can open the website https://github.com/Xilinx/linux-xlnx from IE & firefox. > > I setted proxy setting in the ~./bashrc. I have seen issues with proxies before for kernel repos, this is due to the large pack files that git attempts to retrieve. And the delayed time it takes to compress the pack files on the remote which some proxies timeout on. Sometimes using a different protocol works better that others. Try to clone the repo outside of yocto. Also try the different protocols if one fails. e.g. git clone https://github.com/Xilinx/linux-xlnx.git or (ssh) git clone g...@github.com:Xilinx/linux-xlnx.git or (git) git clone git://github.com/Xilinx/linux-xlnx.git If you find that one of these protocols work, change the protocol value in the linux-xlnx.inc recipe to use it (http://git.yoctoproject.org/cgit/cgit.cgi/meta-xilinx/tree/recipes-kernel/linux/linux-xlnx.inc#n12), setting the "protocol" value to either https, ssh or git. If you have no success with that, your easiest solution is to pull down the repo with proper access to the public internet, and bring it into your network (if permitted). Although I have limited understanding of your companies IT policies, so it would be in your best interest to contact your companies IT department for assistance, as this is an issue with the service they are maintaining for you. If you do get the repo cloned outside of yocto, you can bring the repo in manually. The following should work assuming you replace the paths with those appropriate to your setup. git clone --mirror /downloads/git2/github.com.Xilinx.linux-xlnx.git > > > Can I change fetch method from git download method to file download method? > And how to modify? Because I can download linux-xlnx-4.4-xilinx.git with IE. Due to the way the recipe functions it relies on the git repository. So it would require some work to make it operate with just the working tree source that you can get when downloading the zip from github. Regards, Nathan > > > Thanks. > > > -Original Message- > From: Nathan Rossi [mailto:nat...@nathanrossi.com] > Sent: Monday, July 11, 2016 8:24 PM > To: Cai, Chuntian (GE Transportation) <chuntian@ge.com> > Cc: meta-xil...@lists.yoctoproject.org > Subject: EXT: Re: [meta-xilinx] I could not download linux-xlnx.git from > YOCTO. > > Hi, > > Looks like you might be stuck inside an internal corporate network which > doesn't not allow direct access to the public internet. Which is why you are > getting a "Connection reset by peer" error from git. You will need to figure > out what setup you have for your company and then configure access to the > internet via a proxy or pre-download the sources and transfer them to your > internal machine. > > Here is a some info for configuring Yocto to handle some of the common > proxies https://wiki.yoctoproject.org/wiki/Working_Behind_a_Network_Proxy. > If you have already setup the proxy for http, make sure you have also setup > https, ftp, ssh and git proxy configurations. The linux-xlnx recipe > specifically relies on https access to github.com. > > Regards, > Nathan > > On Mon, Jul 11, 2016 at 5:27 PM, Cai, Chuntian (GE Transportation) > <chuntian@ge.com> wrote: >> I setup YOCTO compilation system I could downloand almost package but >> failed wirh downloading linux-xlnx-4.4-xilinx.git. >> >> >> 0: linux-xlnx-4.4-xilinx+gitAUTOINC+89cc643aff-r0 do_fetch (pid 28925) >> >> when I run bitbake core-image-x11 second tims, It always wait on this >> action. >> >> below picture is error output when I first run bitbake core-image-x11 >> last friday. >> >> >> >> >> >> Xilinx Support | >> Xilinx Service Portal | Xilinx User Community Forums >> >> >> >> >> >> This email and any attachments are intended for the sole use of the >> named >> recipient(s) and contain(s) confidential information that may be >> proprietary, privileged or copyrighted under applicable law. If you >> are not the intended recipient, do not read, copy, or forward this >> email message or any attachments. Delete this email message and any >> attachments immediately. >
Re: [meta-xilinx] [PATCH] arm-trusted-firmware: Create and deploy the "atf.ub" file
On Sat, Jul 23, 2016 at 12:05 AM, Mike Looijmanswrote: > To boot with the firmware loaded, we need the binary packaged as a u-boot > image. Add the extra step to do so and output the file that u-boot SPL > expects to find on the SD card. Applied. Thanks, Nathan > > Signed-off-by: Mike Looijmans > --- > recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb > b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb > index 08f696b..f384f5b 100644 > --- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb > +++ b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb > @@ -7,6 +7,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" > > inherit deploy > > +DEPENDS += "u-boot-mkimage-native" > + > S = "${WORKDIR}/git" > > BRANCH = "master" > @@ -45,5 +47,6 @@ do_deploy() { > install -d ${DEPLOYDIR} > install -m 0644 ${S}/build/${PLATFORM}/release/bl31/bl31.elf > ${DEPLOYDIR}/bl31-${MACHINE}.elf > install -m 0644 ${S}/build/${PLATFORM}/release/bl31.bin > ${DEPLOYDIR}/bl31-${MACHINE}.bin > + mkimage -A arm64 -O linux -T kernel -C none -a 0xfffe5000 -e > 0xfffe5000 -d ${S}/build/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/atf.ub > } > addtask deploy before do_build after do_compile > -- > 1.9.1 > -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] How to write .bb file for package
On Wed, Jul 27, 2016 at 7:09 PM, Cai, Chuntian (GE Transportation) <chuntian@ge.com> wrote: > > Memtestrer: It is an open source tool. You can download it from > http://pyropus.ca/software/memtester/ > > > > I added memtest folder in meta-custom/recipes-example/memtest > > It seems bitbake can detect this change and try to install it. > > > > But seems bitbake could not find the Makefile for install it. > > > > The attached file are memtester_4.3.bb and local.conf A memtester recipe (for the same project you mention) is already available in meta-openembedded/meta-oe. https://layers.openembedded.org/layerindex/branch/master/recipes/?q=memtester The recipe file is here: http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb. It appears that for that recipe there is some special configuration, a patch to the Makefile as well as a custom "do_install" task. On a side note. General Yocto/OE related questions (like this one) are better asked on the Yocto mailing list (https://www.yoctoproject.org/tools-resources/community/mailing-lists). Regards, Nathan > > > > Please help check it. > > > > From: Oleg K Dzhimiev [mailto:o...@elphel.com] > Sent: Saturday, July 23, 2016 1:37 AM > To: Cai, Chuntian (GE Transportation) > Cc: Nathan Rossi; meta-xil...@lists.yoctoproject.org > Subject: EXT: Re: [meta-xilinx] How to install mtd-utils on rootfs > > > > 1. do_compile is not the last task for rootfs - should be do_image. > > Run these (the 2nd line is without command defined - the recipe will run > through all of the tasks): > > bitbake core-image-minimal -c configure -f > > bitbake core-image-minimal > > > > 2a. The compiled mtd-utils programs go to: > poky/build/tmp/work//mtd-utils//image/usr/sbin/ > > 2b. If the result rootfs is *.tar.gz - check the build date then just open > the archive and see if flashcp is in /usr/sbin/ > > > > On 22 July 2016 at 05:58, Cai, Chuntian (GE Transportation) > <chuntian@ge.com> wrote: > > How about tmp/sysroots dir ? it is used to generate rootfs? > > > > If mtd-util properly installed ,I should found flashcp here? > > > > Thanks. > > > > > > > > From: Oleg K Dzhimiev [mailto:o...@elphel.com] > Sent: Friday, July 22, 2016 2:16 PM > To: Cai, Chuntian (GE Transportation) > Cc: Nathan Rossi; meta-xil...@lists.yoctoproject.org > Subject: EXT: Re: [meta-xilinx] How to install mtd-utils on rootfs > > > > 1. To poky/meta/recipes-core/images/core-image-minimal.bb add: > > > > IMAGE_INSTALL_append += " \ > > mtd-utils \ > > mtd-utils-misc \ > > " > > > > 2. Or create a core-image-minimal.bbappend file in the meta-xilinx layer and > put the text above there. > > > > 3. Or create your own recipe - example: core-image-elphel393.bb > > > > > > On 21 July 2016 at 04:06, Cai, Chuntian (GE Transportation) > <chuntian@ge.com> wrote: > > Hi Rossi, > > I want use mtd-utils to test MTD dirver, could you tell me how to install it > when I build rootfs. > > My board is ZC706 and I use bitbake core-image-minimal make uboot,uimage and > dtb > > Thanks. > > > -Original Message- > From: Nathan Rossi [mailto:nat...@nathanrossi.com] > Sent: Thursday, July 21, 2016 5:14 PM > To: Cai, Chuntian (GE Transportation) <chuntian@ge.com> > Cc: meta-xil...@lists.yoctoproject.org > Subject: EXT: Re: uRamdisk.image.gz > > Hi, > > "uramdisk.image.gz" is just another name for "*.cpio.gz.u-boot" (or any > initramfs/initrd format e.g. ext. Which is gzipped and wrapped with the > u-boot image header). > > All meta-xilinx machines are setup by default to generate the > *.cpio.gz.u-boot for the images you build. You can get other formats like > ext.gz.u-boot, etc by adding them to IMAGE_FSTYPES > (http://git.yoctoproject.org/cgit/cgit.cgi/meta-xilinx/tree/docs/Rootfs). > > If you want it named as "uramdisk.image.gz" renaming it to that when writing > it to the sd card/etc is sufficient. > > Regards, > Nathan > > On Thu, Jul 21, 2016 at 6:47 PM, Cai, Chuntian (GE Transportation) > <chuntian@ge.com> wrote: > > Hi Rossi, > > > > Could you tell me how to make uRamdisk.image.gz with YOCTO toolchain. > > > > Thanks. > > > > > > -Original Message- > > From: Nathan Rossi [mailto:nat...@nathanrossi.com] > > Sent: Tuesday, July 12, 2016 5:22 PM > > To: Cai, Chuntian (GE Transportation) <
Re: [meta-xilinx] [PATCH V2 3/5] config: Set the Xilinx QEMU as the prefered QEMU to build
On Tue, Aug 2, 2016 at 9:52 AM, Alistair Francis <alistair.fran...@xilinx.com> wrote: > On Sun, Jul 31, 2016 at 7:49 AM, Nathan Rossi <nat...@nathanrossi.com> wrote: >> On Thu, Jul 28, 2016 at 7:26 AM, Alistair Francis >> <alistair.fran...@xilinx.com> wrote: >>> Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com> >>> --- >>> conf/machine/include/machine-xilinx-default.inc | 2 ++ >>> 1 file changed, 2 insertions(+) >>> >>> diff --git a/conf/machine/include/machine-xilinx-default.inc >>> b/conf/machine/include/machine-xilinx-default.inc >>> index 02fa077..4ea68fd 100644 >>> --- a/conf/machine/include/machine-xilinx-default.inc >>> +++ b/conf/machine/include/machine-xilinx-default.inc >>> @@ -38,3 +38,5 @@ UBOOT_ELF_aarch64 ?= "u-boot.elf" >>> # kernel modules for ZynqMP >>> MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append_zynqmp = " >>> kernel-module-mali-modules" >>> >>> +PREFERRED_VERSION_qemu-native = "2.2.5" >> >> I am not sure if this approach will work as expected due to some other >> parts of Yocto depending on QEMU in different ways. For example the >> "qemu-usermode" distro flag and the corresponding linux-user execution >> of tasks might break? > > Hmmm... How else can it be done? 'Why not have both?' :) To avoid any issues with replacing qemu-native, I looked at setting it up as a separate recipe. "qemu-xilinx" recipe which populates the binaries in a sub-dir of the sysroots usr/bin. Here is a work in progress tree with the recipe: https://github.com/nathanrossi/meta-xilinx/tree/nrossi/qemu-xilinx Essentially the binary is located here: tmp-glibc/sysroots/x86_64-linux/usr/bin/qemu-xilinx/qemu-system-aarch64. We can work in the ability to select the qemu to use into the runqemu part, allowing to select depending on what you want to run on. > >> >> Also putting this in machine-xilinx-default will make >> qemuzynq/qemumicroblaze* use the Xilinx qemu, which are not supported >> by the recipe you provide for qemu (need the arm/mb archs). > > The ARM QEMU model is a subset of AArch64. So Zynq-7000 will run on > the aarch64 QEMU machine. > > The Microblaze targets are added as part of > meta-xilinx/recipes-microblaze/qemu/qemu_%.bbappend. So all Xilinx > platforms of QEMU are built. Sorry you are correct for microblaze, but "aarch64" does not include the executable for "arm" which would likely cause issues. But this is a mute point if going for the solution I proposed above. Regards, Nathan > > Thanks, > > Alistair > >> >> Regards, >> Nathan >> >>> + >>> -- >>> 2.7.4 >>> >> -- >> ___ >> 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
Re: [meta-xilinx] [PATCH] zynqmp: Make the MALI recommendation machine-specific
On Tue, Aug 2, 2016 at 4:49 AM, Manjukumar Harthikote Matha <manjukumar.harthikote-ma...@xilinx.com> wrote: > Hi Nathan, > > > On 07/31/2016 06:17 AM, Nathan Rossi wrote: >> >> On Sat, Jul 30, 2016 at 4:46 AM, Manjukumar Harthikote Matha >> <manjukumar.harthikote-ma...@xilinx.com> wrote: >>> >>> Hi Mike, >>> >>> On 07/26/2016 03:59 AM, Mike Looijmans wrote: >>>> >>>> >>>> Not all zynqmp SoCs have a MALI GPU built in. Thus recommending >>>> kernel-module-mali for all zynqmp machines is incorrect. Move >>>> the recommendation to the board config. >>>> >>>> This also makes for a nicer syntax, having less-specific platform >>>> overrides for machine-specific variables just doesn't look right. >>>> >>>> Signed-off-by: Mike Looijmans <mike.looijm...@topic.nl> >>>> --- >>>> conf/machine/include/machine-xilinx-default.inc | 4 >>>> conf/machine/zcu102-zynqmp.conf | 3 +++ >>>> 2 files changed, 3 insertions(+), 4 deletions(-) >>>> >>> <...> >>> Yes this is true, after the road map has been made clear with CG parts, >>> however please see my previous comments on mali-modules, once resolved we >>> should move it to board-specific >> >> >> It appears that the product table is public showing CG, EG and EV >> parts respectively. >> >> >> http://www.xilinx.com/products/silicon-devices/soc/zynq-ultrascale-mpsoc.html#productTable >> >> Is it worth having three separate includes for the CG/EG/EV parts? So >> that this sort of config can be easily included for machines/boards >> that use the specified part? This would allow additional configuration >> that would only be relevant to those variants as well. >> > Can we use MACHINE_FEATURES and enable appropriate configs? Do you think it > is a good idea? We can have one include instead of 3 or more. That is a definitely a better solution, then all that is needed is the two feature flags 'zynqmp-mali' (or just mali?) and 'zynqmp-venc' (or something similar). And most of the conditional selection can be done with bb.utils.contains. Regards, Nathan -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] zcu102: Does not build boot.bin
On Tue, Jul 19, 2016 at 6:05 PM, Mike Looijmanswrote: > > Set MACHINE to zcu102-zynqmp and built a test image. > > However, the bootloader seems to only build a secondstage u-boot, the first > stage is missing. The README suggests it would be there, so what's missing? > Hi Mike, I am not 100% sure of the state of u-boot-spl for zynqmp (whats functional, etc.). But boot.bin support for zynqmp was added in u-boot v2016.07, so meta-xilinx does not yet deploy zynqmp SPL by default. Regards, Nathan > > > Kind regards, > > > > Mike Looijmans > > System Expert > > > > > > TOPIC Products > > > > > > Materiaalweg 4 > > > > > > 5681 RJ Best > > T: > > +31 (0) 499 33 69 69 > > Postbus 440 > > E: > > mike.looijm...@topicproducts.com > > 5680 AK Best > > W: > > www.topicproducts.com > > The Netherlands > > > Please consider the environment before printing this e-mail > > > Topic zoekt gedreven (embedded) software specialisten! > > > -- > ___ > 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
Re: [meta-xilinx] zcu102: Does not build boot.bin
On Tue, Jul 19, 2016 at 6:57 PM, Mike Looijmans <mike.looijm...@topic.nl> wrote: > > On 19-07-16 10:51, Nathan Rossi wrote: > > On Tue, Jul 19, 2016 at 6:05 PM, Mike Looijmans <mike.looijm...@topic.nl> > > wrote: > >> > >> Set MACHINE to zcu102-zynqmp and built a test image. > >> > >> However, the bootloader seems to only build a secondstage u-boot, the first > >> stage is missing. The README suggests it would be there, so what's missing? > >> > > > > Hi Mike, > > > > I am not 100% sure of the state of u-boot-spl for zynqmp (whats > > functional, etc.). But boot.bin support for zynqmp was added in u-boot > > v2016.07, so meta-xilinx does not yet deploy zynqmp SPL by default. > > Okay, so what do I have to do to boot the board? Just upgrade u-boot to the > denx master? Or is there still stuff in u-boot-xlnx that we need? I don't have any details on booting/configuring the board (I don't have access to any zynqmp hardware). If you have issues or questions it is probably worth querying in the #u-boot irc channel (or on the u-boot mailing list). As for the recipe side cloning the oe-core u-boot recipe and setting it to the v2016.07 release should be sufficient (the spl stuff in meta-xilinx doesn't handle the zynqmp setup). But you will likely need the psu_init_gpl files for the board, have a read of the board/xilinx/zynqmp/Makefile in u-boot for how to put them into the source tree. Deploying the boot.bin is just a matter of setting SPL_BINARY = "spl/boot.bin" in your machine/local.conf. Regards, Nathan > > (I'd prefer to have SPL of course. It's probably possible to build an FSBL > with Vivado, but that's rather useless if you want to have automated builds.) > > > > Kind regards, > > > > Mike Looijmans > > System Expert > > > > > > TOPIC Products > > > > > > Materiaalweg 4 > > > > > > 5681 RJ Best > > T: > > +31 (0) 499 33 69 69 > > Postbus 440 > > E: > > mike.looijm...@topicproducts.com > > 5680 AK Best > > W: > > www.topicproducts.com > > The Netherlands > > > Please consider the environment before printing this e-mail > > > Topic zoekt gedreven (embedded) software specialisten! > -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH] gcc-source_6.1.bbappend: Include MB patch
On Tue, Jul 12, 2016 at 8:27 AM, Manjukumar Mathawrote: > Patch GCC 6 for addi3 and subdi3 instruction definitions Applied. Thanks, Nathan > > Signed-off-by: Manjukumar Matha > --- > recipes-microblaze/gcc/gcc-source_6.1.bbappend | 7 +++ > 1 file changed, 7 insertions(+) > create mode 100644 recipes-microblaze/gcc/gcc-source_6.1.bbappend > > diff --git a/recipes-microblaze/gcc/gcc-source_6.1.bbappend > b/recipes-microblaze/gcc/gcc-source_6.1.bbappend > new file mode 100644 > index 000..50075f0 > --- /dev/null > +++ b/recipes-microblaze/gcc/gcc-source_6.1.bbappend > @@ -0,0 +1,7 @@ > + > +# Add MicroBlaze Patches > +FILESEXTRAPATHS_append := "${THISDIR}/files:" > +SRC_URI_append = " \ > + > file://microblaze.md-Improve-adddi3-and-subdi3-insn-definit.patch \ > + " > + > -- > 2.7.4 > > -- > ___ > 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
Re: [meta-xilinx] [PATCH 1/2] u-boot-xlnx_2016.01.bb: Add patch for GCC 6
On Tue, Jul 12, 2016 at 7:05 AM, Manjukumar Mathawrote: > Include the patch to fix compilation error due to missing header file Applied. Thanks, Nathan > > Signed-off-by: Manjukumar Matha > --- > recipes-bsp/u-boot/u-boot-xlnx_2016.01.bb | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/recipes-bsp/u-boot/u-boot-xlnx_2016.01.bb > b/recipes-bsp/u-boot/u-boot-xlnx_2016.01.bb > index a434844..11a348d 100644 > --- a/recipes-bsp/u-boot/u-boot-xlnx_2016.01.bb > +++ b/recipes-bsp/u-boot/u-boot-xlnx_2016.01.bb > @@ -7,6 +7,8 @@ PV = "v2016.01${XILINX_EXTENSION}+git${SRCPV}" > > FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-xlnx:" > > +SRC_URI_append = " > file://0001-compiler-gcc6.h-Fix-u-boot-issue-for-gcc6.patch" > + > SRC_URI_append_kc705-microblazeel = " > file://microblaze-kc705-Convert-microblaze-generic-to-k.patch" > > LIC_FILES_CHKSUM = > "file://README;beginline=1;endline=6;md5=157ab8408beab40cd8ce1dc69f702a6c" > -- > 2.7.4 > > -- > ___ > 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
Re: [meta-xilinx] [PATCH 0/2] Remove older GCC support
On Tue, Jul 12, 2016 at 8:39 AM, Manjukumar Mathawrote: > Remove support for patches and GCC that are no longer supported in oe-core > upstream I have applied this series. > > Manjukumar Matha (2): > Remove old references to GCC 4.9 and 5.3 GCC 5.4 is still available in oe-core. Just to clarify, the intention here is to drop support for gcc 5.x for microblaze in favour of only supporting gcc 6 correct? It does appear there are intentions to drop 5.x in oe-core anyways http://lists.openembedded.org/pipermail/openembedded-core/2016-July/123814.html. Thanks, Nathan > Remove this patch as it is no longer required > > .../gcc/files/microblaze-musl-support.patch| 44 > -- > recipes-microblaze/gcc/gcc-source_4.9.bbappend | 7 > recipes-microblaze/gcc/gcc-source_5.3.bbappend | 8 > 3 files changed, 59 deletions(-) > delete mode 100644 recipes-microblaze/gcc/files/microblaze-musl-support.patch > delete mode 100644 recipes-microblaze/gcc/gcc-source_4.9.bbappend > delete mode 100644 recipes-microblaze/gcc/gcc-source_5.3.bbappend > > -- > 2.7.4 > > -- > ___ > 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
Re: [meta-xilinx] [PATCH 2/2] Add GCC6 patch for compiler-gcc6.h file missing
On Tue, Jul 12, 2016 at 7:05 AM, Manjukumar Mathawrote: > Copy compiler-gcc5.h as compiler-gcc6.h to fix compilation error This is a > temporary fix till Xilinx u-boot gets updated > > Upstream Status: Never > > Signed-off-by: Manjukumar Matha > --- > ...compiler-gcc6.h-Fix-u-boot-issue-for-gcc6.patch | 92 > ++ > 1 file changed, 92 insertions(+) > create mode 100644 > recipes-bsp/u-boot/u-boot-xlnx/0001-compiler-gcc6.h-Fix-u-boot-issue-for-gcc6.patch > > diff --git > a/recipes-bsp/u-boot/u-boot-xlnx/0001-compiler-gcc6.h-Fix-u-boot-issue-for-gcc6.patch > > b/recipes-bsp/u-boot/u-boot-xlnx/0001-compiler-gcc6.h-Fix-u-boot-issue-for-gcc6.patch > new file mode 100644 > index 000..27aab4f > --- /dev/null > +++ > b/recipes-bsp/u-boot/u-boot-xlnx/0001-compiler-gcc6.h-Fix-u-boot-issue-for-gcc6.patch > @@ -0,0 +1,92 @@ > +From 27097b226f9b54a433e92dd5591bf48b830a8d77 Mon Sep 17 00:00:00 2001 > +From: Manjukumar Matha > +Date: Wed, 22 Jun 2016 02:34:32 -0700 > +Subject: [PATCH] compiler-gcc6.h: Fix u-boot issue for gcc6 > + > +Fix the u-boot compilation error while using gcc6 > +include/linux/compiler-gcc.h:114:30: fatal error: linux/compiler-gcc6.h: No > +such file or directory > + > +This is a temporary fix, till u-boot-xlnx gets updated to latest revision > + > +Upstream Status: Never "Never" is not commonly used. I have replaced this with inappropriate to keep consistent with the oe guidelines (http://openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations). But otherwise, applied. Thanks, Nathan > +Signed-off-by: Manjukumar Matha > +--- > + include/linux/compiler-gcc6.h | 65 > +++ > + 1 file changed, 65 insertions(+) > + create mode 100644 include/linux/compiler-gcc6.h > + > +diff --git a/include/linux/compiler-gcc6.h b/include/linux/compiler-gcc6.h > +new file mode 100644 > +index 000..c8c5659 > +--- /dev/null > b/include/linux/compiler-gcc6.h > +@@ -0,0 +1,65 @@ > ++#ifndef __LINUX_COMPILER_H > ++#error "Please don't include directly, include > instead." > ++#endif > ++ > ++#define __used__attribute__((__used__)) > ++#define __must_check __attribute__((warn_unused_result)) > ++#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) > ++ > ++/* Mark functions as cold. gcc will assume any path leading to a call > ++ to them will be unlikely. This means a lot of manual unlikely()s > ++ are unnecessary now for any paths leading to the usual suspects > ++ like BUG(), printk(), panic() etc. [but let's keep them for now for > ++ older compilers] > ++ > ++ Early snapshots of gcc 4.3 don't support this and we can't detect this > ++ in the preprocessor, but we can live with this because they're > unreleased. > ++ Maketime probing would be overkill here. > ++ > ++ gcc also has a __attribute__((__hot__)) to move hot functions into > ++ a special section, but I don't see any sense in this right now in > ++ the kernel context */ > ++#define __cold__attribute__((__cold__)) > ++ > ++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), > __COUNTER__) > ++ > ++#ifndef __CHECKER__ > ++# define __compiletime_warning(message) __attribute__((warning(message))) > ++# define __compiletime_error(message) __attribute__((error(message))) > ++#endif /* __CHECKER__ */ > ++ > ++/* > ++ * Mark a position in code as unreachable. This can be used to > ++ * suppress control flow warnings after asm blocks that transfer > ++ * control elsewhere. > ++ * > ++ * Early snapshots of gcc 4.5 don't support this and we can't detect > ++ * this in the preprocessor, but we can live with this because they're > ++ * unreleased. Really, we need to have autoconf for the kernel. > ++ */ > ++#define unreachable() __builtin_unreachable() > ++ > ++/* Mark a function definition as prohibited from being cloned. */ > ++#define __noclone __attribute__((__noclone__)) > ++ > ++/* > ++ * Tell the optimizer that something else uses this function or variable. > ++ */ > ++#define __visible __attribute__((externally_visible)) > ++ > ++/* > ++ * GCC 'asm goto' miscompiles certain code sequences: > ++ * > ++ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 > ++ * > ++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. > ++ * > ++ * (asm goto is automatically volatile - the naming reflects this.) > ++ */ > ++#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while > (0) > ++ > ++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP > ++#define __HAVE_BUILTIN_BSWAP32__ > ++#define __HAVE_BUILTIN_BSWAP64__ > ++#define __HAVE_BUILTIN_BSWAP16__ > ++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ > +-- > +2.1.4 > + > -- > 2.7.4 > > -- >
Re: [meta-xilinx] [RFC] glibc_2.24.bbappend: Fix compiler error for MB
Hi Manju, This patch works fine to resolve the build issue, however there appears to be something significantly more broken with regards to glibc 2.24 and/or gcc 6 for microblaze. When booting the default qemumicroblaze build in qemu userspace appears broken. Resulting in a kernel panic on init. [2.631858] Kernel panic - not syncing: Attempted to kill init! exitcode=0x000b [2.631858] [2.632325] ---[ end Kernel panic - not syncing: Attempted to kill init! exitcode=0x000b I tried with a static build of busybox which did not change the result, so I had a quick look where it was dying in busybox and it appears that it is segfaulting early in glibc codebase. Here is the backtrace when running busybox in qemu linux user (./tmp-glibc/sysroots/x86_64-linux/usr/bin/qemu-microblazeel -g 12345 -L ./tmp-glibc/sysroots/qemumicroblaze/ ./tmp-glibc/work/microblazeel-v8.50-bs-cmp-re-mh-div-fb-oe-linux/busybox/1.24.1-r0/image/bin/busybox sh) Program received signal SIGSEGV, Segmentation fault. __tls_get_addr (ti=0x101b50ac) at ../sysdeps/microblaze/libc-tls.c:31 31 ../sysdeps/microblaze/libc-tls.c: No such file or directory. (gdb) bt #0 __tls_get_addr (ti=0x101b50ac) at ../sysdeps/microblaze/libc-tls.c:31 #1 0x100f2be4 in ptmalloc_init () at arena.c:274 #2 0x100f3008 in ptmalloc_init () at hooks.c:33 #3 malloc_hook_ini (sz=, caller=) at hooks.c:31 #4 0x100f1ae4 in __libc_malloc (bytes=bytes@entry=111) at malloc.c:2901 #5 0x1016161c in _dl_get_origin () at ../sysdeps/unix/sysv/linux/dl-origin.c:50 #6 0x10139500 in _dl_non_dynamic_init () at dl-support.c:310 #7 0x1013a7fc in __libc_init_first (argc=argc@entry=1, argv=argv@entry=0xf6ffedc4, envp=0xf6ffedcc) at init-first.c:79 #8 0x100c58ec in __libc_start_main (main=0x10001550 , argc=1, argv=0xf6ffedc4, init=0x100c5eb0 <__libc_csu_init>, fini=0x100c5f9c <__libc_csu_fini>, rtld_fini=0x0, stack_end=0xf6ffeec0) at libc-start.c:225 #9 0x0008 in ?? () Backtrace stopped: frame did not save the PC I also gave it a test with musl, it gets further into execution and fails elsewhere in a different libc call. Program received signal SIGSEGV, Segmentation fault. __strchrnul (s=s@entry=0x2 , c=c@entry=61) at src/string/strchrnul.c:19 19 src/string/strchrnul.c: No such file or directory. (gdb) bt #0 __strchrnul (s=s@entry=0x2 , c=c@entry=61) at src/string/strchrnul.c:19 #1 0x100b3b20 in strchr (s=s@entry=0x2 , c=c@entry=61) at src/string/strchr.c:7 #2 0x1003bd88 in init () at shell/ash.c:12937 #3 ash_main (argc=argc@entry=1, argv=argv@entry=0xf6ffeda8) at shell/ash.c:13151 #4 0x1b08 in run_applet_no_and_exit (applet_no=122, argv=argv@entry=0xf6ffeda8) at libbb/appletlib.c:774 #5 0x1d38 in run_applet_and_exit (name=0xf6ffef1f "sh", argv=argv@entry=0xf6ffeda8) at libbb/appletlib.c:781 #6 0x1f54 in busybox_main (argv=0xf6ffeda8) at libbb/appletlib.c:730 #7 run_applet_and_exit (name=, argv=) at libbb/appletlib.c:783 #8 0x10001018 in main (argc=, argv=) at libbb/appletlib.c:838 I don't see these issues with musl or glibc using gcc 5.4, so it makes me suspect that there is some sort of regression in gcc 6 for microblaze, maybe related to TLS? Regards, Nathan On Tue, Jul 12, 2016 at 8:11 AM, Manjukumar Mathawrote: > MB is failing to compile stating "ret" variable is a register. However > renaming > the variable from ret to any other name fixes this issue. I think it might be > a > GCC issue, but I am unable to re-create this corner case to report it to GCC. > > Signed-off-by: Manjukumar Matha > --- > .../glibc/files/microblaze-gcc-ret-fix.patch | 120 > + > recipes-microblaze/glibc/glibc_2.24.bbappend | 5 + > 2 files changed, 125 insertions(+) > create mode 100644 > recipes-microblaze/glibc/files/microblaze-gcc-ret-fix.patch > create mode 100644 recipes-microblaze/glibc/glibc_2.24.bbappend > > diff --git a/recipes-microblaze/glibc/files/microblaze-gcc-ret-fix.patch > b/recipes-microblaze/glibc/files/microblaze-gcc-ret-fix.patch > new file mode 100644 > index 000..12ed783 > --- /dev/null > +++ b/recipes-microblaze/glibc/files/microblaze-gcc-ret-fix.patch > @@ -0,0 +1,120 @@ > +diff --git a/sysdeps/unix/sysv/linux/spawni.c > b/sysdeps/unix/sysv/linux/spawni.c > +index ee05de5..08aecee 100644 > +--- a/sysdeps/unix/sysv/linux/spawni.c > b/sysdeps/unix/sysv/linux/spawni.c > +@@ -126,7 +126,7 @@ __spawni_child (void *arguments) > + const posix_spawnattr_t *restrict attr = args->attr; > + const posix_spawn_file_actions_t *file_actions = args->fa; > + int p = args->pipe[1]; > +- int ret; > ++ int retVal; > + > + close_not_cancel (args->pipe[0]); > + > +@@ -171,25 +171,25 @@ __spawni_child (void *arguments) > + if ((attr->__flags & (POSIX_SPAWN_SETSCHEDPARAM | > POSIX_SPAWN_SETSCHEDULER)) > + == POSIX_SPAWN_SETSCHEDPARAM) > + { > +- if ((ret = __sched_setparam (0,
Re: [meta-xilinx] I could not download linux-xlnx.git from YOCTO.
Hi, Looks like you might be stuck inside an internal corporate network which doesn't not allow direct access to the public internet. Which is why you are getting a "Connection reset by peer" error from git. You will need to figure out what setup you have for your company and then configure access to the internet via a proxy or pre-download the sources and transfer them to your internal machine. Here is a some info for configuring Yocto to handle some of the common proxies https://wiki.yoctoproject.org/wiki/Working_Behind_a_Network_Proxy. If you have already setup the proxy for http, make sure you have also setup https, ftp, ssh and git proxy configurations. The linux-xlnx recipe specifically relies on https access to github.com. Regards, Nathan On Mon, Jul 11, 2016 at 5:27 PM, Cai, Chuntian (GE Transportation)wrote: > I setup YOCTO compilation system I could downloand almost package but failed > wirh downloading linux-xlnx-4.4-xilinx.git. > > > 0: linux-xlnx-4.4-xilinx+gitAUTOINC+89cc643aff-r0 do_fetch (pid 28925) > > when I run bitbake core-image-x11 second tims, It always wait on this > action. > > below picture is error output when I first run bitbake core-image-x11 last > friday. > > > > > > Xilinx Support | > Xilinx Service Portal | Xilinx User Community Forums > > > > > > This email and any attachments are intended for the sole use of the named > recipient(s) and contain(s) confidential information that may be > proprietary, privileged or copyrighted under applicable law. If you are not > the intended recipient, do not read, copy, or forward this email message or > any attachments. Delete this email message and any attachments immediately. > > > > This email and any attachments are intended for the sole use of the named > recipient(s) and contain(s) confidential information that may be > proprietary, privileged or copyrighted under applicable law. If you are not > the intended recipient, do not read, copy, or forward this email message or > any attachments. Delete this email message and any attachments immediately. > > > -- > ___ > 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
Re: [meta-xilinx] [PATCH] zynqmp: Make the MALI recommendation machine-specific
On Fri, Aug 5, 2016 at 2:40 AM, Mike Looijmans <mike.looijm...@topic.nl> wrote: > On 04-08-16 17:02, Nathan Rossi wrote: >> >> On Tue, Aug 2, 2016 at 4:49 AM, Manjukumar Harthikote Matha >> <manjukumar.harthikote-ma...@xilinx.com> wrote: >>> >>> Hi Nathan, >>> >>> >>> On 07/31/2016 06:17 AM, Nathan Rossi wrote: >>>> >>>> >>>> On Sat, Jul 30, 2016 at 4:46 AM, Manjukumar Harthikote Matha >>>> <manjukumar.harthikote-ma...@xilinx.com> wrote: >>>>> >>>>> >>>>> Hi Mike, >>>>> >>>>> On 07/26/2016 03:59 AM, Mike Looijmans wrote: >>>>>> >>>>>> >>>>>> >>>>>> Not all zynqmp SoCs have a MALI GPU built in. Thus recommending >>>>>> kernel-module-mali for all zynqmp machines is incorrect. Move >>>>>> the recommendation to the board config. >>>>>> >>>>>> This also makes for a nicer syntax, having less-specific platform >>>>>> overrides for machine-specific variables just doesn't look right. >>>>>> >>>>>> Signed-off-by: Mike Looijmans <mike.looijm...@topic.nl> >>>>>> --- >>>>>> conf/machine/include/machine-xilinx-default.inc | 4 >>>>>> conf/machine/zcu102-zynqmp.conf | 3 +++ >>>>>> 2 files changed, 3 insertions(+), 4 deletions(-) >>>>>> >>>>> <...> >>>>> Yes this is true, after the road map has been made clear with CG parts, >>>>> however please see my previous comments on mali-modules, once resolved >>>>> we >>>>> should move it to board-specific >>>> >>>> >>>> >>>> It appears that the product table is public showing CG, EG and EV >>>> parts respectively. >>>> >>>> >>>> >>>> http://www.xilinx.com/products/silicon-devices/soc/zynq-ultrascale-mpsoc.html#productTable >>>> >>>> Is it worth having three separate includes for the CG/EG/EV parts? So >>>> that this sort of config can be easily included for machines/boards >>>> that use the specified part? This would allow additional configuration >>>> that would only be relevant to those variants as well. >>>> >>> Can we use MACHINE_FEATURES and enable appropriate configs? Do you think >>> it >>> is a good idea? We can have one include instead of 3 or more. >> >> >> That is a definitely a better solution, then all that is needed is the >> two feature flags 'zynqmp-mali' (or just mali?) and 'zynqmp-venc' (or >> something similar). And most of the conditional selection can be done >> with bb.utils.contains. > > > For mali maybe you could use an existing machine feature like "opengl"? That would work fine too, assuming of course that the mali module does not provide any api's other than those needed for the user-space opengl support. But even then the contains_any can handle checking if the machine provides multiple features where the mali module is needed. Manju if you are good with using the "opengl" machine feature flag for this we can handle the video encoder naming seperately. Regards, Nathan -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH] Rename "mali-modules.bb" to "kernel-module-mali.bb"
On Thu, Aug 4, 2016 at 3:39 PM, Mike Looijmanswrote: > Since the recipe only actually produces a package called "kernel-module-mali", > it's logical to just name it "kernel-module-mali.bb". This gets rid of the > empty "mali-modules" package and the "PROVIDES" workaround. I haven't actually applied the PROVIDES work around, so I just removed the last sentence when applying this. But otherwise, Applied. Thanks, Nathan > > Signed-off-by: Mike Looijmans > --- > recipes-graphics/mali/kernel-module-mali.bb| 35 > .../mali/kernel-module-mali/Makefile.patch | 36 + > recipes-graphics/mali/mali-modules.bb | 37 > -- > recipes-graphics/mali/mali-modules/Makefile.patch | 36 - > 4 files changed, 71 insertions(+), 73 deletions(-) > create mode 100644 recipes-graphics/mali/kernel-module-mali.bb > create mode 100644 recipes-graphics/mali/kernel-module-mali/Makefile.patch > delete mode 100644 recipes-graphics/mali/mali-modules.bb > delete mode 100644 recipes-graphics/mali/mali-modules/Makefile.patch > > diff --git a/recipes-graphics/mali/kernel-module-mali.bb > b/recipes-graphics/mali/kernel-module-mali.bb > new file mode 100644 > index 000..c809243 > --- /dev/null > +++ b/recipes-graphics/mali/kernel-module-mali.bb > @@ -0,0 +1,35 @@ > +SUMMARY = "A Mali 400 Linux Kernel module" > +SECTION = "kernel/modules" > + > +LICENSE = "GPLv2" > +LIC_FILES_CHKSUM = " \ > + > file://linux/license/gpl/mali_kernel_license.h;md5=68c66513a9dacef77a52c3d6c5e6afd5 > \ > + " > + > +PV = "r5p1-01rel0" > + > +SRC_URI = " \ > + > http://malideveloper.arm.com/downloads/drivers/DX910/${PV}/DX910-SW-99002-${PV}.tgz > \ > + file://Makefile.patch \ > + " > +SRC_URI[md5sum] = "9c85c113e4d41ae992e45ba27287d1ab" > +SRC_URI[sha256sum] = > "86209c99c36a7622402b016b6f764c212b738ccdec9cdc6d6f16758c013957a0" > + > +inherit module > + > +do_make_scripts[depends] += "virtual/kernel:do_unpack" > + > +S = "${WORKDIR}/driver/src/devicedrv/mali" > + > +COMPATIBLE_MACHINE = "^$" > +COMPATIBLE_MACHINE_zynqmp = "zynqmp" > + > +EXTRA_OEMAKE = 'KDIR="${STAGING_KERNEL_DIR}" \ > + ARCH="${ARCH}" \ > + BUILD=release \ > + MALI_PLATFORM="arm" \ > + USING_DT=1 \ > + MALI_SHARED_INTERRUPTS=1 \ > + CROSS_COMPILE="${TARGET_PREFIX}" \ > + O=${STAGING_KERNEL_BUILDDIR} \ > + ' > diff --git a/recipes-graphics/mali/kernel-module-mali/Makefile.patch > b/recipes-graphics/mali/kernel-module-mali/Makefile.patch > new file mode 100644 > index 000..0f05687 > --- /dev/null > +++ b/recipes-graphics/mali/kernel-module-mali/Makefile.patch > @@ -0,0 +1,36 @@ > +Change Makefile to be compatible with Yocto > + > +Signed-off-by: Manjukumar Matha > +Upstream Status: Pending > +--- driver/src/devicedrv/mali/Makefile 2015-03-29 20:38:45.0 -0700 > b/Makefile 2016-01-26 20:13:56.053436042 -0800 > +@@ -85,7 +85,11 @@ > + # Define host system directory > + KDIR-$(shell uname -m):=/lib/modules/$(shell uname -r)/build > + > +-include $(KDIR)/.config > ++ifeq ($(O),) > ++ include $(KDIR)/.config > ++else > ++ include $(O)/.config > ++endif > + > + ifeq ($(ARCH), arm) > + # when compiling for ARM we're cross compiling > +@@ -170,10 +174,15 @@ > + EXTRA_DEFINES += -DPROFILING_SKIP_PP_JOBS=1 -DPROFILING_SKIP_GP_JOBS=1 > + endif > + > ++EXTRA_DEFINES += -Wno-error=date-time > ++ > + all: $(UMP_SYMVERS_FILE) > +- $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) modules > ++ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) O=$(O) modules > + @rm $(FILES_PREFIX)__malidrv_build_info.c > $(FILES_PREFIX)__malidrv_build_info.o > + > ++modules_install: > ++ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) modules_install > ++ > + clean: > + $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean > + > diff --git a/recipes-graphics/mali/mali-modules.bb > b/recipes-graphics/mali/mali-modules.bb > deleted file mode 100644 > index 20f9d41..000 > --- a/recipes-graphics/mali/mali-modules.bb > +++ /dev/null > @@ -1,37 +0,0 @@ > -SUMMARY = "A Mali 400 Linux Kernel module" > -SECTION = "kernel/modules" > - > -PROVIDES += "kernel-module-mali" > - > -LICENSE = "GPLv2" > -LIC_FILES_CHKSUM = " \ > - > file://linux/license/gpl/mali_kernel_license.h;md5=68c66513a9dacef77a52c3d6c5e6afd5 > \ > - " > - > -PV = "r5p1-01rel0" > - > -SRC_URI = " \ > - > http://malideveloper.arm.com/downloads/drivers/DX910/${PV}/DX910-SW-99002-${PV}.tgz > \ > - file://Makefile.patch \ > - " > -SRC_URI[md5sum] = "9c85c113e4d41ae992e45ba27287d1ab" > -SRC_URI[sha256sum] = > "86209c99c36a7622402b016b6f764c212b738ccdec9cdc6d6f16758c013957a0" > - > -inherit module > - > -do_make_scripts[depends] +=
Re: [meta-xilinx] [PATCH] machine-xilinx-default.inc: Fix misspelled "kernel-module-mali"
On Thu, Aug 4, 2016 at 3:30 AM, Mike Looijmans <mike.looijm...@topic.nl> wrote: > On 03-08-16 18:52, Manjukumar Harthikote Matha wrote: >> >> Hi Mike/Nathan >> >> On 08/01/2016 10:47 PM, Mike Looijmans wrote: >>> >>> On 01-08-16 20:54, Manjukumar Harthikote Matha wrote: >>>> >>>> Hi Nathan, >>>> >>>> On 07/31/2016 06:15 AM, Nathan Rossi wrote: >> >> <...>> >>> >>> The PROVIDES was required, because the 'kernel-module-mali' name isn't >>> known at parse time yet, only when do_install has run. So anything that >>> (R)DEPENDS on kernel-module-mali would wrongly assume that the kernel >>> will provide it, and the module would still not be built. It would only >>> be available if you manually add a DEPENDS on the recipe name. >>> >>> The simplest and most straightforward solution is to name the recipe >>> such that it matches the package being built. Then all this trickery >>> isn't needed at all. >>> >> Should we just rename it then? > > > Yes, that was my intention, but I now see that patch never made it to my > outbox. I'll send a patch tomorrow. > I've applied that patch, as well as this patch. It exposed the fact that ep108-zynqmp which defaults to linux-yocto doesn't provide support for the mali module. So I added an additional patch to have this recommends only when using virtual/kernel == linux-xlnx. Thanks, Nathan -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] uRamdisk.image.gz
Hi, The size of core-image-minimal is limited by the packages you have installed. 'cpio' is an archive format like tar, so it represents the actual packed size, unlike an 'ext' initrd image which represents the size of the filesystem (although the gzip compression of a ext should reduce the empty space of the filesystem). If the size of core-image-minimal is too large for your design, consider configuring a custom image for your design. Also consider disabling certain distro features that you do not need (or look at the poky-tiny distro if you are using the poky distro). As core-image-minimal is intended to represent a minimal image. Regards, Nathan On Thu, Jul 21, 2016 at 7:33 PM, Cai, Chuntian (GE Transportation) <chuntian@ge.com> wrote: > Hi Rossi, > > I understand it, I downloaded > "core-image-minimal-zc706-zynq7-20160719091857.rootfs.cpio.gz.u-boot" to > ZC706 board. Work well > > But the size of > "core-image-minimal-zc706-zynq7-20160719091857.rootfs.cpio.gz.u-boot" is very > big!! > > How to reduce the size of > "core-image-minimal-zc706-zynq7-20160719091857.rootfs.cpio.gz.u-boot" > > > -Original Message- > From: Nathan Rossi [mailto:nat...@nathanrossi.com] > Sent: Thursday, July 21, 2016 5:14 PM > To: Cai, Chuntian (GE Transportation) <chuntian@ge.com> > Cc: meta-xil...@lists.yoctoproject.org > Subject: EXT: Re: uRamdisk.image.gz > > Hi, > > "uramdisk.image.gz" is just another name for "*.cpio.gz.u-boot" (or any > initramfs/initrd format e.g. ext. Which is gzipped and wrapped with the > u-boot image header). > > All meta-xilinx machines are setup by default to generate the > *.cpio.gz.u-boot for the images you build. You can get other formats like > ext.gz.u-boot, etc by adding them to IMAGE_FSTYPES > (http://git.yoctoproject.org/cgit/cgit.cgi/meta-xilinx/tree/docs/Rootfs). > > If you want it named as "uramdisk.image.gz" renaming it to that when writing > it to the sd card/etc is sufficient. > > Regards, > Nathan > > On Thu, Jul 21, 2016 at 6:47 PM, Cai, Chuntian (GE Transportation) > <chuntian@ge.com> wrote: >> Hi Rossi, >> >> Could you tell me how to make uRamdisk.image.gz with YOCTO toolchain. >> >> Thanks. >> >> >> -Original Message- >> From: Nathan Rossi [mailto:nat...@nathanrossi.com] >> Sent: Tuesday, July 12, 2016 5:22 PM >> To: Cai, Chuntian (GE Transportation) <chuntian@ge.com> >> Cc: meta-xil...@lists.yoctoproject.org >> Subject: EXT: Re: [meta-xilinx] I could not download linux-xlnx.git from >> YOCTO. >> >> On Tue, Jul 12, 2016 at 11:59 AM, Cai, Chuntian (GE Transportation) >> <chuntian@ge.com> wrote: >>> Hi Rossi, >>> >>> I am strange, I can download all the package except for >>> linux-xlnx-4.4-xilinx.git package with current proxy setting. >>> >> >> Since you are using poky, I suspect you might be getting a large percentage >> of your sources from the poky source mirror. This is fine, but it means that >> you only need to do http downloads even for some of the recipes that have >> git sources. >> >>> I can open the website >>> https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_Xilinx_linux-2Dxlnx=CwIFaQ=IV_clAzoPDE253xZdHuilRgztyh_RiV3wUrLrDQYWSI=Ei3floKgst6PhYpovUjTVlWwDEc4CVl_t-gxqM04eQY=nq8czs_U5UXDvXM4ciXRICgPDdXYu7ElFGMISg-LHBI=g9Dyxs-86wE5plyauMqhKrxK8lVmDN8OaMc279mWldE= >>> from IE & firefox. >>> >>> I setted proxy setting in the ~./bashrc. >> >> I have seen issues with proxies before for kernel repos, this is due to the >> large pack files that git attempts to retrieve. And the delayed time it >> takes to compress the pack files on the remote which some proxies timeout >> on. Sometimes using a different protocol works better that others. Try to >> clone the repo outside of yocto. Also try the different protocols if one >> fails. e.g. >> >> git clone >> https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_Xilinx >> _linux-2Dxlnx.git=CwIFaQ=IV_clAzoPDE253xZdHuilRgztyh_RiV3wUrLrDQYW >> SI=Ei3floKgst6PhYpovUjTVlWwDEc4CVl_t-gxqM04eQY=nq8czs_U5UXDvXM4ciX >> RICgPDdXYu7ElFGMISg-LHBI=x-ZWgWgfN-aaj3mudJuBFjg1KicY-DqWbbIpbJVqwhw >> = >> or (ssh) >> git clone g...@github.com:Xilinx/linux-xlnx.git >> or (git) >> git clone git://github.com/Xilinx/linux-xlnx.git >> >> If you find that one of these protocols work, change the protocol >> value in the linux-xlnx.inc recipe to use it >> (http://git.yoctoproject.org/cgit/cgit.cgi/meta-xilinx
Re: [meta-xilinx] Xilinx QEMU in meta-xilinx
On Wed, Jul 20, 2016 at 10:21 AM, Alistair Franciswrote: > Hello everyone, > > Xilinx maintains it's own version of QEMU based on the mainline > version of QEMU: https://github.com/xilinx/qemu/ > > This tree has a lot of focus on extra support and features for the > Xilinx architectures. Although we are trying to get all of these > features upstream to mainline QEMU it is slow work and unfortunately > not always possible. > > We are looking at providing support to build the Xilinx QEMU in the > meta-xilinx layer. This could be disabled by default and enabled by > changing the PREFERRED_VERSION_qemu variable. The advantage this would > bring is much more accurate and extensive support for emulating the > Xilinx platforms. Hi Alistair, This sounds like a great feature. Some things to consider about having two versions of QEMU. Due to how qemu is built and populated into the native sysroot, only one binary version can exist at a time and because switching machines does not change the native sysroot this would cause a rebuild of qemu when switching from a meta-xilinx machine (set to use the xilinx qemu) to for example a qemu* machine in oecore. An alternative that may be worth looking into is to have both version populated in the sysroot at the same time. This could be done a number of ways, the easiest would be to install the qemu binaries into a /usr/bin/qemu-xilinx/ subdir. And have a "qemu-xilinx" recipe that inherits qemu.inc. Also I think there would need to be a runqemu script or similar setup in meta-xilinx to handle the Xilinx QEMU due to some of features that are not available in mainline (e.g. fdt-generic, loader, etc). > > What is the consensus on this, do people think that including the > Xilinx tree of QEMU is acceptable? It sounds acceptable to me. Regards, Nathan > > Thanks, > > Alistair -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH] zcu102-zynqmp.conf: Add parameters for UBI filesystem creation
On Tue, Aug 16, 2016 at 7:13 PM, Mike Looijmanswrote: > Provide the data that the UBI tools need to create filesystems for > the zcu102 board. > > (Note that the QSPI drivers for the Zynq and the ZynqMP do not work > properly when in parallel mode, so the resulting filesystem cannot > actually be mounted yet.) > > Signed-off-by: Mike Looijmans > --- > conf/machine/zcu102-zynqmp.conf | 6 ++ > 1 file changed, 6 insertions(+) > > diff --git a/conf/machine/zcu102-zynqmp.conf b/conf/machine/zcu102-zynqmp.conf > index b2bb9dc..c0f8196 100644 > --- a/conf/machine/zcu102-zynqmp.conf > +++ b/conf/machine/zcu102-zynqmp.conf > @@ -24,3 +24,9 @@ EXTRA_IMAGEDEPENDS += "\ > > # The xczu9eg has a MALI GPU > MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-module-mali" > + > +# Use QSPI flash with 128k sector size > +MKUBIFS_ARGS = "-m 1 -e 131200 -c 952" "-e 128KiB" is valid with mkfs.ubifs. > +UBINIZE_ARGS = "-m 1 -p 128KiB" > +UBI_VOLNAME = "qspi-rootfs" Is the custom volname set for a specific reason? if yes this patch should probably use the multiubi type with the name "qspi" to allow for ubifs use with other flash devices on the board? Regards, Nathan > + > -- > 1.9.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
Re: [meta-xilinx] [PATCH] qemu-xilinx: Add support for building extensible SDK
On 31 January 2017 at 11:21, Alistair Franciswrote: > This patch allows the user to build an extensible SDK including the > Xilinx fork of QEMU. > > Signed-off-by: Alistair Francis > --- > recipes-devtools/qemu/qemu-xilinx_2017.1.bb | 28 +--- > 1 file changed, 17 insertions(+), 11 deletions(-) > > diff --git a/recipes-devtools/qemu/qemu-xilinx_2017.1.bb > b/recipes-devtools/qemu/qemu-xilinx_2017.1.bb > index ee6b1e9..3239f59 100644 > --- a/recipes-devtools/qemu/qemu-xilinx_2017.1.bb > +++ b/recipes-devtools/qemu/qemu-xilinx_2017.1.bb > @@ -22,23 +22,29 @@ KVMENABLE = "--disable-kvm" > # Strip all appends (needed because qemu.inc adds patches using overrides) > SRC_URI[_append] = "" > > +DISABLE_STATIC_pn-qemu-xilinx = "" > DISABLE_STATIC_pn-qemu-xilinx-native = "" > -DISABLE_STATIC_pn-nativesdk-qemu-xilinx-native = "" > +DISABLE_STATIC_pn-nativesdk-qemu-xilinx = "" > > # append a suffix dir, to allow multiple versions of QEMU to be installed > -datadir_append = "/qemu-xilinx" > -bindir_append = "/qemu-xilinx" > -libexecdir_append = "/qemu-xilinx" > - > -# ensure configure is passed the modified dirs > -EXTRA_OECONF += " \ > - --bindir=${bindir} \ > - --datadir=${datadir} \ > - --mandir=${mandir} \ > - --docdir=${docdir} \ > +EXTRA_OECONF_append = " \ > + --bindir=${bindir}/qemu-xilinx \ > + --libexecdir=${libexecdir}/qemu-xilinx \ > + --datadir=${datadir}/qemu-xilinx \ > " > > +do_compile_ptest() { > + : > +} > + > +do_install_ptest() { > + : > +} Just setting PTEST_ENABLED = "" somewhere after the qemu.inc should be enough to disable all ptest functionality. Since there are other parts of ptest still doing things even with these tasks being empty (e.g. Packages, do_configure_ptest, depending on the ptest-runner, etc.). > + > do_install() { > export STRIP="true" > autotools_do_install > + > +# Prevent QA warnings about installed ${localstatedir}/run > +if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; > fi When you do a v2, please fix up the indenting here for consistency. Thanks, Nathan -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH v2] qemu-xilinx: Add support for building extensible SDK
On 2 February 2017 at 10:45, Alistair Franciswrote: > This patch allows the user to build an extensible SDK including the > Xilinx fork of QEMU. Applied. Thanks, Nathan > > Signed-off-by: Alistair Francis > --- > recipes-devtools/qemu/qemu-xilinx_2017.1.bb | 22 +++--- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/recipes-devtools/qemu/qemu-xilinx_2017.1.bb > b/recipes-devtools/qemu/qemu-xilinx_2017.1.bb > index ee6b1e9..f291ebb 100644 > --- a/recipes-devtools/qemu/qemu-xilinx_2017.1.bb > +++ b/recipes-devtools/qemu/qemu-xilinx_2017.1.bb > @@ -22,23 +22,23 @@ KVMENABLE = "--disable-kvm" > # Strip all appends (needed because qemu.inc adds patches using overrides) > SRC_URI[_append] = "" > > +DISABLE_STATIC_pn-qemu-xilinx = "" > DISABLE_STATIC_pn-qemu-xilinx-native = "" > -DISABLE_STATIC_pn-nativesdk-qemu-xilinx-native = "" > +DISABLE_STATIC_pn-nativesdk-qemu-xilinx = "" > + > +PTEST_ENABLED = "" > > # append a suffix dir, to allow multiple versions of QEMU to be installed > -datadir_append = "/qemu-xilinx" > -bindir_append = "/qemu-xilinx" > -libexecdir_append = "/qemu-xilinx" > - > -# ensure configure is passed the modified dirs > -EXTRA_OECONF += " \ > - --bindir=${bindir} \ > - --datadir=${datadir} \ > - --mandir=${mandir} \ > - --docdir=${docdir} \ > +EXTRA_OECONF_append = " \ > + --bindir=${bindir}/qemu-xilinx \ > + --libexecdir=${libexecdir}/qemu-xilinx \ > + --datadir=${datadir}/qemu-xilinx \ > " > > do_install() { > export STRIP="true" > autotools_do_install > + > + # Prevent QA warnings about installed ${localstatedir}/run > + if [ -d ${D}${localstatedir}/run ]; then rmdir > ${D}${localstatedir}/run; fi > } > -- > 2.7.4 > -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH 0/4] Fixes, removals and improving MicroBlaze tune includes
On 18 January 2017 at 23:40, Nathan Rossi <nat...@nathanrossi.com> wrote: > This series includes the following changes: > > * Adding CONFIG_USB_ULPI for Zynq to fix USB on some boards > * Removal of zynq7-base.dtsi, this was deprecated and now removed > * Improve MicroBlaze tune includes > > Nathan Rossi (4): > device-tree: Remove zynq7-base.dtsi > linux/config: Add "CONFIG_USB_ULPI" for zynq7 Merged these two patches. And also applied the ULPI config patch to morty. > feature-microblaze-versions.inc: Clean up and consolidation > arch-microblaze.inc: Consolidate MicroBlaze tune features I will hold off on applying these till Manju finishes verification. Regards, Nathan > > .../machine/include/microblaze/arch-microblaze.inc | 43 ++ > .../microblaze/feature-microblaze-barrel-shift.inc | 3 - > .../microblaze/feature-microblaze-divide.inc | 3 - > .../microblaze/feature-microblaze-endian.inc | 13 - > .../include/microblaze/feature-microblaze-fpu.inc | 17 - > .../include/microblaze/feature-microblaze-math.inc | 33 ++ > .../microblaze/feature-microblaze-multiply.inc | 9 - > .../feature-microblaze-pattern-compare.inc | 3 - > .../microblaze/feature-microblaze-reorder.inc | 3 - > .../include/microblaze/feature-microblaze-v10.inc | 5 - > .../include/microblaze/feature-microblaze-v7.inc | 7 - > .../include/microblaze/feature-microblaze-v8.inc | 45 -- > .../include/microblaze/feature-microblaze-v9.inc | 8 - > .../microblaze/feature-microblaze-versions.inc | 126 +- > conf/machine/include/tune-microblaze-features.inc | 20 - > conf/machine/include/tune-microblaze.inc | 7 +- > recipes-bsp/device-tree/device-tree.bb | 13 - > .../device-tree/files/common/zynq7-base.dtsi | 504 > - > .../xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg | 1 + > 19 files changed, 182 insertions(+), 681 deletions(-) > create mode 100644 conf/machine/include/microblaze/arch-microblaze.inc > delete mode 100644 > conf/machine/include/microblaze/feature-microblaze-barrel-shift.inc > delete mode 100644 > conf/machine/include/microblaze/feature-microblaze-divide.inc > delete mode 100644 > conf/machine/include/microblaze/feature-microblaze-endian.inc > delete mode 100644 conf/machine/include/microblaze/feature-microblaze-fpu.inc > create mode 100644 > conf/machine/include/microblaze/feature-microblaze-math.inc > delete mode 100644 > conf/machine/include/microblaze/feature-microblaze-multiply.inc > delete mode 100644 > conf/machine/include/microblaze/feature-microblaze-pattern-compare.inc > delete mode 100644 > conf/machine/include/microblaze/feature-microblaze-reorder.inc > delete mode 100644 conf/machine/include/microblaze/feature-microblaze-v10.inc > delete mode 100644 conf/machine/include/microblaze/feature-microblaze-v7.inc > delete mode 100644 conf/machine/include/microblaze/feature-microblaze-v8.inc > delete mode 100644 conf/machine/include/microblaze/feature-microblaze-v9.inc > delete mode 100644 conf/machine/include/tune-microblaze-features.inc > delete mode 100644 recipes-bsp/device-tree/files/common/zynq7-base.dtsi > > -- > 2.11.0 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH 0/4] Updates to match updates in oe-core master
On 26 January 2017 at 00:59, Nathan Rossi <nat...@nathanrossi.com> wrote: > These updates are based on oe-core master as at 2017-01-26 (40463f9d80). Merged. Regards, Nathan > > Nathan Rossi (4): > conf/machine/*.conf: Move to QB_NETWORK_DEVICE for QEMU targets > glibc-*.bbappend: Update appends for glibc 2.25 > u-boot_*.bbappend: Change u-boot bbappend to wildcard > linux-yocto*_4.9.bbappend: Enable linux-yocto 4.9 > > conf/machine/ep108-zynqmp.conf| 3 +-- > conf/machine/ml605-qemu-microblazeel.conf | 3 +-- > conf/machine/qemu-zynq7.conf | 3 +-- > conf/machine/s3adsp1800-qemu-microblazeeb.conf| 3 +-- > conf/machine/zcu102-zynqmp.conf | 3 +-- > recipes-bsp/u-boot/{u-boot_2016.11.bbappend => u-boot_%.bbappend} | 2 +- > recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend| 4 > > recipes-kernel/linux/linux-yocto_4.9.bbappend | 4 > > .../{glibc-initial_2.24.bbappend => glibc-initial_2.25.bbappend} | 0 > recipes-microblaze/glibc/{glibc_2.24.bbappend => glibc_2.25.bbappend} | 0 > 10 files changed, 14 insertions(+), 11 deletions(-) > rename recipes-bsp/u-boot/{u-boot_2016.11.bbappend => u-boot_%.bbappend} > (90%) > create mode 100644 recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend > create mode 100644 recipes-kernel/linux/linux-yocto_4.9.bbappend > rename recipes-microblaze/glibc/{glibc-initial_2.24.bbappend => > glibc-initial_2.25.bbappend} (100%) > rename recipes-microblaze/glibc/{glibc_2.24.bbappend => glibc_2.25.bbappend} > (100%) > > -- > 2.11.0 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [dev-2017.1] gstreamer1.0-plugins-bad related bbapend file and patches.
On 3 February 2017 at 23:10, Dhaval Rajeshbhai Shah <dhaval.s...@xilinx.com> wrote: > Hi Nathan, > > This patches are for the dev-3017.1 branch of the meta-xilinx repo. > > To remove the confusion, I have updated the subject as well. In the future to avoid such confusion of this matter please avoid sending patches for any Xilinx customized fork of meta-xilinx to this list (meta-xil...@lists.yoctoproject.org). Unless you intend for the changes to be applied to meta-xilinx as well. > > This changes are to integrate the bad plugin related changes which are not > part of the bad plugin bb file. > > Some of the patches contains the changed specific to Xilinx so that don't > need to be upstream to where gstreamer bad plugin related changes available. > But need to maintain in the Xilinx repository meta-xilinx as patch. Just cause your changes are "Xilinx" specific does not make them invalid for submission upstream.You should be upstreaming your changes (or at least trying to) before trying to put your patches in down stream projects like Yocto/OE/meta-xilinx. Otherwise you will be spending more time patching gstreamer in projects like meta-xilinx, buildroot, Ubuntu, etc. And all because you "don't need to" upstream your changes to gstreamer. Regards, Nathan > > Thanks & Regards, > > Dhaval > > Original Message > > Subject: Re: [meta-xilinx] [metx-xilinx][dev-2017.1] > gstreamer1.0-plugins-bad related bbapend file and patches. > > From: Nathan Rossi <nat...@nathanrossi.com> > > Date: Feb 3, 2017, 6:09 PM > > To: Dhaval Rajeshbhai Shah <ds...@xilinx.com> > > On 3 February 2017 at 21:39, Dhaval Shah <dhaval.s...@xilinx.com> wrote: >> All the patches from the 2016.4 maintained earlier as locally. >> Now, ported to the 2017.1 and related bbapend file is also added. > > Hi Dhaval, > > So I am a little confused. Are these patches for meta-xilinx? or are > these internal patches? or something else entirely? My below comments > assume your intention was to have this in meta-xilinx master. > > If these are for meta-xilinx are they intended for master? because > oe-core already has gstreamer 1.10.2, which makes a number of the > backported patches unnecessary. > > Also "Never" is not a standard Upstream-Status value (I know Manju > said it was in his other email). > http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations > > However if it is intended to never submit the patches upstream you > will need to provide a reason why, secondly this reason must provide a > good explanation why meta-xilinx should maintain the patches, since by > not upstreaming to gstreamer you are placing the maintenance burden in > meta-xilinx. > > Also note, some of the comments for this patch also apply as comments > for your other patch -omx bbappend. > >> >> Signed-off-by: Dhaval Shah <ds...@xilinx.com> >> --- >> ...1-gst-plugins-bad-Copy-kmssink-from-1.9.2.patch | 2550 >> >> .../0002-Compile-kms.patch | 80 + >> ...03-gst-kmssink-Add-support-for-xilinx-drm.patch | 31 + >> ...sink-override-stride-if-defined-in-driver.patch | 54 + >> ...05-kmssink-Fix-selection-of-source-region.patch | 88 + >> ...-kmssink-Scale-up-to-the-screen-dimension.patch | 31 + >> .../0007-kmssink-experimentation.patch | 89 + >> .../gstreamer/gstreamer1.0-plugins-bad_%.bbappend | 18 + >> 8 files changed, 2941 insertions(+) >> create mode 100644 >> recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gst-plugins-bad-Copy-kmssink-from-1.9.2.patch >> create mode 100644 >> recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-Compile-kms.patch >> create mode 100644 >> recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-gst-kmssink-Add-support-for-xilinx-drm.patch >> create mode 100644 >> recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-kmssink-override-stride-if-defined-in-driver.patch >> create mode 100644 >> recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-kmssink-Fix-selection-of-source-region.patch >> create mode 100644 >> recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0006-kmssink-Scale-up-to-the-screen-dimension.patch >> create mode 100644 >> recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0007-kmssink-experimentation.patch >> create mode 100644 >> recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend >> > > ... snip ... > >> +-- >> +2.7.4 >> + >> diff --git >> a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad
Re: [meta-xilinx] [PATCH] linux-xlnx.inc: Add KERNELURI
On 21 January 2017 at 17:39, Manjukumar Harthikote Matha <manjukumar.harthikote-ma...@xilinx.com> wrote: > Hi Nathan, > >> -Original Message- >> From: meta-xilinx-boun...@yoctoproject.org [mailto:meta-xilinx- >> boun...@yoctoproject.org] On Behalf Of Nathan Rossi >> Sent: Thursday, January 19, 2017 11:12 PM >> To: Vineeth Karumanchi >> Cc: meta-xilinx@yoctoproject.org >> Subject: Re: [meta-xilinx] [PATCH] linux-xlnx.inc: Add KERNELURI >> >> On 19 January 2017 at 18:04, Vineeth Chowdary Karumanchi >> <vineethchowz.chowd...@xilinx.com> wrote: >> > Add KERNELURI for custom kernel url's >> >> Could you elaborate on the reason for this change, maybe its one of the >> following? >> >> * Providing a different mirror to source the git repo >> * Changing the protocol to allow for git/ssh cloning >> * Pointing a a different internal-only source for the linux-xlnx repo > Mainly this, with PetaLinux Tools inheriting Yocto, there is significant > number of request to change SRC_URI to point to different repos. > >> * Having the include more reusable for kernels that are derived from the >> linux-xlnx >> kernel > We have some use case of this as well. That's fine, just wanted to make sure I understood what the goal of the change was. Applied, but with a minor change to setting KERNELURI with "?=" instead of just "=". So that it is straight forward to set the value from recipes/etc. Thanks, Nathan > > Thanks > Manju > >> >> Thanks, >> Nathan >> >> > >> > Signed-off-by: Vineeth Chowdary Karumanchi >> > <vineethchowz.chowd...@xilinx.com> >> > Reviewed-by: Manjukumar Harthikote Matha >> > <manjukumar.harthikote-ma...@xilinx.com> >> > --- >> > recipes-kernel/linux/linux-xlnx.inc | 3 ++- >> > 1 file changed, 2 insertions(+), 1 deletion(-) >> > >> > diff --git a/recipes-kernel/linux/linux-xlnx.inc >> > b/recipes-kernel/linux/linux-xlnx.inc >> > index 1474658..dd71324 100644 >> > --- a/recipes-kernel/linux/linux-xlnx.inc >> > +++ b/recipes-kernel/linux/linux-xlnx.inc >> > @@ -9,8 +9,9 @@ KBRANCH ?= "" >> > SRCBRANCHARG = "${@['nobranch=1', >> 'branch=${KBRANCH}'][d.getVar('KBRANCH', True) != '']}" >> > >> > FILESOVERRIDES_append = ":${LINUX_VERSION}" >> > +KERNELURI = "git://github.com/Xilinx/linux-xlnx.git;protocol=https" >> > SRC_URI = " \ >> > - >> > git://github.com/Xilinx/linux-xlnx.git;protocol=https;${SRCBRANCHARG} \ >> > + ${KERNELURI};${SRCBRANCHARG} \ >> > file://xilinx-base;type=kmeta;destsuffix=xilinx-base \ >> > " >> > >> > -- >> > 2.7.4 >> > >> > -- >> > ___ >> > 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 > > > This email and any attachments are intended for the sole use of the named > recipient(s) and contain(s) confidential information that may be proprietary, > privileged or copyrighted under applicable law. If you are not the intended > recipient, do not read, copy, or forward this email message or any > attachments. Delete this email message and any attachments immediately. > -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 4/4] linux-yocto*_4.9.bbappend: Enable linux-yocto 4.9
Enable linux-yocto and linux-yocto-tiny 4.9 kernels. Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend | 4 recipes-kernel/linux/linux-yocto_4.9.bbappend | 4 2 files changed, 8 insertions(+) create mode 100644 recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend create mode 100644 recipes-kernel/linux/linux-yocto_4.9.bbappend diff --git a/recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend b/recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend new file mode 100644 index 00..651e0d727f --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend @@ -0,0 +1,4 @@ + +require linux-xilinx-configs.inc +require linux-xilinx-machines.inc + diff --git a/recipes-kernel/linux/linux-yocto_4.9.bbappend b/recipes-kernel/linux/linux-yocto_4.9.bbappend new file mode 100644 index 00..651e0d727f --- /dev/null +++ b/recipes-kernel/linux/linux-yocto_4.9.bbappend @@ -0,0 +1,4 @@ + +require linux-xilinx-configs.inc +require linux-xilinx-machines.inc + -- 2.11.0 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 2/4] glibc-*.bbappend: Update appends for glibc 2.25
Update the appends to apply for glibc 2.25. The MicroBlaze patch still applies for this version. Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- .../glibc/{glibc-initial_2.24.bbappend => glibc-initial_2.25.bbappend}| 0 recipes-microblaze/glibc/{glibc_2.24.bbappend => glibc_2.25.bbappend} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename recipes-microblaze/glibc/{glibc-initial_2.24.bbappend => glibc-initial_2.25.bbappend} (100%) rename recipes-microblaze/glibc/{glibc_2.24.bbappend => glibc_2.25.bbappend} (100%) diff --git a/recipes-microblaze/glibc/glibc-initial_2.24.bbappend b/recipes-microblaze/glibc/glibc-initial_2.25.bbappend similarity index 100% rename from recipes-microblaze/glibc/glibc-initial_2.24.bbappend rename to recipes-microblaze/glibc/glibc-initial_2.25.bbappend diff --git a/recipes-microblaze/glibc/glibc_2.24.bbappend b/recipes-microblaze/glibc/glibc_2.25.bbappend similarity index 100% rename from recipes-microblaze/glibc/glibc_2.24.bbappend rename to recipes-microblaze/glibc/glibc_2.25.bbappend -- 2.11.0 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH 0/4] Fixes, removals and improving MicroBlaze tune includes
On 21 January 2017 at 03:20, Manjukumar Harthikote Matha <manjukumar.harthikote-ma...@xilinx.com> wrote: > Hi Nathan, > >> -Original Message- >> From: meta-xilinx-boun...@yoctoproject.org [mailto:meta-xilinx- >> boun...@yoctoproject.org] On Behalf Of Nathan Rossi >> Sent: Wednesday, January 18, 2017 5:41 AM >> To: meta-xil...@lists.yoctoproject.org >> Subject: [meta-xilinx] [PATCH 0/4] Fixes, removals and improving MicroBlaze >> tune >> includes >> >> This series includes the following changes: >> >> * Adding CONFIG_USB_ULPI for Zynq to fix USB on some boards >> * Removal of zynq7-base.dtsi, this was deprecated and now removed >> * Improve MicroBlaze tune includes >> >> Nathan Rossi (4): >> device-tree: Remove zynq7-base.dtsi >> linux/config: Add "CONFIG_USB_ULPI" for zynq7 >> feature-microblaze-versions.inc: Clean up and consolidation >> arch-microblaze.inc: Consolidate MicroBlaze tune features >> >> .../machine/include/microblaze/arch-microblaze.inc | 43 ++ >> .../microblaze/feature-microblaze-barrel-shift.inc | 3 - >> .../microblaze/feature-microblaze-divide.inc | 3 - >> .../microblaze/feature-microblaze-endian.inc | 13 - >> .../include/microblaze/feature-microblaze-fpu.inc | 17 - >> .../include/microblaze/feature-microblaze-math.inc | 33 ++ >> .../microblaze/feature-microblaze-multiply.inc | 9 - >> .../feature-microblaze-pattern-compare.inc | 3 - >> .../microblaze/feature-microblaze-reorder.inc | 3 - >> .../include/microblaze/feature-microblaze-v10.inc | 5 - >> .../include/microblaze/feature-microblaze-v7.inc | 7 - >> .../include/microblaze/feature-microblaze-v8.inc | 45 -- >> .../include/microblaze/feature-microblaze-v9.inc | 8 - >> .../microblaze/feature-microblaze-versions.inc | 126 +- >> conf/machine/include/tune-microblaze-features.inc | 20 - >> conf/machine/include/tune-microblaze.inc | 7 +- >> recipes-bsp/device-tree/device-tree.bb | 13 - >> .../device-tree/files/common/zynq7-base.dtsi | 504 >> - >> .../xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg | 1 + >> 19 files changed, 182 insertions(+), 681 deletions(-) create mode 100644 >> conf/machine/include/microblaze/arch-microblaze.inc >> delete mode 100644 >> conf/machine/include/microblaze/feature-microblaze-barrel- >> shift.inc >> delete mode 100644 conf/machine/include/microblaze/feature-microblaze- >> divide.inc >> delete mode 100644 conf/machine/include/microblaze/feature-microblaze- >> endian.inc >> delete mode 100644 >> conf/machine/include/microblaze/feature-microblaze-fpu.inc >> create mode 100644 conf/machine/include/microblaze/feature-microblaze- >> math.inc >> delete mode 100644 conf/machine/include/microblaze/feature-microblaze- >> multiply.inc >> delete mode 100644 >> conf/machine/include/microblaze/feature-microblaze-pattern- >> compare.inc >> delete mode 100644 conf/machine/include/microblaze/feature-microblaze- >> reorder.inc >> delete mode 100644 >> conf/machine/include/microblaze/feature-microblaze-v10.inc >> delete mode 100644 conf/machine/include/microblaze/feature-microblaze-v7.inc >> delete mode 100644 conf/machine/include/microblaze/feature-microblaze-v8.inc >> delete mode 100644 conf/machine/include/microblaze/feature-microblaze-v9.inc >> delete mode 100644 conf/machine/include/tune-microblaze-features.inc >> delete mode 100644 recipes-bsp/device-tree/files/common/zynq7-base.dtsi >> > > Patch series looks good to me. I am about to verify the MB. > Thanks for the series Manju, did you hit any issues with the MB changes? or good to merge? Thanks, Nathan -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 0/4] Updates to match updates in oe-core master
These updates are based on oe-core master as at 2017-01-26 (40463f9d80). Nathan Rossi (4): conf/machine/*.conf: Move to QB_NETWORK_DEVICE for QEMU targets glibc-*.bbappend: Update appends for glibc 2.25 u-boot_*.bbappend: Change u-boot bbappend to wildcard linux-yocto*_4.9.bbappend: Enable linux-yocto 4.9 conf/machine/ep108-zynqmp.conf| 3 +-- conf/machine/ml605-qemu-microblazeel.conf | 3 +-- conf/machine/qemu-zynq7.conf | 3 +-- conf/machine/s3adsp1800-qemu-microblazeeb.conf| 3 +-- conf/machine/zcu102-zynqmp.conf | 3 +-- recipes-bsp/u-boot/{u-boot_2016.11.bbappend => u-boot_%.bbappend} | 2 +- recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend| 4 recipes-kernel/linux/linux-yocto_4.9.bbappend | 4 .../{glibc-initial_2.24.bbappend => glibc-initial_2.25.bbappend} | 0 recipes-microblaze/glibc/{glibc_2.24.bbappend => glibc_2.25.bbappend} | 0 10 files changed, 14 insertions(+), 11 deletions(-) rename recipes-bsp/u-boot/{u-boot_2016.11.bbappend => u-boot_%.bbappend} (90%) create mode 100644 recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend create mode 100644 recipes-kernel/linux/linux-yocto_4.9.bbappend rename recipes-microblaze/glibc/{glibc-initial_2.24.bbappend => glibc-initial_2.25.bbappend} (100%) rename recipes-microblaze/glibc/{glibc_2.24.bbappend => glibc_2.25.bbappend} (100%) -- 2.11.0 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 3/4] u-boot_*.bbappend: Change u-boot bbappend to wildcard
This append no longer provides patches and only includes the platform init injection support. As such this append can apply generally to 'u-boot' versions. Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- recipes-bsp/u-boot/{u-boot_2016.11.bbappend => u-boot_%.bbappend} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename recipes-bsp/u-boot/{u-boot_2016.11.bbappend => u-boot_%.bbappend} (90%) diff --git a/recipes-bsp/u-boot/u-boot_2016.11.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend similarity index 90% rename from recipes-bsp/u-boot/u-boot_2016.11.bbappend rename to recipes-bsp/u-boot/u-boot_%.bbappend index 78e5ac6cc8..8513670671 100644 --- a/recipes-bsp/u-boot/u-boot_2016.11.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -1,7 +1,7 @@ include u-boot-spl-zynq-init.inc # u-boot 2016.11 has support for these -HAS_PS7INIT ?= " \ +HAS_PS7INIT ??= " \ zynq_microzed_config \ zynq_zed_config \ zynq_zc702_config \ -- 2.11.0 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH 0/4] Misc fixes and QEMU update
On 27 January 2017 at 07:23, Alistair Franciswrote: > Here are two misc fixes that we found and two patches that update Xilinx's > QEMU > based on the 2017.1 development. Applied. Thanks, Nathan > > Alistair Francis (4): > qemu-devicetrees: Change the basename arguments > qemu-xilinx: Disable static option for qemu nativesdk > qemu-devicetrees: Update to the 2017.1 development > qemu-xilinx: Update to the 2017.1 development > > ...linx-dp-Add-support-for-yuy2-video-format.patch | 28 -- > recipes-devtools/qemu/qemu-devicetrees_2016.4.bb | 33 > recipes-devtools/qemu/qemu-devicetrees_2017.1.bb | 33 > recipes-devtools/qemu/qemu-xilinx_2016.4.bb| 44 > -- > recipes-devtools/qemu/qemu-xilinx_2017.1.bb| 44 > ++ > 5 files changed, 77 insertions(+), 105 deletions(-) > delete mode 100644 > recipes-devtools/qemu/files/xilinx-dp-Add-support-for-yuy2-video-format.patch > delete mode 100644 recipes-devtools/qemu/qemu-devicetrees_2016.4.bb > create mode 100644 recipes-devtools/qemu/qemu-devicetrees_2017.1.bb > delete mode 100644 recipes-devtools/qemu/qemu-xilinx_2016.4.bb > create mode 100644 recipes-devtools/qemu/qemu-xilinx_2017.1.bb > > -- > 2.7.4 > -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] [PATCH] zcu102-zynqmp: fix machine name in conf
On 13 February 2017 at 23:57, Jean-Francois Dagenaiswrote: > Signed-off-by: Jean-Francois Dagenais Applied. Thanks, Nathan > --- > conf/machine/zcu102-zynqmp.conf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/conf/machine/zcu102-zynqmp.conf b/conf/machine/zcu102-zynqmp.conf > index 10b8575..083e48d 100644 > --- a/conf/machine/zcu102-zynqmp.conf > +++ b/conf/machine/zcu102-zynqmp.conf > @@ -1,5 +1,5 @@ > #@TYPE: Machine > -#@NAME: zynqmp-zcu102 > +#@NAME: zcu102-zynqmp > #@DESCRIPTION: Machine support for ZCU102 Evaluation Board. > # > > -- > 2.1.4 > > -- > ___ > 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
Re: [meta-xilinx] u-boot environment limit
On 14 February 2017 at 23:22, Arno Steffenswrote: > If I increase the uboot environment (by patching zynq-common.h) it happens > that uboot stops working. > With a few lines changing/adding it seems to boot normal. > With more lines is stops after "DRAM: ECC disabled 496 MiB" > > Now I played with the patch and get once this (see below): > This looks a bit like overwriting memory. > > So is there a fix limit for the environment? It seems to be one huge string, > right? > How can I extend this? Is this a bug? > > #define CONFIG_ENV_SIZE 0x1 -> this seems to me big > enough. The default zynq-common.h CONFIG_ENV_SIZE is double this value, 128 << 10 == 0x2. And the default environment is pretty packed (64K might not be enough). If you want your environment to fit within 64K, you will need to reduce the default environment config that is provided by zynq-common.h. > > U-Boot 2016.07-dirty (Feb 14 2017 - 12:59:07 +0100) > > Model: Zynq MicroZED Board > Board: Xilinx Zynq > DRAM: ECC disabled 496 MiB > Error binding driver 'gpio_zynq': -12 > Error binding driver 'serial_zynq': -12 > Error binding driver 'zynq_qspi': -12 > Error binding driver 'zynq_gem': -12 > Error binding driver 'arasan_sdhci': -12 > Error binding driver 'generic_simple_bus': -12 > Some drivers failed to bind > Error binding driver 'generic_simple_bus': -12 > Some drivers failed to bind > initcall sequence 1ef99b98 failed at call 0400ea34 (err=-12) > ### ERROR ### Please RESET the board ### These are all ENOMEM errors, likely caused because they are trying to read/write past the end of the environment. Regards, Nathan -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 2/7] docs/*: Remove old documentation
The documentation in the docs/ directory is now out dated and was replaced with the README.*.md files in the root of the repository. Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- docs/BOOT.jtag | 30 -- docs/BOOT.sdcard | 77 docs/BOOT.tftp | 35 -- docs/Rootfs | 11 4 files changed, 153 deletions(-) delete mode 100644 docs/BOOT.jtag delete mode 100644 docs/BOOT.sdcard delete mode 100644 docs/BOOT.tftp delete mode 100644 docs/Rootfs diff --git a/docs/BOOT.jtag b/docs/BOOT.jtag deleted file mode 100644 index 0588e822e9..00 --- a/docs/BOOT.jtag +++ /dev/null @@ -1,30 +0,0 @@ - -Loading U-Boot via JTAG -=== - -Note: This boot flow requires access to Xilinx tools (for JTAG programming). - -Download the bitstream for the target machine using JTAG (The pre-built -bitstream provided in the reference design files should be used). - -(MicroBlaze) Download the 'u-boot.elf' to the target CPU via the use of XMD. - $ xmd - XMD% connect mb mdm - XMD% rst - XMD% dow u-boot.elf - XMD% con - -(Zynq) Download the 'u-boot.elf' to the target CPU via the use of XMD. -(Note: Ensure to have the boot mode pins/switches configured in JTAG mode) - $ xmd - XMD% connect arm hw - XMD% rst - XMD% dow zynq_fsbl_0.elf - XMD% con; sleep 1; stop - XMD% dow u-boot.elf - XMD% con - -U-Boot will load and the console will be avaliable on the UART interface. - ... - Hit any key to stop autoboot: 0 - U-Boot> diff --git a/docs/BOOT.sdcard b/docs/BOOT.sdcard deleted file mode 100644 index 62897f3c7b..00 --- a/docs/BOOT.sdcard +++ /dev/null @@ -1,77 +0,0 @@ - -SD Card Boot (Zynq Only) - - -Note: This boot flow requires access to Xilinx tools (for BOOT.BIN generation). - -Creating boot file --- -Using the Xilinx tools, package 'zynq_fsbl_0.elf' and 'u-boot.elf' into a -'BOOT.BIN' (See http://www.wiki.xilinx.com/Prepare+Boot+Image for details). - -Additionally if you require a bitstream at boot ensure that the bitstream is -included in the BOOT.BIN. - -Booting to U-Boot via SD - -Use an SD card with partition one in FAT16 format. - -Copy the following to the SD card partition one: - * Boot file: BOOT.BIN - -Insert the SD Card, connect UART to terminal program and boot the board the -board. (Ensure the board is configured via the MIO's for SD Boot). - -Booting the Kernel (with ramdisk rootfs) - -Use an SD card with partition one in FAT16 format. - -Copy the following to the SD card partition one: - * Kernel: uImage - * Root FS:core-image-minimal-.cpio.gz.u-boot - * Devicetree: uImage-.dtb - -Also create the file "uEnv.txt" on the SD card parition one, with the following -contents. Replacing the names of files where appropriate (this file will be -loaded into the U-Boot environment). Ensure to replace the file names with the -correct name for you machine/system. - - kernel_image=uImage - devicetree_image=uImage-.dtb - ramdisk_image=core-image-minimal-.cpio.gz.u-boot - -Alternatively you can use the default names for the images, rename them -according to below and copy them onto partition one. Doing this removes the need -to create the uEnv.txt file. - - * Kernel: uImage - * Root FS:uramdisk.image.gz - * Devicetree: devicetree.dtb - -Insert the SD Card, connect UART to terminal program and boot the board the -board. (Ensure the board is configured via the MIO's for SD Boot). - -Booting the Kernel (with mmcblk/SD card rootfs) -Use an SD card with partition one in FAT16 format, and an additional partition -for the root filesystem (formatted as EXT2/3/4). - -Copy the following to the SD card partition one: - * Kernel: uImage - * Devicetree: uImage-.dtb - -Extract the following to the SD card partion two: - * Root FS:core-image-minimal-.tar.gz - -Also create the file "uEnv.txt" on the SD card parition one, with the following -contents. Replacing the names of files where appropriate (this file will be -loaded into the U-Boot environment). Ensure to replace the file names with the -correct name for you machine/system. - - kernel_image=uImage - devicetree_image=uImage-.dtb - bootargs=console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait earlyprintk - uenvcmd=echo Copying Linux from SD to RAM... && fatload mmc 0 0x300 ${kernel_image} && fatload mmc 0 0x2A0 ${devicetree_image} && bootm 0x300 - 0x2A0 - -Insert the SD Card, connect UART to terminal program and boot the board the -board. (Ensure the board is configured via the MIO's for SD Boot). diff --gi
[meta-xilinx] [PATCH 6/7] linux-xlnx: Update to the xilinx-v2016.4 release
Update the linux-xlnx recipe to point at the xilinx-v2016.4 release. Note that this changes the naming convention for the .bb file, this has no affect on the value of PV since it is specific in the recipe itself. Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- conf/machine/include/machine-xilinx-default.inc | 2 +- recipes-kernel/linux/{linux-xlnx_4.6.bb => linux-xlnx_2016.4.bb} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename recipes-kernel/linux/{linux-xlnx_4.6.bb => linux-xlnx_2016.4.bb} (75%) diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc index 9b397ce305..673944d9e0 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc @@ -15,7 +15,7 @@ XILINX_DEFAULT_KERNEL_microblaze := "linux-yocto" XILINX_DEFAULT_KERNEL_zynqmp := "linux-yocto" PREFERRED_PROVIDER_virtual/kernel ??= "${XILINX_DEFAULT_KERNEL}" -PREFERRED_VERSION_linux-xlnx ?= "4.6%" +PREFERRED_VERSION_linux-xlnx ?= "4.6-xilinx-v2016.4%" PREFERRED_VERSION_linux-yocto ?= "4.8%" # U-Boot Configuration diff --git a/recipes-kernel/linux/linux-xlnx_4.6.bb b/recipes-kernel/linux/linux-xlnx_2016.4.bb similarity index 75% rename from recipes-kernel/linux/linux-xlnx_4.6.bb rename to recipes-kernel/linux/linux-xlnx_2016.4.bb index c226f4bfc0..456d002319 100644 --- a/recipes-kernel/linux/linux-xlnx_4.6.bb +++ b/recipes-kernel/linux/linux-xlnx_2016.4.bb @@ -1,6 +1,6 @@ LINUX_VERSION = "4.6" -XILINX_RELEASE_VERSION = "v2016.3" -SRCREV ?="0e4e4071493171bbac37bf60709022f49171c813" +XILINX_RELEASE_VERSION = "v2016.4" +SRCREV ?= "2762bc9163bb8576f63ff82801a65576f59e1e57" include linux-xlnx.inc -- 2.11.0 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 3/7] u-boot-xlnx: Update to xilinx-v2016.4 release
Update the u-boot-xlnx recipe to the xilinx-v2016.04 release. Note that this changes the naming convention for the .bb file, this has no affect on the value of PV since it is specified in the recipe itself. Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- recipes-bsp/u-boot/{u-boot-xlnx_2016.07.bb => u-boot-xlnx_2016.4.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename recipes-bsp/u-boot/{u-boot-xlnx_2016.07.bb => u-boot-xlnx_2016.4.bb} (87%) diff --git a/recipes-bsp/u-boot/u-boot-xlnx_2016.07.bb b/recipes-bsp/u-boot/u-boot-xlnx_2016.4.bb similarity index 87% rename from recipes-bsp/u-boot/u-boot-xlnx_2016.07.bb rename to recipes-bsp/u-boot/u-boot-xlnx_2016.4.bb index af33a4cf86..fc5b45b127 100644 --- a/recipes-bsp/u-boot/u-boot-xlnx_2016.07.bb +++ b/recipes-bsp/u-boot/u-boot-xlnx_2016.4.bb @@ -1,9 +1,8 @@ include u-boot-xlnx.inc include u-boot-spl-zynq-init.inc -XILINX_RELEASE_VERSION = "v2016.3" -# this matches u-boot-xlnx 'xilinx-v2016.3' release tag -SRCREV = "95e11f6eb4bc07bbee12a4217c58146bddac61b2" +XILINX_RELEASE_VERSION = "v2016.4" +SRCREV = "0b94ce5ed4a6c2cd0fec7b8337e776b03e387347" PV = "v2016.07-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-xlnx:" -- 2.11.0 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] [PATCH 1/7] linux/linux-*.inc: Add 'name' field to the kmeta type sources
When using the source archive class (for license compliance purposes) it is unable to determine the name for the kmeta type sources. Explicitly give the kmeta source entries 'name' values in the format 'kmeta-*'. Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- recipes-kernel/linux/linux-xilinx-configs.inc | 4 ++-- recipes-kernel/linux/linux-xlnx.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-kernel/linux/linux-xilinx-configs.inc b/recipes-kernel/linux/linux-xilinx-configs.inc index 30b6a8fdaa..5892c1c43d 100644 --- a/recipes-kernel/linux/linux-xilinx-configs.inc +++ b/recipes-kernel/linux/linux-xilinx-configs.inc @@ -5,7 +5,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/config:" SRC_URI_append = " \ - file://xilinx-common;type=kmeta;destsuffix=xilinx-common \ - file://xilinx-machine;type=kmeta;destsuffix=xilinx-machine \ + file://xilinx-common;type=kmeta;name=kmeta-xilinx-common;destsuffix=xilinx-common \ + file://xilinx-machine;type=kmeta;name=kmeta-xilinx-machine;destsuffix=xilinx-machine \ " diff --git a/recipes-kernel/linux/linux-xlnx.inc b/recipes-kernel/linux/linux-xlnx.inc index 919afc2644..844fdfd5c0 100644 --- a/recipes-kernel/linux/linux-xlnx.inc +++ b/recipes-kernel/linux/linux-xlnx.inc @@ -12,7 +12,7 @@ FILESOVERRIDES_append = ":${LINUX_VERSION}" KERNELURI ?= "git://github.com/Xilinx/linux-xlnx.git;protocol=https" SRC_URI = " \ ${KERNELURI};${SRCBRANCHARG} \ - file://xilinx-base;type=kmeta;destsuffix=xilinx-base \ + file://xilinx-base;type=kmeta;name=kmeta-xilinx-base;destsuffix=xilinx-base \ " SRCREV_machine ?= "${SRCREV}" -- 2.11.0 -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx