Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zynqmp-generic.conf: add boot.bin for wks #43

Open
wants to merge 35 commits into
base: master-next
Choose a base branch
from

Commits on Jul 23, 2022

  1. xilinx-qemu: Use addto_recipe_sysroot task

    To populate the QEMU binaries into sysroot the populate_sysroot task
    isn't enough for qemu-xilinx-helper-native, we need to use addto_recipe_sysroot task.
    This patch will correct the mapping.
    
    u-boot-zynq-uenv failing to add DEPENDS when EXTRA_IMAGEDEPENDS has
    recipe:task. This patch will split the recipe name and add it to
    DEPENDS.
    
    Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
    
    While unusual, the PR is updated, as the qemu and qemu helper need to have
    the same version/pr or the path logic doesn't work properly.
    
    Signed-off-by: Mark Hatle <mhatle@xilinx.com>
    Raju Kumar Pothuraju authored and mhatle committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    394d8ca View commit details
    Browse the repository at this point in the history
  2. u-boot: Remove deprecated board defconfigs

    Board specific u-boot defconfigs are deprecated from u-boot source,
    hence remove deprecated defconfigs from u-boot recipes.
    
    Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@xilinx.com>
    Signed-off-by: Mark Hatle <mhatle@xilinx.com>
    grsandeep85 authored and mhatle committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    59a857d View commit details
    Browse the repository at this point in the history
  3. image-types-xilinx-qemu: Add qemu-sd-fatimg support

    qemu-sd: Qemu 6.X onwards SD image should be of power of 2, this patch
    will read the generate qemu-sd image and find out its next power of 2
    and adjust the size using qemu-img resize command.
    
    qemu-sd-fatimg: Due to circular dependencies in yocto when we enable
    INITRAMFS_IMAGE + wic and we need SD fat image to boot versal on qemu.
    For this added new image conversion type qemu-sd-fatimg, it will
    generate the sd fatimg containing
    boot.bin,boot.scr,rootfs.cpio.gz.u-boot files.
    Usage: IMAGE_FSTYPES += "cpio.gz.u-boot.qemu-sd-fatimg"
    NOTE: qemu-sd-fatimg creation is a workaround fix for circular
    dependencies.
    
    Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
    Signed-off-by: Mark Hatle <mark.hatle@amd.com>
    Raju Kumar Pothuraju authored and mhatle committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    86f8a01 View commit details
    Browse the repository at this point in the history
  4. qemuboot-xilinx:machine-xilinx-default: Update kernel images

    For zynq,microblaze qemu supports direct kernel boot by specifying
    kernel image name to QB_DEFAULT_KERNEL.
    Adjusting the kernel image based on the bundle image selection.
    
    Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
    Signed-off-by: Mark Hatle <mark.hatle@amd.com>
    Raju Kumar Pothuraju authored and mhatle committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    35814f4 View commit details
    Browse the repository at this point in the history
  5. machine-xilinx-qemu: Add generic functions to add qemu args

    This patch will add generic fuctions to add qemu args as per the
    configuration set and soc_family.
    Ex: - Adding Image, rootfs and boot.scr files for zynqmp if in case of
    	IMAGE_INITRAMFS set.
        - Add boot mode as 5 for versal
        - Return the rootfs type per configuration
        - Skip adding rootfs in case of bundle image as kernel image will
          have it.
    
    Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
    Signed-off-by: Mark Hatle <mark.hatle@amd.com>
    Raju Kumar Pothuraju authored and mhatle committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    be98561 View commit details
    Browse the repository at this point in the history
  6. microblaze-generic: Add runqemu support for microblaze-generic

    This patch will add runqemu support for microblaze-generic machines for
    INITRD/INITRAMFS types.
    
    Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
    Signed-off-by: Mark Hatle <mark.hatle@amd.com>
    Raju Kumar Pothuraju authored and mhatle committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    8922427 View commit details
    Browse the repository at this point in the history
  7. versal-generic: Add runqemu support for versal-generic

    This patch will add runqemu support for versal-generic when
    INITRAMFS/INITRD/EXT4 configurations.
    
    Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
    Signed-off-by: Mark Hatle <mark.hatle@amd.com>
    Raju Kumar Pothuraju authored and mhatle committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    fb3f8ba View commit details
    Browse the repository at this point in the history
  8. zynq-generic.conf: Add runqemu support for zynq-generic

    This patch will add runqemu support for zynq-generic machines when
    INITRAMFS/INITRD/EXT4 sets.
    
    Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
    Signed-off-by: Mark Hatle <mark.hatle@amd.com>
    Raju Kumar Pothuraju authored and mhatle committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    e67a9f4 View commit details
    Browse the repository at this point in the history
  9. zynqmp-generic.conf: Add runqemu support for zynqmp-generic

    This patch will add runqemu support for zynqmp-generic machines when
    INITRAMFS/INITRD/EXT4 sets.
    
    Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
    Signed-off-by: Mark Hatle <mark.hatle@amd.com>
    Raju Kumar Pothuraju authored and mhatle committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    12b4ddb View commit details
    Browse the repository at this point in the history
  10. machine:*-generic.conf: Use += instead of append

    Using append enabling the FSTYPE when using the soc override in
    petalinux.
    Using += to add/reflect the value only in yocto or defined with ?= or =
    operators.
    
    Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
    Signed-off-by: Mark Hatle <mark.hatle@amd.com>
    Raju Kumar Pothuraju authored and mhatle committed Jul 23, 2022
    Configuration menu
    Copy the full SHA
    6134b91 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2022

  1. u-boot-xlnx-blob.inc: Move to using UBOOT_IMAGE_BLOB_DEFAULT

    UBOOT_IMAGE_BLOB may need a machine (override) specific default value, but we
    always want the user to be above to override this easily.  Adding the new
    UBOOT_IMAGE_BLOB_DEFAULT allows us to set the default in a BSP layer, while
    continuing to make the UBOOT_IMAGE_BLOB setting easy for the user to adjust.
    
    Signed-off-by: Mark Hatle <mark.hatle@amd.com>
    mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    5dce074 View commit details
    Browse the repository at this point in the history
  2. Set QB_KERNEL_ROOT for zynq-generic

    This value is passed to the kernel in order to choose the correct disk
    but defaults to /dev/vda which does not boot.
    
    Signed-off-by: John Toomey <jtoomey@xilinx.com>
    Signed-off-by: Mark Hatle <mark.hatle@amd.com>
    John Toomey authored and mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    5641d64 View commit details
    Browse the repository at this point in the history
  3. meta-microbalze: gdb: Enable gdb and gdbserver on microblaze

    Replace existing integration with new work that enables target gdb and
    gdbserver.
    
    Signed-off-by: Mark Hatle <mark.hatle@amd.com>
    mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    938f032 View commit details
    Browse the repository at this point in the history
  4. meta-microblaze: gdb is now available

    Signed-off-by: Mark Hatle <mark.hatle@amd.com>
    mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    dee62d5 View commit details
    Browse the repository at this point in the history
  5. u-boot-xlnx: Add support for U-boot user specified dts

    Add support for U-boot user specified dts by setting below variables
    in local.conf file.
    
    UBOOT_USER_SPECIFIED_DTS:pn-u-boot-xlnx = "versal-vck190-revA-x-ebm-01-revA"
    
    This will fetch user specified dts from from u-boot repo path
    u-boot-xlnx/arch/arm/dts/versal-vck190-revA-x-ebm-01-revA.dts when user doesn't
    want to use EXT_DTB from device-tree recipes.
    
    Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@xilinx.com>
    
    Adjust to keep extra_oemake args blank, unless actually needed
    
    Signed-off-by: Mark Hatle <mark.hatle@amd.com>
    grsandeep85 authored and mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    efe3daf View commit details
    Browse the repository at this point in the history
  6. machine-xilinx-qemu.inc: Adjust function to verify fstype is valid

    Simplify the function to treat microblaze as a soc_family.  If we do not have
    initramfs_image defined, then verify wic.qemu-sd is available before
    returning that value, otherwise fall back to the dictionary.
    
    Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
    mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    67e5e1a View commit details
    Browse the repository at this point in the history
  7. zynq-generic: use default QB_DTB value

    Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
    mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    9b0fbd1 View commit details
    Browse the repository at this point in the history
  8. microblaze-generic: microblaze requires a device tree

    Add the device-tree as a dependency and kc705-microblazeel is defined as the
    default HDF_MACHINE.
    
    Also simplify by removing the QB_DTB and using the default value.
    
    Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
    mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    bb1bf5b View commit details
    Browse the repository at this point in the history
  9. meta-xilinx: Clean up vendor specific machine configuration files

    1. Add new metal-xilinx-vendor layer which supports vendor specific
       machine configuration files, device-tree, kernel, platform-init etc.
    2. Moved below vendor machine conf files, dt and related configs from
       meta-xilinx-bsp and meta-xilinx-contrib to meta-xilinx-vendor layer.
        - microzed-zynq7.conf
        - minized-zynq7.conf
        - picozed-zynq7.conf
        - zedboard-zynq7.conf
        - zybo-zynq7.conf
        - zybo-linux-bd-zynq7.conf
        - ultra96-zynqmp.conf
    3. Obsolete qemu-zynq7, s3adsp1800-qemu-microblazeeb, v350-versal and
       vc-p-a2197-00-versal from meta-xilinx-bsp layer. Users should use
       zynq-generic.conf for zynq7000 qemu boot should be functionally
       equivalent to qemu-zynq7.
    4. Add new MAINTAINERS.md file and move maintainers, Mailing list and
       Patches content from meta-xilinx-* README.md to MAINTAINERS.md file.
    5. Updated README.md file for supported board machines files in
       meta-xilinx-bsp, meta-xilinx-contrib and meta-xilinx-vendor layers.
    6. Disabled old drm kernel patches for zybo-linux-bd-zynq mahcine in
       meta-xilinx-contrib layer as these patches doesn't apply on 5.x
       kernel, if we don't hear from patch submitter we will remove these
       patches from meta-xilinx-contrib layer.
    7. Removed drm kernel cache metadate for zybo-linux-bd-zynq7 machine
       as these configs are already available in xilinx_zynq_defconfig.
    8. Fixed build issue for u-boot by changing
       PREFERRED_PROVIDER_virtual/bootloader from u-boot to u-boot-xlnx.
    9. Add meta-xilinx-vendor to bblayers.conf.sample
    
    Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@xilinx.com>
    Signed-off-by: Mark Hatle <mhatle@xilinx.com>
    grsandeep85 authored and mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    fa57c12 View commit details
    Browse the repository at this point in the history
  10. meta-xilinx: Move booting README from bsp layer

    Move README.booting.md file from meta-xilinx-bsp layer to meta-xilinx.
    
    Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@xilinx.com>
    Signed-off-by: Mark Hatle <mhatle@xilinx.com>
    grsandeep85 authored and mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    abc3472 View commit details
    Browse the repository at this point in the history
  11. README.md: Ultra96 is compatible with v1 board

    Update README stating that Ultra96 machine configuration file is
    compatible with v1 board and refer to meta-avnet for v2 board.
    
    Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@xilinx.com>
    Signed-off-by: Mark Hatle <mark.hatle@amd.com>
    grsandeep85 authored and mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    f3a3cc9 View commit details
    Browse the repository at this point in the history
  12. layer.conf: Add xilinx-tools as dynamic layers

    Add meta-xilinx-tools as dynamic-layers.
    
    Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@xilinx.com>
    Signed-off-by: Mark Hatle <mhatle@xilinx.com>
    grsandeep85 authored and mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    6b0278a View commit details
    Browse the repository at this point in the history
  13. qemu-xilinux.inc: Override PACKAGECONFIG that are incompatible with c…

    …urrent fork.
    
    +PACKAGECONFIG[alsa] = "--audio-drv-list=alsa,,alsa-lib"
    | ERROR: Unknown driver 'default' selected
    |        Possible drivers are: oss alsa sdl pa
    
    +PACKAGECONFIG[pulsedio] = "--audio-drv-list=pa,,pulseaudio"
    | ERROR: unknown option --disable-pa
    
    +#PACKAGECONFIG[selinux] = ""
    | ERROR: unknown option --disable-selinux
    
    Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
    Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
    jpuhlman authored and mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    7e510f7 View commit details
    Browse the repository at this point in the history
  14. qemu-xilinx-native.inc: add meson and ninja

    | ERROR: Cannot find Ninja
    
    Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
    Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
    jpuhlman authored and mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    7ab1822 View commit details
    Browse the repository at this point in the history
  15. xrt_git.bb: Cleanup += usage

    Resolve the following warning
    
    WARNING: .../meta-xilinx/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb:
    EXTRA_OECMAKE:append:versal-ai-core += is not a recommended operator
    combination, please replace it.
    
    Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
    mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    a1931ae View commit details
    Browse the repository at this point in the history
  16. python3-dtc: Bring in 1.6.1 from meta-virtualization

    Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
    mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    c92bc5e View commit details
    Browse the repository at this point in the history
  17. meta-xilinx-core: Begin to support langdale

    Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
    mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    7f51edf View commit details
    Browse the repository at this point in the history
  18. meta-xilinx-standalone: Begin to support langdale

    Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
    mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    1b5fd94 View commit details
    Browse the repository at this point in the history
  19. *-generic.conf: Update qemu config to remove duplicate options

    runqemu now appears to set -serial mon:stdio by default.  This can
    conflict with the built in parameters.
    
    Reported by: Jeremy Puhlman <jpuhlman@mvista.com>
    
    It may look unusual, but the remaining -serial null are still required
    for booting.
    
    Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
    mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    61ee232 View commit details
    Browse the repository at this point in the history
  20. meta-xilinx-bsp: begin to support langdale

    Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
    mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    fbfc168 View commit details
    Browse the repository at this point in the history
  21. meta-xilinx-vendor: begin to support langdale

    Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
    mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    595d877 View commit details
    Browse the repository at this point in the history
  22. gcc-source: Move to gcc 12

    Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
    mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    e2d540d View commit details
    Browse the repository at this point in the history
  23. Update LICENSE to match Langdale requirements

    GPLv2 and BSD are no longer valid.  Choose an appropriate replacement.
    
    Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
    mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    0773c8d View commit details
    Browse the repository at this point in the history
  24. qemy-system-aarch64-multiarch: Add --help support

    --help may need to be passed in and should be directed to the main APU handler.
    
    runqemu may use --help for various reasons.
    
    Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
    mhatle committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    b9ad103 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2022

  1. zynqmp-generic.conf: add boot.bin for wks

    wks needs all files that need to appear in boot partition to be added to
    the IMAGE_BOOT_FILES variable. This is missing from the zynqmp family
    hence add it here.
    Karthik Poduval committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    d55ae9d View commit details
    Browse the repository at this point in the history