Re: [meta-xilinx] [PATCH] u-boot-xlnx.inc: Remove redefinition of package arch
On 19 May 2017 at 10:15, Nathan Rossi wrote:
> On 16 May 2017 at 07:32, Manjukumar Matha
> wrote:
>> PACKAGE_ARCH = "${MACHINE_ARCH}" is defined in u-boot.inc. Remove the
>> package arch here to be consistent with upstream
>>
>> Signed-off-by: Manjukumar Matha
>
>
> Reviewed-by: Nathan Rossi
Applied.
Thanks,
Nathan
>
>> ---
>> recipes-bsp/u-boot/u-boot-xlnx.inc | 2 --
>> 1 file changed, 2 deletions(-)
>>
>> diff --git a/recipes-bsp/u-boot/u-boot-xlnx.inc
>> b/recipes-bsp/u-boot/u-boot-xlnx.inc
>> index defe17e..8ec6698 100644
>> --- a/recipes-bsp/u-boot/u-boot-xlnx.inc
>> +++ b/recipes-bsp/u-boot/u-boot-xlnx.inc
>> @@ -9,9 +9,7 @@ UBRANCHARG = "${@['nobranch=1',
>> 'branch=${KBRANCH}'][d.getVar('UBRANCH', True) !
>> SRC_URI = "${UBOOTURI};branch=${UBRANCH}"
>>
>> S = "${WORKDIR}/git"
>> -PACKAGE_ARCH = "${MACHINE_ARCH}"
>>
>> FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot:"
>> FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-xlnx:"
>> FILESEXTRAPATHS_prepend :=
>> "${@'${THISDIR}/u-boot-xlnx/${XILINX_RELEASE_VERSION}:' if
>> d.getVar('XILINX_RELEASE_VERSION') else ''}"
>> -
>> --
>> 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] xf86-video-armsoc_git.bb: Correct the dependency on libx11
On 19 May 2017 at 10:14, Nathan Rossi wrote:
> On 16 May 2017 at 07:36, Manjukumar Matha
> wrote:
>> Change the dependency to virtual/libx11
>>
>> Signed-off-by: Manjukumar Matha
>
> Reviewed-by: Nathan Rossi
Applied.
Thanks,
Nathan
>
>> ---
>> recipes-graphics/xorg-driver/xf86-video-armsoc_git.bb | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/recipes-graphics/xorg-driver/xf86-video-armsoc_git.bb
>> b/recipes-graphics/xorg-driver/xf86-video-armsoc_git.bb
>> index 2037f27..7a671fe 100644
>> --- a/recipes-graphics/xorg-driver/xf86-video-armsoc_git.bb
>> +++ b/recipes-graphics/xorg-driver/xf86-video-armsoc_git.bb
>> @@ -6,7 +6,7 @@ DESCRIPTION = "Xilinx ARM SOC display driver "
>> LICENSE = "MIT-X & GPLv2+"
>> LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
>>
>> -DEPENDS += "libx11 libdrm xf86driproto"
>> +DEPENDS += "virtual/libx11 libdrm xf86driproto"
>> RDEPENDS_${PN} += "xserver-xorg-module-exa"
>>
>> PV = "1.4.1+git${SRCPV}"
>> --
>> 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 v2 0/6] ZCU102 Multiarch QEMU
On 31 May 2017 at 04:22, Alistair Francis wrote: > On Tue, May 30, 2017 at 4:45 AM, Nathan Rossi wrote: >> This series of changes enables the execution of a multiarch set of QEMU >> instances to allow for the ZCU102 to be emulated with a PMU processor >> for the setup and availability of the PMU firmware at run time. >> >> This is handled by runqemu launching a script instead of QEMU, the >> script handles starting the PMU instance of QEMU after which the script >> starts the APU QEMU instance using the QEMU args passed by runqemu. >> >> Currently this setup requires the PMU ROM exist in the image deploy >> directory with the name 'pmu-rom.elf', which is not at this time >> available for independent download without a Xilinx account. The PMU ROM >> can be obtained from the ZCU102 PetaLinux BSP, see README.qemu.md for >> more details. >> --- >> Changes in v2: >> * Setup qemu-multiarch script to use --pmu-args passed via runqemu >> * Handle detecting PMU ROM elf and error when missing >> * Added README.qemu.md which documents PMU ROM and how to get it, this >> is referenced in the above mentioned error message >> * Rebase against master >> * Add Alistair's reviewed-by tag to unchanged commits > > Tested-by: Alistair Francis Thanks for testing Alistair. I've gone ahead and merged this series, including the change for a PMU_ROM variable as you suggested. Thanks, Nathan > > Thanks, > Alistair > >> >> Nathan Rossi (6): >> qemu-devicetrees: Deploying of MULTI_ARCH device trees >> README.qemu.md: Add a README to detail PMU ROM >> qemu-xilinx-multiarch-helper-native: Recipe to provide a helper script >> qemu-xilinx: Set the value of QEMU_TARGETS as opposed to default >> zcu102-zynqmp: Setup the use of multiarch QEMU >> zcu102-zynqmp: Remove pinning of older kernel, u-boot and atf versions >> >> README.qemu.md | 25 + >> conf/machine/include/machine-xilinx-qemu.inc | 5 >> conf/machine/zcu102-zynqmp.conf| 27 -- >> .../qemu/files/qemu-system-aarch64-multiarch | 32 >> ++ >> recipes-devtools/qemu/qemu-devicetrees_2017.1.bb | 15 +- >> .../qemu/qemu-xilinx-helper-native_1.0.bb | 5 +++- >> .../qemu-xilinx-multiarch-helper-native_1.0.bb | 20 ++ >> recipes-devtools/qemu/qemu-xilinx_2017.1.bb| 2 +- >> 8 files changed, 112 insertions(+), 19 deletions(-) >> create mode 100644 README.qemu.md >> create mode 100644 recipes-devtools/qemu/files/qemu-system-aarch64-multiarch >> create mode 100644 >> recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb >> >> -- >> 2.11.0 >> -- >> ___ >> 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 5/6] zcu102-zynqmp: Setup the use of multiarch QEMU
On 31 May 2017 at 04:14, Alistair Francis wrote:
> On Tue, May 30, 2017 at 4:45 AM, Nathan Rossi wrote:
>> Setup the qemuboot variables and qemu-xilinx-helper-native environment
>> to use the multiarch script to start a QEMU multiarch instance with the
>> MicroBlaze PMU.
>>
>> Signed-off-by: Nathan Rossi
>> ---
>> Changes in v2:
>> * Setup PMU instance args using --pmu-args
>> * Rebase against master
>> ---
>> conf/machine/include/machine-xilinx-qemu.inc| 5 +
>> conf/machine/zcu102-zynqmp.conf | 21
>> ++---
>> .../qemu/qemu-xilinx-helper-native_1.0.bb | 5 -
>> 3 files changed, 27 insertions(+), 4 deletions(-)
>>
>> diff --git a/conf/machine/include/machine-xilinx-qemu.inc
>> b/conf/machine/include/machine-xilinx-qemu.inc
>> index 938d76d461..dd275f3b48 100644
>> --- a/conf/machine/include/machine-xilinx-qemu.inc
>> +++ b/conf/machine/include/machine-xilinx-qemu.inc
>> @@ -36,6 +36,11 @@ def qemu_target_binary(d):
>> ta = "aarch64"
>> return "qemu-system-%s" % ta
>>
>> +def qemu_zynqmp_unhalt(d, multiarch):
>> +if multiarch:
>> +return "-global xlnx,zynqmp-boot.cpu-num=0 -global
>> xlnx,zynqmp-boot.use-pmufw=true"
>> +return "-device loader,addr=0xfd1a0104,data=0x800e,data-len=4
>> -device loader,addr=0xfd1a0104,data=0x800e,data-len=4"
>> +
>> # For qemuboot, default setup across all machines in meta-xilinx
>> QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}"
>> QB_DEFAULT_FSTYPE ?= "cpio"
>> diff --git a/conf/machine/zcu102-zynqmp.conf
>> b/conf/machine/zcu102-zynqmp.conf
>> index 054a17906c..bbc9f04a97 100644
>> --- a/conf/machine/zcu102-zynqmp.conf
>> +++ b/conf/machine/zcu102-zynqmp.conf
>> @@ -41,10 +41,13 @@ QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net
>> nic,netdev=net0,macaddr=@MA
>> # Use qemu-xilinx instead of mainline
>> PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native"
>>
>> -# Reset and unhalt CPU0, load the boot media.
>> +# Use the multiarch script instead of launching QEMU directly
>> +QB_SYSTEM_NAME_append = "-multiarch"
>> +
>> +# Setup hw-dtb, unhalt, atf and u-boot loading
>> QB_OPT_APPEND_append_qemuboot-xilinx = " \
>> - -hw-dtb
>> ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/zcu102-arm.dtb \
>> - -device loader,addr=0xfd1a0104,data=0x800e,data-len=4 \
>> + -hw-dtb
>> ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/zcu102-arm.dtb \
>> + ${@qemu_zynqmp_unhalt(d, True)} \
>> -device
>> loader,file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware.elf,cpu-num=0 \
>> -device loader,file=${DEPLOY_DIR_IMAGE}/u-boot.elf \
>> "
>> @@ -55,4 +58,16 @@ QB_ROOTFS_OPT_qemuboot-xilinx = " -device
>> loader,addr=0x600,file=@ROOTFS@,fo
>> QB_OPT_APPEND_append_qemuboot-xilinx = " \
>> -device
>> loader,addr=0x400,file=${DEPLOY_DIR_IMAGE}/${QB_DTB} \
>> -device
>> loader,addr=0x8,file=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} \
>> + -pmu-args '${QB_PMU_OPT}' \
>> + "
>> +
>> +QB_PMU_OPT = " \
>> + -M microblaze-fdt \
>> + -display none \
>> + -hw-dtb
>> ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/zynqmp-pmu.dtb \
>> + -kernel ${DEPLOY_DIR_IMAGE}/pmu-rom.elf \
>
> Can we save this in a variable instead?
>
> Something like this:
> PMU_ROM ?= ${DEPLOY_DIR_IMAGE}/pmu-rom.elf
>
> That way people can override it and point to somewhere else. As the
> ROM isn't built by Yocto it makes more sense to not tie it to the
> deploy directory.
I've updated this patch to add exactly what you describe above, but
since it is such a small change I will skip sending a v3 so that I can
go ahead and merge this series.
Thanks,
Nathan
>
> Thanks,
> Alistair
>
>> + -device loader,file=${DEPLOY_DIR_IMAGE}/pmu-${MACHINE}.elf \
>> + -device loader,addr=0xfd1a0074,data=0x1011003,data-len=4 \
>> + -device loader,addr=0xfd1a007C,data=0x1010f03,data-len=4 \
>> "
>> +
>> diff --git a/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb
>> b/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb
>> index f48a8d40a0..55b35b53e5 100644
>> --- a/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb
>> +++ b/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb
>> @@ -21,5 +21,8 @@ PROVIDES += "qemu-helper-native"
>>
>> # replace qemu with qemu-xilinx
>> DEPENDS_remove = "qemu-native"
>> -DEPENDS_append = " qemu-xilinx-native"
>> +DEPENDS_append = " \
>> + qemu-xilinx-native \
>> + qemu-xilinx-multiarch-helper-native \
>> + "
>>
>> --
>> 2.11.0
>>
>> --
>> ___
>> meta-xilinx mailing list
>> meta-xilinx@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-xilinx
--
__
Re: [meta-xilinx] [PATCH v2 0/5] Add support for building ZynqMP PMU firmware
On 31 May 2017 at 04:23, Alistair Francis wrote: > On Tue, May 30, 2017 at 4:36 AM, Nathan Rossi wrote: >> This series adds support for building the ZynqMP PMU firmware as well as >> its dependencies. >> >> Also included in this series is newlib and libgloss recipes which are >> dependencies of the Xilinx standalone drivers/applications. >> >> The series also implements a extender bbclass to allow for the parallel >> building of the ZynqMP APU packages and the ZynqMP PMU packages (which >> are targeting MicroBlaze). This is done similar to how >> native/nativesdk/multilib classes extend to allow parallel builds. This >> solution is sufficient for the intended purpose of building the PMU >> firmware however it has limits. This solution should be replaced in the >> future with the multiconfig feature once it can provide the desired >> functionality (e.g. cross multiconfig dependencies and populating into >> single image/deploy output). > > Tested-by: Alistair Francis Thanks for testing Alistair. I've merged this series to master. Thanks, Nathan > > Thanks, > Alistair > >> >> Changes in v2: >> * Added symlink creation for pmu-firmware recipe >> * Moved newlib/libgloss source hashes into .inc >> >> Nathan Rossi (5): >> newlib_2.5.0: Add recipe for the newlib libc >> libgloss_2.5.0: Add libgloss recipe >> pmu-firmware: Create a recipe for the PMU firmware for PMU on ZynqMP >> classes/zynqmp-pmu.bbclass: Create a extender class for the ZynqMP PMU >> zcu102-zynqmp: Enable building of PMU recipes and build pmu firmware >> >> classes/zynqmp-pmu.bbclass | 118 >> >> conf/machine/include/zynqmp-pmu-config.inc | 5 + >> conf/machine/zcu102-zynqmp.conf | 4 +- >> recipes-bsp/pmu-firmware/pmu-firmware_2017.1.bb | 85 + >> recipes-core/newlib/libgloss_2.5.0.bb | 18 >> recipes-core/newlib/newlib.inc | 59 >> recipes-core/newlib/newlib_2.5.0.bb | 11 +++ >> 7 files changed, 299 insertions(+), 1 deletion(-) >> create mode 100644 classes/zynqmp-pmu.bbclass >> create mode 100644 conf/machine/include/zynqmp-pmu-config.inc >> create mode 100644 recipes-bsp/pmu-firmware/pmu-firmware_2017.1.bb >> create mode 100644 recipes-core/newlib/libgloss_2.5.0.bb >> create mode 100644 recipes-core/newlib/newlib.inc >> create mode 100644 recipes-core/newlib/newlib_2.5.0.bb >> >> -- >> 2.11.0 >> -- >> ___ >> 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] tools: app.tcl exits 0 regardless of build failure
On 02-06-17 21:21, Jean-Francois Dagenais wrote: Hi guys, Take a look at this: https://github.com/Xilinx/meta-xilinx-tools/blob/master/scripts/app.tcl#L131 There's an "exit 0" regardless of the build success or failure! WOW. I stubbled on this by intentionally putting an error in the workdir of pmu-firmware's build dir. The log.do_compile does show the error and make reports it, yet my yocto build succeeds! This is the case for most of Xilinx's tools too, they will return a "0" exit status even if the bitstream generation (or whatever) failed, also when the tcl script errors out, the tool still returns 0. As a workaround, I always remove any existing target files before starting, and then add a "test -e ..." to the do_compile to make it fail when the program failed to produce any output. -- Mike Looijmans Kind regards, Mike Looijmans System Expert TOPIC Products Materiaalweg 4, NL-5681 RJ 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 Join our presentation at Electronics & Applications 2017: FPGA for real-time data processing, subject “Hardware platform for industrial ultrasound steel plate Inspection” Topic Embedded Systems - Herman Kuster, 1st June 10 AM Visit http://eabeurs.nl/author/612884/ for more information -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
