| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
Move the ultra96-zynqmp.conf into the zynqmp-generic (via a require). This
approach can be used for other board specific overrides if necessary.
Move MACHINE_FEATURES to the generic zynqmp-generic file, as that is requried
to make a superset.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
|
|
|
|
|
|
| |
An RDEPEND can not be turned into a DEPEND directly. Indirectly the system
is capable of doing this via various mapping, but the function in use can
not do this safely.
Also move ultra96 firmware from RRECOMMEND to RDEPEND.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
|
|
|
|
|
|
| |
We use zynqmp-generic (via a require) as the default now, and only set the
values that make the ultra96 unique.
Note, the two RRECOMMEND dependencies at the end. These are requried for
WiFi and Bluetooth.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
| |
This reverts commit de5e93d2e23e3a3ff084f5f03563dcde5c2b7c65.
|
|
|
|
|
|
|
| |
Appending MACHINE_FEATURES for ultra96 "usbgadget wifi bluetooth mipi"
Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
| |
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
|
|
|
|
|
|
|
| |
Upstream doesnt support image-mklibs due to python3 compatibility issues.
Remove it from local.conf.sample
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
|
|
|
|
| |
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
|
|
|
|
|
|
| |
meta-chromium depends on meta-clang. Add meta-clang as default in bblayers.conf.sample
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
|
|
|
|
|
|
| |
Set XIlINX_VER to 2021.1
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Issue: CR-1099768
Each specified recipe has a stable API, so when they rebuild, don't
trigger dependent packages to rebuild. This often happens because
each of these packages has some sort of SOC or MACHINE specific
configuration that may cause different versions of the package to
be built.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Issue: CR-1099895
libmali provides replacement items for standard mesa libraries. Mali
also sets the soname to libMali.so, even when the requester is looking
for a library like libgbm. This introduces an internal, unstated,
dependency on the provider of the mesa components.
Since this dependency change comes in from mali400, we need to
change the PACKAGE_ARCH in these few cases to match.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Issue: CR-1096936
Some recipes may require board specific items, such as DTB. Even in a
generic build, we need to use BOARD_ARCH so we do not have duplicate
packages generated that have different contents.
Additionally if the BOARD is not specified MACHINE could appear twice, this
can cause processing errors.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Issue: CR-1100158
Previously the final order of the MACHINEOVERRIDES was effectively:
zynqmp_graphics:board_variant:board:soc_variant:soc:aarch64:armv8a:cortexa72-cortexa53:machine
The correct order should be least important to most important:
aarch64:armv8a:cortexa72-cortexa53:zynqmp_graphics:soc:soc_variant:machine:board:board_variant
This change accomplishes that by adjusting the order of the .= / =. of the
MACHINEOVERRIDES values. This changes the order of a few standard requires,
adjusts how the zynqmp_graphics is added, and changes the order of the
soc/soc_variant settings.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
|
|
|
|
|
|
| |
Setting FPGA_MNGR_RECONFIG_ENABLE default to 1 and not dependent on a
feature. At the time of this patch, this flag defaulting to 1 will
enable CONFIG_OF_CONFIGFS and CONFIG_OF_OVERLAY in kernel (it is on in
default configs in xilinx kernel) and enabling packaging wiring for
extra hdfs in fpga-manager-util
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
|
|
|
|
|
|
|
| |
Using += for MACHINE_FEATURES to allow addition to MACHINE_FEATURES in
confs using += and _append
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
|
|
|
|
|
|
|
|
| |
After the change to extract cdo from the boot.bin in deploy, the cdo is
deployed in a different directory. updating the location for runqemu
command
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
|
|
|
|
| |
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
|
|
|
|
|
|
|
|
|
| |
IMAGE_FEATURES should only control which package are getting included into the
image, it shouldnt control configuration/compile options. Keeping the
fpga-manager IMAGE_FEATURE but also using fpga-overlay DISTRO_FEATURE to
set FPGA_MNGR_RECONFIG_ENABLE which controls config options
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Issue: CR-1096936
TOPDIR is only used to find the file to copy in the case of a multiconfig
build. However, even in this case the value of TOPDIR does not effect
the resulting build. Exclude this variable to avoid unnecessary
rebuilds of firmware in the eSDK.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
|
|
| |
We want meta-browser/meta-chromium to be used with ultra96 webapp
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
|
|
|
|
| |
Using weaker assingnment for UBOOT_MACHINE to update this value in
petalinux without _forcevariable.
Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
|
|
|
|
|
|
|
| |
meta-xilinx-tools and bootgen produced a version called 'fsbl-<machine>',
adjust the name to match expectations.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
|
|
|
|
| |
Match the behavior of the pmu, psm, and plm firmwares. Set the default
deployment directory, filename, and dependencies for the soc-zynq and
soc-zynqmp systems. FSBL is only present on thse two systems.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
| |
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
|
|
|
| |
Set BOARD in MACHINE conf as workaround for build scripts not using
generic confs
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
|
|
|
|
|
|
|
|
| |
Including xilinx-board.inc to add BOARD variables support for mb generic
machine.
Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
|
|
|
|
|
|
|
| |
The restructure of the code missed the filename structure, the filenames
used by meta-xilinx-tools were intended to be the correct ones.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In order to allow standalone (meta-xilinx-standalone), XSCT
(meta-xilinx-tools), and future items to work in the same way
the recipes have been restructured.
A *-firmware recipe will generate the firmware and stage it to do_deploy.
A *fw recipe will take the deployed version and package it for the Linux
side of things. This allows the firmware generation to be easily extended
without requiring packaging knowledge. Similarly packaging can be
extended for alternative boot/upgrade mechanisms as required.
In all cases, the MACHINE configuration will specify the default way
the components are to be built, along with the names of the item in
the deploy directory.
The PLM/PSM/PMU_IMAGE_NAME is the name for the generated firmware.
PLM/PSM/PMU_DEPLOY_DIR is the path to the constructed firmware. This along
with the IMAGE_NAME above can be used to specify the location of an
externally generated set of firmware.
Addtionally the dependencies for building the plmfw/psmfw/pmufw can be
changed easily using PLM/PSM/PMU_DEPENDS and PLM/PSM/PMU_MCDEPENDS. The
former specifies dependencies in the same multiconfig, while the later
allows the component to require another multiconfig to have finihed.
The system has a referenced default, if multiconfig is enabled it will
automatically use it, otherwise it will try to use the recipe in the
main configuration. (This will fail unless meta-xilinx-tools is available.)
Also two multiconfigs hve been implemented: versal-fw and zynqmp-pmufw
They can be enabled using BBMULITCONFIG += "zynqmp-pmufw" or versal-fw.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
| |
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
| |
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Machines: Move baremetal machines to meta-xilinx-standalone
Layers:
- Add new meta-xilinx-standalone-experimental
This layer may require components that may not yet be available to the
general public. It will contain various experiemntal integration work.
- meta-xilinx-standalone
This layer should be functional and contain the necessary items to build a
baremetal toolchain that can use libxil (replacement to libgloss) from
the Xilinx embeddedsw components. (Note, libxil is NOT built as part of
this work!)
The layer also contains the buildable components for the various firmware
components required to startup various Xilinx FPGAs.
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
|
|
|
|
|
|
| |
Enable runqemu for BOARD vp1202-versal
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
|
|
|
|
|
|
| |
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
|
|
|
|
| |
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
XRT has a run-time dependency on zocl for correct operation. Add zocl as
RDEPENDS.
Since XRT is machine independent, but zocl is tied to the kernel (because
it's a kernel module) and is thus kernel/machine specific, any time the
machine is changed, the hash for XRT would change.
To 'break' the dependency when it comes to hash calculations, add a
SIGGEN_EXCLUDE declaring this dependency as 'safe'.
Signed-off-by: Christian Kohn <christian.kohn@xilinx.com>
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
|
|
|
|
|
|
|
| |
Adding xxd as a host tool as it's a dependent tool when uboot is
configured to use a default environment file
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
|
|
|
|
|
|
|
| |
Inserting a '-' in between board and boardvariant to align with the
format of soc and soc family
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
|
|
|
|
|
|
|
|
|
| |
Previously machine override for a soc variant was SOC_VARIANT appended
to SOC_FAMILY. A '-' was included in between to align with how versal
handles machine overrides. Updating machine overrides to match this
format
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
|
|
|
|
|
|
|
| |
Removing the need to prepend a '-' to SOC_VARIANT for versal variants
for ex. '-ai-core'
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
|
|
|
|
|
|
|
|
| |
Defining UBOOT_MACHINE as microblaze-generic_defconfig and setting
UBOOT_INITIAL_ENV to empty to be able to compile uboot as microblaze
env/common.o doesn't have default_environment section
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
|
|
|
|
|
|
|
| |
Pick correct QB_MACHINE name for each of the machine from
qemuboot-xilinx.bbclass. Remove QB_MACHINE from machine.conf
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
|
|
|
|
|
|
| |
Fix machine name being passed to zcu102-zynqmp qemu boot arg.
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
|
|
|
|
|
|
|
|
| |
Using BOARD level hierarchy to rewire ultra96 specific overrides.
Each package using BOARD override has to also redefine PACKAGE_ARCH
using BOARD_ARCH
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Going to generic machine confs, we can no longer use machine overrides
for specific machine changes.
Adding BOARD and BOARD_VARIANT level hierarchy for packaging for
zynqmp/zynq/versal generic machines confs.
BOARD and BOARD_VARIANT must be set accordingly to use these hierarchy
levels properly
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
|
|
|
|
|
|
|
| |
Fixing arch variables, removing SOC_ for BOARD_ARCH and
BOARDVARIANT_ARCH variables
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
|
|
|
|
|
|
|
|
|
|
| |
If there is a _ in the package arch, the sstate-control files are written
with a _. However, when they are used they somehow get translated to a
-, triggering a warning message. The warning though means that the
sstate component was not actually staged into the recipe-sysroot, causing
a later build failure.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
|
|
|
|
|
| |
git cherry-pick b80c6d4
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
|
|
|
|
| |
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Introducing an include file to add levels of hiearchy to PACKAGE_ARCH,
namely BOARD and BOARD_VARIANT
To use this, future confs will need to have the following line:
require conf/machine/include/xilinx-board.inc
Along with BOARD/BOARD_VARIANT definitions
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
|