summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-core/conf/machine
Commit message (Collapse)AuthorAgeFilesLines
* zynq-generic: Remove QB_KERNEL_CMDLINE = none, as we're booting from diskMark Hatle2022-09-131-2/+0
| | | | | | | QB_KERNEL_CMDLINE = none is only needed if we're going to boot either from a ramdisk, or using the 'chosen' section of the DTB. Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* Revert "versal-net-generic.conf: Disable psmfw on versal net *** TEMPORARY ***"Mark Hatle2022-08-311-5/+1
| | | | | | This reverts commit 3b679a0e52234fe4fa933e9ea060e5ba2f663b3e. Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* microblaze-generic.conf: Fix Serial console device nameSandeep Gundlupet Raju2022-08-301-1/+1
| | | | | | | | | | | | | | | Microblaze generic use AXI Uart Lite serial device, Hence change the serial console device to ttyUL0 as default serial device. This also fixes INIT freeze issue. Starting syslogd/klogd: done Starting tcf-agent: OK INIT: Id "S0" respawning too fast: disabled for 5 minutes INIT: no more processes left in this runlevel Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* versal-net-generic.conf: Move Board DT Flags to dynamic layersSandeep Gundlupet Raju2022-08-261-3/+0
| | | | | | | | Move YAML_DT_BOARD_FLAGS to meta-xilinx-tools dynamic layers else build fails when meta-xilinx-tools layers is not part of bblayers. Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* machine-xilinx-default.inc: Add WKS_FILE_DEPENDS based on IMAGE_BOOT_FILESMark Hatle2022-08-261-0/+7
| | | | | | | | | | | When the files pointed to by IMAGE_BOOT_FILES change, we need to let the wic system know a new rootfs is required. Do this via WKS_FILE_DEPENDS. A number of automatic ones have been added to the system, if additional files are added (or ones that use different names) it is up to the machine.conf file [or configuration] to add the necessary dependencies. Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* versal-net-generic.conf: Disable psmfw on versal net *** TEMPORARY ***Mark Hatle2022-08-261-1/+5
| | | | | | | Currently the psmfw is not working properly, fall back to the version embedded into the XSA. Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* versal-net-generic.conf: Move to different psm DTBMark Hatle2022-08-261-1/+1
| | | | Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* versal-net-generic: Fix u-boot defconfigMark Hatle2022-08-241-4/+5
| | | | | | | The defconfig, due to being set with ?=, but be set BEFORE the inclusion of the default versal settings, otherwise the version defconfig will be used. Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* microblaze-generic.conf: Use generic root boot scriptSandeep Gundlupet Raju2022-08-241-0/+1
| | | | | | | | Use boot.cmd.generic.root boot script for microblaze generic machine configuration file. Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* zynq-generic.conf: Use generic root boot scriptSandeep Gundlupet Raju2022-08-241-0/+1
| | | | | | | | Use boot.cmd.generic.root boot script for zynq generic machine configuration file. Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* zynqmp-generic.conf: Use generic root boot scriptSandeep Gundlupet Raju2022-08-241-0/+1
| | | | | | | | Use boot.cmd.generic.root boot script for zynqmp generic configuration file. Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* versal-generic.conf: Use generic root boot scriptSandeep Gundlupet Raju2022-08-241-0/+1
| | | | | | | | Use boot.cmd.generic.root boot script for versal generic configuration file. Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* Add Versal Net support to meta-xilinx-coreJohn Toomey2022-08-172-0/+33
| | | | | | | | | | | | | Initial support for Versal Net devices including new machine config, bootbin and QEMU changes. Signed-off-by: John Toomey <jtoomey@xilinx.com> Refactor the versal-net-generic.conf file bootbin changes already existed due to prior cleanups Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* qemu-xilinx cleanupJohn Toomey2022-07-285-124/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Refactor qemuboot-xilinx.bbclass and machine-xilinx-qemu.inc. Following the example of the core version of qemu.bbclass and match inc file. Refactor some of the functions to make them more readable. Specifically around qemu_rootfs_params. Code may not be as compact, but it'll be easier to read (and update) in the future. Add mising qemu-system-native PREFERRED_PROVIDER (and recipe PROVIDE). This resolves the issue where occasionally you use runqemu and the qemu binary appears to be missing. *-generic.conf: Remove overrides that are the same as the default qemu settings. Remove :append operations on QB_OPT_APPEND, this allows easy override when someone includes a generic machine. Signed-off-by: John Toomey <jtoomey@xilinx.com> Signed-off-by: Mark Hatle <mark.hatle@amd.com> Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> (cherry picked from commit b0baa647143aab6815af13cc9e66061c9e25a07c) Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* *-generic.conf: Fix QB_NETWORK_DEVICE to use default settingsMark Hatle2022-07-282-2/+4
| | | | | | | | runqemu will pass in the correct network choice for the user. Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> (cherry picked from commit 5c11d939c12685207e46550401edaa2acdd8f9cc) Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* *-generic.conf: Update qemu config to remove duplicate optionsMark Hatle2022-07-284-7/+5
| | | | | | | | | | | | | | 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> (cherry picked from commit 72754d63ce7552d9b67f907ec82bb540e060435b) Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* microblaze-generic: microblaze requires a device treeMark Hatle2022-07-281-1/+7
| | | | | | | | | | | 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> (cherry picked from commit bb1bf5b198104441b5391e5327981a668a103384) Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* zynq-generic: use default QB_DTB valueMark Hatle2022-07-281-2/+0
| | | | | | Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> (cherry picked from commit 9b0fbd1dc351a98442e602ee32d99e02668f3402) Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* machine-xilinx-qemu.inc: Adjust function to verify fstype is validMark Hatle2022-07-281-6/+7
| | | | | | | | | | 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> (cherry picked from commit 67e5e1ab7176c5aa3e4c6d903287f16a521f7d41) Signed-off-by: Mark Hatle <mark.hatle@amd.com>
* Set QB_KERNEL_ROOT for zynq-genericJohn Toomey2022-07-141-0/+2
| | | | | | | | 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>
* machine:*-generic.conf: Use += instead of appendRaju Kumar Pothuraju2022-07-054-4/+4
| | | | | | | | | | 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>
* zynqmp-generic.conf: Add runqemu support for zynqmp-genericRaju Kumar Pothuraju2022-06-271-6/+7
| | | | | | | | 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>
* zynq-generic.conf: Add runqemu support for zynq-genericRaju Kumar Pothuraju2022-06-271-5/+17
| | | | | | | | 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>
* versal-generic: Add runqemu support for versal-genericRaju Kumar Pothuraju2022-06-271-10/+8
| | | | | | | | 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>
* microblaze-generic: Add runqemu support for microblaze-genericRaju Kumar Pothuraju2022-06-271-1/+14
| | | | | | | | 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>
* machine-xilinx-qemu: Add generic functions to add qemu argsRaju Kumar Pothuraju2022-06-271-2/+57
| | | | | | | | | | | | | | 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>
* qemuboot-xilinx:machine-xilinx-default: Update kernel imagesRaju Kumar Pothuraju2022-06-271-0/+1
| | | | | | | | | 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>
* xilinx-qemu: Use addto_recipe_sysroot taskRaju Kumar Pothuraju2022-06-071-1/+1
| | | | | | | | | | | | | | | | | 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>
* xilinx-microblaze.bbclass: Fail if meta-microblaze is not includedMark Hatle2022-01-231-0/+3
| | | | | | | | | | When the user uses a microblaze tune, we need to check if meta-microblaze is part of their build. If not stop, and tell them they need to add it. meta-microblaze is not a layers dependency as it is not needed for most builds. Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
* zynqmp-generic: Enable pmu-rom-native as a qemu-native dependencyMark Hatle2022-01-231-1/+4
| | | | | | qemu-native requires pmu-rom-native when building for zynqmp based systems. Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
* machine-xilinx-default.inc: Fix bootbin and UBOOT SUFFIX typeMark Hatle2022-01-231-3/+2
| | | | | | | | | The default for virtual/boot-bin should be xilinx-bootbin. The default UBOOT_SUFFIX should be 'bin'. Otherwise u-boot-xlnx may fail being able to not find u-boot.img. Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
* embeddedsw: Rework the embeddedsw copy firmware recipesMark Hatle2022-01-232-22/+16
| | | | | | | | | | | | | | | | | | fsbl, plmfw, pufw, and psmfw are reworked to provide earlier error messages, and better handle multiconfig builds. Also adjust MACHINE specific changes to use .* for compatibility based on the SOC_FAMILY override. The system doesn't always set the SOC_FAMILY as COMPATIBLE_MACHINE, so this avoids an error of incompatible machine. Align all of the expected firmware filenames to be <firmware>-${MACHINE}. The user can override as necessary. The license moves to CLOSED as we don't know the license of the software being provided by the user or other dependencies. It'll be up to the user to reconcile it. Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
* Revert "*TEMPORARY* Disable mali for zynqmp builds"Mark Hatle2022-01-101-2/+2
| | | | | | This reverts commit 231e0d0c2be1af73bb42a1ec7eb893615eaae6a2. Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
* pmu-rom-native: Automatically download from public site for QEMU usageMark Hatle2022-01-041-1/+1
| | | | | | | | Move the pmu-rom to pmu-rom-native recipe. The ROM is only deployed in the standard directory for qemu-xilinx usage when required by a zynqmp-generic system. Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
* zynq-generic: Remove hardcoded -initrd and use runqemu insteadMark Hatle2021-12-222-3/+2
| | | | | | Change rootfs to cpio.gz, and runqemu will automatically load it as an initrd Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
* Adjust generic BSPs to support the inheritance modelMark Hatle2021-12-224-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each inherited BSP must set a MACHINEOVERRIDES and PACKAGE_EXTRA_ARCHS to ensure that various overrides can be set along the way. The general format for this is (in the caller): require conf/machine/<inherited machine>.conf The callee is responsible for adding to the MACHINEOVERRIDES and PACKAGE_EXTRA_ARCHS. It does this by setting the following at the beginning and end of the file, respectively. MACHINEOVERRIDES =. "${@['', '<machine>:']['<machine>' != '${MACHINE}']}" ... ... PACKAGE_EXTRA_ARCHS_append = "${@['', ' <machine_arch>']['<machine>' != '${MACHINE}']}" where <machine> is the <machine>.conf file the line appears in; <machine_arch> is the <machine>.replace('-', '_') (matching MACHINE_ARCH) if the machine file was used by itself. The MACHINEOVERRIDES uses =. or .= everywhere in the Yocto Project. Doing it via =. in the load order ensures in order evaluation. PACKAGE_EXTRA_ARCHS is set via 'append', but needs to be the last operation to ensure that we are always added AFTER anything we include along the way. Effectively this is a late binding evaluation. Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
* Deprecate BOARD and BOARD_VARIANT supportMark Hatle2021-12-2210-21/+143
| | | | | | | If the BOARD and/or BOARD_VARIANT is set, continue to allow this to work, however warn the user it is deprecated. Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
* Initial restructure/split of meta-xilinx-bspMark Hatle2021-12-2214-0/+577
Create a new meta-xilinx-core, move core functionality to the core, keeping board specific files in the bsp layer. zynqmp-generic changed from require <board> to include, so if meta-xilinx-bsp is not available it will not fail. Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>