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.

Sign up for GitHub

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

Jump to bottom

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

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

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

wants to merge 35 commits into from

Conversation

karthikpoduval
Copy link

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.

Raju Kumar Pothuraju and others added 30 commits July 23, 2022 15:15
@mhatle
xilinx-qemu: Use addto_recipe_sysroot task
394d8ca 
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>
@grsandeep85 @mhatle
u-boot: Remove deprecated board defconfigs
59a857d 
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>
@mhatle
image-types-xilinx-qemu: Add qemu-sd-fatimg support
86f8a01 
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>
@mhatle
qemuboot-xilinx:machine-xilinx-default: Update kernel images
35814f4 
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>
@mhatle
machine-xilinx-qemu: Add generic functions to add qemu args
be98561 
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>
@mhatle
microblaze-generic: Add runqemu support for microblaze-generic
8922427 
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>
@mhatle
versal-generic: Add runqemu support for versal-generic
fb3f8ba 
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>
@mhatle
zynq-generic.conf: Add runqemu support for zynq-generic
e67a9f4 
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>
@mhatle
zynqmp-generic.conf: Add runqemu support for zynqmp-generic
12b4ddb 
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>
@mhatle
machine:*-generic.conf: Use += instead of append
6134b91 
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>
@mhatle
u-boot-xlnx-blob.inc: Move to using UBOOT_IMAGE_BLOB_DEFAULT
5dce074 
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
Set QB_KERNEL_ROOT for zynq-generic
5641d64 
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>
@mhatle
meta-microbalze: gdb: Enable gdb and gdbserver on microblaze
938f032 
Replace existing integration with new work that enables target gdb and
gdbserver.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>
@mhatle
meta-microblaze: gdb is now available
dee62d5 
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
@grsandeep85 @mhatle
u-boot-xlnx: Add support for U-boot user specified dts
efe3daf 
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>
@mhatle
machine-xilinx-qemu.inc: Adjust function to verify fstype is valid
67e5e1a 
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
zynq-generic: use default QB_DTB value
9b0fbd1 
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
@mhatle
microblaze-generic: microblaze requires a device tree
bb1bf5b 
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>
@grsandeep85 @mhatle
meta-xilinx: Clean up vendor specific machine configuration files
fa57c12 
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 @mhatle
meta-xilinx: Move booting README from bsp layer
abc3472 
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 @mhatle
README.md: Ultra96 is compatible with v1 board
f3a3cc9 
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 @mhatle
layer.conf: Add xilinx-tools as dynamic layers
6b0278a 
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>
@jpuhlman @mhatle
qemu-xilinux.inc: Override PACKAGECONFIG that are incompatible with c…
7e510f7 
…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 @mhatle
qemu-xilinx-native.inc: add meson and ninja
7ab1822 
| ERROR: Cannot find Ninja

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
@mhatle
xrt_git.bb: Cleanup += usage
a1931ae 
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
python3-dtc: Bring in 1.6.1 from meta-virtualization
c92bc5e 
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
@mhatle
meta-xilinx-core: Begin to support langdale
7f51edf 
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
@mhatle
meta-xilinx-standalone: Begin to support langdale
1b5fd94 
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
@mhatle
*-generic.conf: Update qemu config to remove duplicate options
61ee232 
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
meta-xilinx-bsp: begin to support langdale
fbfc168 
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
mhatle and others added 5 commits July 25, 2022 10:39
@mhatle
meta-xilinx-vendor: begin to support langdale
595d877 
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
@mhatle
gcc-source: Move to gcc 12
e2d540d 
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
@mhatle
Update LICENSE to match Langdale requirements
0773c8d 
GPLv2 and BSD are no longer valid.  Choose an appropriate replacement.

Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
@mhatle
qemy-system-aarch64-multiarch: Add --help support
b9ad103 
--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>
zynqmp-generic.conf: add boot.bin for wks
d55ae9d 
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@karthikpoduval @grsandeep85 @mhatle @jpuhlman