| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
This fixes the build case when machine does not use SPL and does not set
it. We couldn't use dynamic expansion or we trigger a recursive
expansion so we opted to use an utility function to do the proper logic.
Fixes: f98059fe ("imx-base.inc: Allow use of SPL_BINARY variable inside wic images")
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
|
|
|
|
| |
Fixes: 776932e1 ("Rework the u-boot-fslc and u-boot-imx settings logic")
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
|
|
|
|
|
|
|
|
| |
For eventual use of u-boot-fslc as mfgtool flavor, this will need to be
provided as an extra UBOOT_CONFIG thus reusing same provider. This fix
some build errors with external layers.
Fixes: 776932e1 ("Rework the u-boot-fslc and u-boot-imx settings logic")
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
|
|
|
| |
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
| |
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
| |
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
| |
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Change-Id: If9e1b788bebeef4429a2ed71756aac54629cba30
|
|
|
|
|
|
|
|
| |
Since u-boot-fslc doesn't yet support this machine, set the configuration
for mainline BSP to use u-boot-imx.
Fixes #710.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
U-Boot make target set to empty string does not expand correctly for
mainline BSP build, which append make target with 'flash.bin' entry.
This causes the build to fail, since the u-boot.bin target is not
produced when only 'flash.bin' is present in the make target list.
Define the default make target to 'all', which allows proper build
target expansion.
Fixes: 823a97cf ("imx8mp-lpddr4-evk: Rework 8M Plus EVK config file")
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
|
|
|
|
| |
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
|
|
|
|
| |
There are two variants of the 8M Plus Evaluation Kit board, one with
LPDDR4 and one with DDR4. Rework our existing config file to make
this distinction explicit in the machine config file name and to allow
for configuration re-use.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
|
|
|
|
|
| |
We need to make it more obvious what is in use, when we support both
bootloaders and for it we are now using the _pn suffix for both.
This also fixes the WIC_FILE depending on the choice otherwise image
build fails.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
|
|
|
|
|
| |
We now bind the defconfig to the 'u-boot-imx' package.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
|
|
|
|
|
| |
We now bind the defconfig to the 'u-boot-imx' package.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
|
|
|
|
|
|
| |
We need to allow the override of the variable in 'local.conf' or other
places, so we cannot overwrite it inside imx-base.inc.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
|
|
|
| |
This reverts commit cc4b91bf3a3cf5c2034372c607783048aae44b65.
|
|
|
|
|
|
| |
This sets the required variables so the target is buildable.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
|
|
|
| |
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
|
|
|
| |
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
|
|
|
|
|
|
|
|
| |
Mainline BSP does have lockups in boot when OP-TEE is included in the
build.
Make optee feature enabled only when NXP BSP flavor is chosen.
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use the new boot container build on mainline BSP for mx8mm, mx8mn
and mx8mp machines.
Boot container serves as a replacement for imx-boot package present
in NXP BSP, and is created by U-Boot build system.
Define ATF machine name and required load address.
Define dependency on firmware package, as it provides DDR firmware
binaries needed to construct boot container.
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Boot container provided by mainline U-Boot build can be used directly
int the result image file, and does not depends on the imx-boot
component provided by NXP.
Define variable to be used for conditional inheritance on the
imx-boot-container class when 'imx-boot-container' is present in
machine overrides.
Modify WKS dependency to imx-boot for mainline BSP built for aarch64 to
use imx-boot when derivative does not set the boot container
compatibility in its overrides.
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Update all recipes to pull sources from imx_5.4.70_2.3.0 branch in NXP
upstream and update SRCREV to match release tags.
Update PREFERRED_VERSION of optee for mx8 to point to 3.10.0.imx.
Following notes are additions to the version update of recipes:
--------------------------
optee-client:
- Drop CFLAGS patch as it is already applied upstream
optee-os:
- Drop gcc10 patch as it is already applied upstream
- Add dependency on python3-pycryptodomex-native
- Drop NOWERROR flag as package is reworked to disable warnings by default
- Rework mkimage load address since tee-init_load_addr.txt is no longer created
optee-test:
- Drop python3 patch as it is already applied upstream
- Remove unused patch files from layer
- Add dependency on python3-pycryptodomex-native
- Add sysroot to C and C++ flags
Fixes #686, fixes #689.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The u-boot settings in imx6qdlsabresd, imx6qdlsabreauto, and imx6ulevk are
set to values that are correct for u-boot-fslc. Attempts to override these
settings to fix u-boot-imx builds have broken u-boot-fslc builds, and
vice versa. The u-boot-imx build is currently broken:
```
| install: cannot stat '/opt/work/upstream/fsl-xwayland/tmp/work/imx6qdlsabresd-fsl-linux-gnueabi/u-boot-imx/2020.04-r0/build/u-boot.img': No such file or directory
```
Rework the u-boot-fslc-specific overrides so they are used conditionally
only for u-boot-fslc. The default settings are correct for u-boot-imx.
Fixes: 880dbf2 ("fsl-base.inc: use conditional assignment for base variables")
Fixes: e83f54d ("machines: imx-base.inc: fix failing u-boot builds")
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
|
|
| |
- Remove redundant variable assignment
- Move creeping comment back where it belongs
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
|
| |
Use i.MX fork to support additional machine learning demos and tiny dnn.
Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There is no u-boot-fslc-tools recipe and thus the PREFERRED_PROVIDER is
not available for u-boot-tools.
Prevents:
| NOTE: Multiple providers are available for u-boot-mkimage-native (u-boot-imx-tools-native, u-boot-tools-native)
| Consider defining a PREFERRED_PROVIDER entry to match u-boot-mkimage-native
| NOTE: Multiple providers are available for runtime nativesdk-u-boot-mkimage (nativesdk-u-boot-imx-tools, nativesdk-u-boot-tools)
| Consider defining a PREFERRED_RPROVIDER entry to match nativesdk-u-boot-mkimage
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The SPL_BINARY was no longer being set properly after the machine name change
from imx8qmmek to imx8qm-mek, resulting in the following build break for
imx-boot:
```
| make[1]: *** No rule to make target 'u-boot-spl.bin', needed by 'flash_spl'. Stop.
```
The override of the machine name is of course redundant here, so just
drop the override.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
| |
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
| |
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
| |
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
|
|
| |
Add a preferred provider for u-boot-mfgtool since it also has both a community and
an i.MX version.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The gstreamer1.0 recipes for the i.MX forks were updated to a newer version, but
the file versions were not updated accordingly. For the NXP 5.4.47 release, the
gstreamer version is 1.16.2.imx. For NXP 5.4.70, the gstreamer version is
1.16.3.imx.
Note that the original version 1.16.imx was not appropriate either, and this
fix can also be viewed from that perspective, that the third digit of the version
should be included in the recipe version.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
imx-boot update 5.4.70_2.3.0 requires a new version of ddr firmware to
be deployed and used for imx8mp machine (201904 -> 202006).
This is introduced in commits of imx-boot git tree:
322a834 ("MLK-24860 iMX8MP: Use 202006 DDR4 firmware")
658c54a ("MLK-24788 iMX8MP: Update LPDDR4 Firmware to 202006 version")
Update ddr firmware name to include new version in machine config file.
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
|
|
|
|
|
|
|
|
| |
The kernel from rel_imx_5.4.70_2.3.0 got one device tree name changed:
imx8mm-evk-revb.dts -> imx8mm-evk-revb-qca-wifi.dts
Follow that in the machine config to keep the machine buildable.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
|
|
|
|
|
|
|
|
|
| |
Update PREFERRED to release 5.4.70_2.3.0.
imx-gpu-viv now has opencl-clhpp in PROVIDES. Set this as the
preferred provider.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
|
|
|
|
|
|
|
|
| |
Set MACHINE_GSTREAMER_1_0_PLUGIN for mx8mq, mx8qm and mx8qxp machines.
Also, set PREFERRED_VERSION_gstreamer1.0 and related plugins for all
mx8 machines.
Signed-off-by: Pierluigi Passaro <pierluigi.p@variscite.com>
|
|
|
|
|
|
| |
Use imx-gpu-viv for hardware-accelerated OpenCL implementation.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
|
|
|
| |
The existing OpenCL recipes opencl-headers and opencl-icd-loader are dependencies
for clinfo. In order to build clinfo with imx-gpu-viv as provider, fix imx-gpu-viv
to provide the same recipe names.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If using a fsl-xxx distro the prefered provider of U-Boot is
u-boot-imx. That U-Boot didn't make the switch to a unified dl/q/qp
binary and does not use an spl. For the imx6ulevk it does not use an
spl.
The below commits try to address that, however the change is not
limited to
- the fsl distro but rather uses use-nxp-bsp which can be used with any distro
- some machines which do not use u-boot-imx, e.g. colibri-imx6 now fail.
Fix this by moving the configuration into the affected distro in
meta-freescale-distro and the machines.
Fixes:
c9757ea3 ("imx-base.inc: Fix use-nxp-bsp after rework")
77e56f30 ("imx-base.inc: Limit use-fsl-bsp u-boot overrides to i.MX 6 and 7")
e5cd33c9 ("u-boot.imx: Add u-boot configuration for fsl")
Build tested with fsl-xwayland & use-nxp-bsp for imx6qdlsabreauto,
imx6qdlsabresd, and imx6ulevk.
Build tested with the fslc-xwayland & use-nxp-bsp for imx6qdlsabreauto,
imx6qdlsabresd, imx6ulevk, and colibri-imx6.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
|
|
|
|
| |
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The 8QuadXPlus and 8DualXPlus are identical except for core number, and
the Multisensory Environment Kit board for each is the same. Rework the
configuration to better capture the commonality.
Also, rename the machine to match the devicetree name, which also
improves readability.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The 8M Mini Evaluation Kit has two variants, one for LPDDR4 and one for
DDR4, with two corresponding sets of image components. The current machine
configuration places both sets into a single image and boots for LPDDR4.
The user must manually update the image to make it work for the DDR4
EVK variant.
Simplify the DDR4 case by providing a dedicated machine configuration.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
| |
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
|
|
|
|
| |
There are two variants of the 8M Nano Evaluation Kit board, one with
LPDDR4 and one with DDR4. Rework our existing config file to make
this distinction explicit in the machine config file name and to allow
for configuration re-use.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
| |
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
| |
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix missing pci support.
Add OP-TEE support. Add optee to MACHINE_FEATURES to enable OP-TEE
in u-boot-imx. OP-TEE is currently not supported by u-boot-fslc.
Enable Broadcom 4356, 4359, and 43455 WiFi modules.
Add device trees for PCIE EP, lcdif, and rpmsg.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
trees
Rename to match device tree name and improve readability.
Update to B0, which requires boot seek of 32.
Fix missing pci support.
Add OP-TEE support. Add optee to MACHINE_FEATURES to enable OP-TEE
in u-boot-imx. OP-TEE is currently not supported by u-boot-fslc.
Enable Broadcom 4356, 4359, and 43455 WiFi modules.
Add device trees for PCIE EP, lvds, Sound Open Firmware, and USD WiFi.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
|
|
|
|
|
| |
Isolate device trees unique to linux-imx kernel to the NXP BSP.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|