summaryrefslogtreecommitdiffstats
path: root/conf/machine/include/imx-base.inc
Commit message (Collapse)AuthorAgeFilesLines
* imx-base.inc: Use ??= for PREFERRED_VERSIONbackport-1130-to-kirkstoneTom Hochstein2022-07-111-20/+20
| | | | | | | | | | | | | The variable values set in meta-freescale with a default value, i.e. with ?=, can be overridden just once by a user, with =. Change the PREFERRED_VERSION settings to a weak default value, i.e. with ??=, so users of meta-freescale are not so limited. When a variable value is set with a weak default value, the variable can be overridden by any successively higher priority layer with ??=. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> (cherry picked from commit 5b47898ff939791ab426fff17821aca3476ddd7a)
* imx-base.inc: upgrade to gstreamer 1.20.2backport-1122-to-kirkstoneDaiane Angolini2022-06-241-7/+7
| | | | | Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io> (cherry picked from commit 912829e1aa543326682f45656b6240db97864655)
* vf: follow SoC override changes also for vybridMax Krummenacher2022-06-231-2/+7
| | | | | | | | - Complete the move to the new override system also for vybrid - Drop the sub SoC family vf50 and vf60 in favour of using only vf Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 2f8003c30fe290881d12280221b44bae7ce0b373)
* layer-wide: define configurable default TF-A providerAndrey Zhizhikin2022-06-161-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | TF-A package can have several providers: upstream TF-A implementation, or NXP downstream fork. Functionality to switch this provider, and to select which package shall be included into the target image is missing in the layer however, defaulting the usage of the layer to NXP downstream fork only. Introduce the Default TF-A Provider define, make it overridable, and default it to NXP downstream fork. This allows user to re-define the package name later shall they choose to integrate upstream TF-A package instead. Current upstream TF-A version (v2.7) does not support HAB feature of i.MX8M family, see [1]. If the upstream TF-A version is chosen, then HAB will not be available for all SoCs that are opting-in. This is indicated in the comment where default TF-A provider variable is set. This might change with future TF-A release, so later it can be revised and statement in include file can be potentially removed. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> Link: [1]: https://lists.trustedfirmware.org/archives/list/tf-a@lists.trustedfirmware.org/message/5UYYI4CNLQ5OWWHU466JBK6I5QIQ2VRS/ (cherry picked from commit b61c4907b1926061cbf627ee1fd5dd8eb8e53d59)
* imx-base.inc: Set virtual/opencl-icd provider for i.MXTom Hochstein2022-06-161-0/+1
| | | | | | | | | | | Properly set provider for i.MX GPU, as noted by bitbake: ``` NOTE: Multiple providers are available for virtual/opencl-icd (imx-gpu-viv, opencl-icd-loader) Consider defining a PREFERRED_PROVIDER entry to match virtual/opencl-icd ``` Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> (cherry picked from commit 0c9f999f93873d02ed59b1e6b94b6cd93a2ca96d)
* imx-boot-container-bootpart: drop wks fileMax Krummenacher2022-04-261-10/+0
| | | | | | | | | Now that we have a symlink with constant name 'imx-boot' independent on the use of the MACHINEOVERRIDE 'imx-boot-container', drop the additonal imx-boot-container-bootpart file as imx-imx-boot-bootpart does the same thing. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
* ffmpeg: Downgrade ffmpeg 5.0.0 -> 4.4.1 for NXP BSPTom Hochstein2022-04-041-0/+1
| | | | | | | | | | | | | | | | | | | | The i.MX 1.18.5 version of gstreamer1.0-libav is not compatible with upstream ffmpeg 5.5.0 and results in the follow build errors: ``` /opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: ext/libav/libgstlibav.so.p/gstavaudenc.c.o: in function `gst_ffmpegaudenc_set_format': /usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavaudenc.c:246: undefined reference to `avcodec_get_context_defaults3' /opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: /usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavaudenc.c:292: undefined reference to `avcodec_get_context_defaults3' /opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: /usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavaudenc.c:336: undefined reference to `avcodec_get_context_defaults3' /opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: /usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavaudenc.c:317: undefined reference to `avcodec_get_context_defaults3' /opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: ext/libav/libgstlibav.so.p/gstavaudenc.c.o: in function `gst_ffmpegaudenc_start': /usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavaudenc.c:197: undefined reference to `avcodec_get_context_defaults3' /opt/work/upstream/fsl-xwayland/tmp/work/cortexa35-mx8-fsl-linux/gstreamer1.0-libav/1.18.5-r0/recipe-sysroot-native/usr/bin/aarch64-fsl-linux/../../libexec/aarch64-fsl-linux/gcc/aarch64-fsl-linux/11.2.0/ld: ext/libav/libgstlibav.so.p/gstavvidenc.c.o:/usr/src/debug/gstreamer1.0-libav/1.18.5-r0/build/../gst-libav-1.18.5/ext/libav/gstavvidenc.c:252: more undefined references to `avcodec_get_context_defaults3' follow collect2: error: ld returned 1 exit status ninja: build stopped: subcommand failed. ``` Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx-base.inc: Upgrade gstreamer1.0 1.18.0 -> 1.18.5Tom Hochstein2022-04-041-7/+7
| | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx-base.inc: Fix MACHINE_SOCARCH_SUFFIX for 8XLiteTom Hochstein2022-03-311-1/+1
| | | | | | | The architecture is independent of the number of cores, so update the 8XLite suffix from mx8dxl to mx8xl. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* mx8dx: Normalize MACHINEOVERRIDES implementationTom Hochstein2022-03-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | The imx8dx-mek machine is similar to imx8qxp-mek and so the mx8qxp override was included in the MACHINEOVERRIDES hierarchy. This is non-standard, and the rework of the SOC overrides didn't handle it properly, leading to a build break: ``` Log data follows: | DEBUG: Executing shell function do_compile | NOTE: 8QX boot binary build | cp: failed to access '/home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/git/iMX8DX/scfw_tcm.bin': Not a directory | WARNING: /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/temp/run.do_compile.1809636:179 exit 1 from 'cp /home/aquino/src/ossystems/oel-platform/build/tmp/deploy/images/imx8dx-mek/imx-boot$ tools/scfw_tcm.bin /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/git/iMX8DX/scfw_tcm.bin' | WARNING: Backtrace (BB generated script): | #1: compile_mx8x, /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/temp/run.do_compile.1809636, line 179 | #2: do_compile, /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/temp/run.do_compile.1809636, line 151 | #3: main, /home/aquino/src/ossystems/oel-platform/build/tmp/work/imx8dx_mek-oel-linux/imx-boot/1.0-r0/temp/run.do_compile.1809636, line 189 ERROR: Task (/home/aquino/src/ossystems/oel-platform/sources/meta-freescale/recipes-bsp/imx-mkimage/imx-boot_1.0.bb:do_compile) failed with exit code '1' ``` Fix the problem by removing mx8qxp from the mx8dx hierarchy and adapting existing mx8qxp overrides appropriately. Fixes: #1027 Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* wayland-protocols: Upgrade 1.22.imx -> 1.25.imxTom Hochstein2022-03-251-3/+3
| | | | | | | | This is a pre-release version from upcoming NXP Q2 release added to kirkstone to fix mesa compatibility problems. The commit does also update the recipe to align with the one in OE-core. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* libdrm: Upgrade 2.4.207.imx -> 2.4.109.imxTom Hochstein2022-03-251-3/+3
| | | | | | | | | This is a pre-release version from upcoming NXP Q2 release added to kirkstone to fix mesa compatibility problems. The patch 0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch is dropped as it is now upstream. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx-base.inc: Enable Crypto for all 8XTom Hochstein2022-03-201-1/+1
| | | | | | Align with 8M family. Enabling Crypto enables FP and SIMD as well. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx-base.inc: Decrease machine feature override priorityTom Hochstein2022-03-161-17/+17
| | | | | | | | | | | | | | | | The new SOC overrides changed the priority for the NXP machine feature overrides (like imxgpu2d) to be higher than the SOC override (like mx8qxp). This change manifested as a change to the weston-init configuration for mx8qxp and mx8qm, causing the addition of -use-g2d=1 to the weston runtime configuration file weston.ini. The problem is fixed simply by moving the feature overrides before the SOC overrides to match the old priority order. However, to provide consistency, rather than just match the old priority order, the features are now moved lower in priority than any of the SOC group overrides as well (like mx8 and mx8x). Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx-base.inc: add back mx23 supportTrevor Woerner2022-03-071-2/+3
| | | | | | | | | | When include/imx-base.inc was simplified to use the imx-{mainline,nxp}-bsp overrides, the "mx23" category of machines was missed. Build tested with imx233-olinuxino-* and imx23evk. Run tested with imx233-olinuxino-maxi. Signed-off-by: Trevor Woerner <twoerner@gmail.com>
* xf86-video-imx-vivante: drop vivante specific x11 driverMax Krummenacher2022-03-061-1/+0
| | | | | | | | | | | | The required x11 driver stuff has been removed from imx-gpu-viv and thus the X11 driver is no longer buildable. Drop the recipe and fallback on the default X11 fb driver. | ERROR: Nothing RPROVIDES 'libvivante-dri-imx' (but .../meta-freescale/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb RDEPENDS on or otherwise requires it) Completes 747c96f5 ("imx-gpu-viv: Upgrade to 6.4.3.p2.4"). Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
* Ensure we fail if old SoC overrides are in usetopic/warn-old-overridesOtavio Salvador2022-03-031-0/+2
| | | | | | | | | To assist existing layers to convert to the new BSP-specific overrides. Besides failing the parsing of the recipes where it is in use, we provide a script to automate most of it. Fixes: #990. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* optee-test: Upgrade 3.10.0.imx -> 3.15.0.imxTom Hochstein2022-02-241-1/+1
| | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* optee-client: Upgrade 3.10.0.imx -> 3.15.0.imxTom Hochstein2022-02-241-1/+1
| | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* optee-os: Upgrade 3.10.0.imx -> 3.15.0.imxTom Hochstein2022-02-241-1/+1
| | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* Merge pull request #983 from thochstein/mx8xOtavio Salvador2022-02-241-4/+4
|\ | | | | imx-base.inc: Add missing mx8x overrides
| * imx-base.inc: Add missing mx8x overridesTom Hochstein2022-02-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | The i.MX 8QXP and 8DXL are in the 8X family, but the override was missed in the new SOC override rework. This causes do_compile for imx-boot to fail: ``` cp: cannot stat '/.../build/tmp/deploy/images/imx8qxpmek/imx8qm_m4_TCM_power_mode_switch_m40.bin': No such file or directory ``` Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* | imx-base.inc: Add support to include extra data for NIP devicestopic/better-nip-supportOtavio Salvador2022-02-231-0/+3
|/ | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* imx-base.inc: reduce code using imx-{mainline,nxp}-bsp overridesOtavio Salvador2022-02-211-20/+13
| | | | | | | We reduce the code size using the new overrides to improve code clearness and reduce boilerplate. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* Generalize overrides subsystem for NXP and Mainline supportOtavio Salvador2022-02-211-147/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Essentially, we extend the overrides to a generic-bsp, nxp-bsp, and mainline-bsp. So, for example, the mx8mq override is split into: - imx-generic-bsp: compatible with every i.MX SoC and both BSP variants - imx-nxp-bsp: compatible with every i.MX SoC but specific to NXP BSP - imx-mainline-bsp: compatible with every i.MX SoC but specific to Mainline BSP - mx8-generic-bsp: compatible with every i.MX8 SoC and both BSP variants - mx8-nxp-bsp: compatible with every i.MX8 SoC but specific to NXP BSP - mx8-mainline-bsp: compatible with every i.MX8 SoC but specific to Mainline BSP - mx8m-generic-bsp: compatible with every i.MX8M SoC and both BSP variants - mx8m-nxp-bsp: compatible with every i.MX8M SoC but specific to NXP BSP - mx8m-mainline-bsp: compatible with every i.MX8M SoC but specific to Mainline BSP - mx8mq-generic-bsp: compatible with every i.MX8MQ SoC and both BSP variants - mx8mq-nxp-bsp: compatible with every i.MX8MQ SoC8 but specific to NXP BSP - mx8mq-mainline-bsp: compatible with every i.MX8MQ SoC but specific to Mainline BSP The extender mechanism is responsible for extending the override list to include the generic overrides. We can then use the three different variants to handle the metadata correctly. Generically speaking, the conversion mainly was automated (with a lot of back and forth until getting it right). To convert an existing layer, the following script can be used: ```sh git ls-files classes recipes-* \ | xargs sed -i \ -e 's,:\(mx[6-8]\w*\),:\1-nxp-bsp,g' \ -e 's,(\(mx[6-8]\w*\)),(\1-nxp-bsp),g' \ -e 's,\(mx[6-8]\w*\)|,\1-nxp-bsp|,g' \ -e 's,|\(mx[6-8]\w*\)),|\1-nxp-bsp),g' \ \ -e 's,:\(mx[5s]\w*\),:\1-generic-bsp,g' \ -e 's,(\(mx[5s]\w*\)),(\1-generic-bsp),g' \ -e 's,\(mx[5s]\w*\)|,\1-generic-bsp|,g' \ -e 's,|\(mx[5s]\w*\)),|\1-generic-bsp),g' \ \ -e 's,:\(vf\w*\),:\1-generic-bsp,g' \ -e 's,:\(vf[56]0\w*\),:\1-generic-bsp,g' \ -e 's,\(vf\w*\)|,\1-generic-bsp|,g' \ -e 's,|\(vf\w*\)),|\1-generic-bsp),g' \ -e 's,\(vf[56]0\w*\)|,\1-generic-bsp|,g' \ -e 's,|\(vf[56]0\w*\)),|\1-generic-bsp),g' \ \ -e 's,:\(imx\) ,:\1-nxp-bsp ,g' \ -e 's,(\(imx\)),(\1-nxp-bsp),g' \ -e 's,\(imx\)|,\1-nxp-bsp|,g' \ -e 's,|\(imx\)),|\1-nxp-bsp),g' for d in $(find -type d | egrep '/mx[6-8]w*'); do git mv $d $d-nxp-bsp done for d in $(find -type d | egrep '/imx$'); do git mv $d $d-nxp-bsp done for d in $(find -type d | egrep '/mx[5s]w*'); do git mv $d $d-generic-bsp done ``` Fixes: #791. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* Merge pull request #965 from thochstein/masterOtavio Salvador2022-02-101-6/+6
|\ | | | | Update graphics for L5.10.72-2.2.0
| * wayland-protocols: Upgrade to 1.22.imxTom Hochstein2022-01-291-3/+3
| | | | | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
| * libdrm: Upgrade to 2.4.107.imxTom Hochstein2022-01-281-3/+3
| | | | | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* | imx-base: Install the driver when nxp8987 in MACHINE_FEATURESDaiane Angolini2022-02-011-0/+3
|/ | | | Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
* mx25pdk: Remove machine due to its deadlineVinicius Aquino2021-10-191-2/+0
| | | | | | The commit 2610bf14 from u-boot-fslc removes support for mx25pdk Signed-off-by: Vinicius Aquino <vinicius.aquino@ossystems.com.br>
* imx-base.inc: Set gstreamer preferred version to 1.18.0[.imx]Tom Hochstein2021-09-011-5/+7
| | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx-base.inc: Define a default value for OPTEE_BIN_EXTTom Hochstein2021-08-241-0/+1
| | | | | | | | | | | | | | Without a default the IMAGE_BOOT_FILES is not parsed properly, leading to the following error for machines without such a variable definition: ``` | ERROR: _exec_cmd: install -m 0644 -D /z/build-master/imx233-olinuxino-maxi/build/tmp-glibc/deploy/images/imx233-olinuxino-maxi/make_dtb_boot_files /z/build-master/imx233-olinuxino-maxi/build/tmp-glibc/work/imx233_olinuxino_maxi-oe-linux-gnueabi/core-image-base/1.0-r0/tmp-wic/boot.2/make_dtb_boot_files returned '1' instead of 0 | output: install: cannot stat '/z/build-master/imx233-olinuxino-maxi/build/tmp-glibc/deploy/images/imx233-olinuxino-maxi/make_dtb_boot_files': No such file or directory ERROR: Task (/opt/oe/configs/z/build-master/imx233-olinuxino-maxi/layers/openembedded-core/meta/recipes-core/images/core-image-base.bb:do_image_wic) failed with exit code '1' ``` Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx-base.inc: Fix optee boot imagesTom Hochstein2021-08-211-2/+2
| | | | | | | | For optee support tee.bin is needed in the image. The optee image uTee is renamed with an SOC qualifier. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx-base.inc: Fix another overrideTom Hochstein2021-08-121-1/+1
| | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* layer: More override fixesTom Hochstein2021-08-121-8/+8
| | | | | | | | | | Adds fixes for _imx, _imxdpu, _imxdrm, _imxgpu, _imxgpu3d, virtual PREFERRED_PROVIDER versions Fix other places for imx/imxdpu/imxdrm overrides Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* layer: Convert to new override syntaxKhem Raj2021-08-121-173/+173
| | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
* jailhouse: Drop from MACHINE_FEATURES_BACKFILLTom Hochstein2021-07-291-4/+1
| | | | | | | | The backfill feature is for features that were once always enabled without the ability to disable them. This is not true of jailhouse; it has always had a feature allowing it to be disabled. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx-base.inc: use new wks file for boot containerAndrey Zhizhikin2021-05-041-10/+9
| | | | | | | | | | | | | Boot container provided by mainline U-Boot build can be used directly in the result image file, as it requires two binary files to be populated onto raw partition, hence it uses separate image generation scheme from imx-boot provided by NXP. Use new WKS file for mainline BSP built for aarch64 which picks up and packs boot container binary files from U-Boot directly into result image. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
* imx-base.inc: Fix opencv preferred versionTom Hochstein2021-05-041-1/+1
| | | | | | The i.MX fork of opencv is upgraded to 4.5.2.imx. Fix the preferred version. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
* imx-base.inc: use 0x80008000 as the UBOOT_ENTRYPOINT for mx6ul, mx6ull and ↵Marc Ferland2021-05-041-3/+3
| | | | | | | | | | mx6ulz Based on the different reference manuals, the DDR controller for the mx6ul, mx6ull and mx6ulz is at 0x80000000 and not 0x10000000 like the imx6 dual or quad for example. Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
* Move mesa/etnaviv to xf86-video-modesettingAndreas Müller2021-04-201-1/+5
| | | | | | | * armada sources are gone finally * glmark2-es2 performance is almost doubled 87 -> 162 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
* u-boot-imx-tools: Drop i.MX specific toolsOtavio Salvador2021-04-181-5/+0
| | | | | | | | | | | We are building same tools as the original U-Boot thus we should rely on them. This is critical as native tools cannot vary between machines as there are no clear reason to convert this to be a cross tool as we build no machine specific code. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* imx-base.inc: Provide a default value for SPL_BINARYOtavio Salvador2021-04-141-1/+1
| | | | | | | | | 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>
* imx-base.inc: Allow use of SPL_BINARY variable inside wic imagesOtavio Salvador2021-04-131-0/+4
| | | | | Fixes: 776932e1 ("Rework the u-boot-fslc and u-boot-imx settings logic") Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* imx-base.inc: Fix mfgtool selection for u-boot-fslcOtavio Salvador2021-04-131-1/+2
| | | | | | | | | 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>
* Rework the u-boot-fslc and u-boot-imx settings logicOtavio Salvador2021-03-241-10/+43
| | | | | | | | | | 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>
* imx-base.inc: Allow override of IMX_DEFAULT_BOOTLOADEROtavio Salvador2021-03-241-2/+2
| | | | | | | 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>
* imx-base.inc: add boot container condition and wks dependencyAndrey Zhizhikin2021-03-171-1/+31
| | | | | | | | | | | | | | | | 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>
* optee-imx: Upgrade to 3.10.0Tom Hochstein2021-03-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* imx-base.inc: CleanupTom Hochstein2021-03-131-2/+1
| | | | | | | - Remove redundant variable assignment - Move creeping comment back where it belongs Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>