summaryrefslogtreecommitdiff
path: root/conf
AgeCommit message (Collapse)Author
2020-06-28machines: imx6: drop backported vivante variable assignmentMax Krummenacher
The package name change is now in imx-base.inc in meta-freescale, drop the override. This prevents a build error if using use-mainline-bsp: | ERROR: Nothing RPROVIDES 'xf86-video-imx-vivante' (but ...packagegroup-core-x11-xserver.bb RDEPENDS on or otherwise requires it) | xf86-video-imx-vivante was skipped: incompatible with machine apalis-imx6 (not in COMPATIBLE_MACHINE) Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-06-18colibri-imx7: follow IMX_DEFAULT_BSP changeMing Liu
IMX_DEFAULT_BSP set in the distro decides on use-mainline-bsp and sets the override in imx-base.conf. Set PREFERRED_PROVIDER_virtual/kernel accordingly. Drop MACHINE_BOOT_FILES and use the boot file directly, following the rename of the source file to boot.scr-${MACHINE}. Signed-off-by: Ming Liu <ming.liu@toradex.com>
2020-06-18colibri-imx6ull.conf: drop machine confMing Liu
Use the one in meta-freescale-3rdparty layer, and append toradex specific definitions to conf/machine/include/colibri-imx6ull.inc. Signed-off-by: Ming Liu <ming.liu@toradex.com>
2020-06-18colibri-imx6: follow IMX_DEFAULT_BSP changeMing Liu
IMX_DEFAULT_BSP set in the distro decides on use-mainline-bsp and sets the override in imx-base.conf. Set PREFERRED_PROVIDER_virtual/kernel accordingly in apalis-imx6.inc. Drop MACHINE_BOOT_FILES and use the boot file directly, following the rename of the source file to boot.scr-${MACHINE}. Also drop a redundant KERNEL_IMAGETYPE definition. Signed-off-by: Ming Liu <ming.liu@toradex.com>
2020-06-18apalis-imx6.conf: follow IMX_DEFAULT_BSP changeMing Liu
IMX_DEFAULT_BSP set in the distro decides on use-mainline-bsp and sets the override in imx-base.conf. Set PREFERRED_PROVIDER_virtual/kernel accordingly in apalis-imx6.inc. Drop MACHINE_BOOT_FILES and use the boot file directly, following the rename of the source file to boot.scr-${MACHINE}. Also drop a redundant KERNEL_IMAGETYPE definition. Signed-off-by: Ming Liu <ming.liu@toradex.com>
2020-06-18apalis-imx8x.conf: set IMX_DEFAULT_BSPMing Liu
IMX_DEFAULT_BSP is set to 'mainline' by default, we should change it to nxp for apalis-imx8x. Also add PREFERRED_PROVIDER_virtual/kernel_preempt-rt to linux-toradex-rt. Signed-off-by: Ming Liu <ming.liu@toradex.com>
2020-06-18apalis-imx8.conf: set IMX_DEFAULT_BSPMing Liu
IMX_DEFAULT_BSP is set to 'mainline' by default, we should change it to nxp for apalis-imx8. Signed-off-by: Ming Liu <ming.liu@toradex.com>
2020-06-18verdin-imx8mm.conf: set IMX_DEFAULT_BSPMing Liu
IMX_DEFAULT_BSP is set to 'mainline' by default, we should change it to nxp for verdin-imx8mm. Signed-off-by: Ming Liu <ming.liu@toradex.com>
2020-06-18colibri-imx8x.conf: several machine overrides fixesMing Liu
- Drop use-mainline-bsp from MACHINEOVERRIDES for upstream, it's already being handled by IMX_DEFAULT_BSP, we should use that to avoid multiple use-mainline-bsp in MACHINEOVERRIDES. Signed-off-by: Ming Liu <ming.liu@toradex.com>
2020-06-17verdin-imx8mm: deploy dahlia device treesMarcel Ziswiler
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit f7ebd294c81285a6579b10a09e49a3d635ac4b70)
2020-06-09machines: set prefered provider for mainlinish device-tree-overlaysMax Krummenacher
The prefered provider matching a downstream kernel is set in the distro. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 17d3d131d2d8f8a0bd68f639fdac6b2873c2dde8)
2020-06-09machines: u-boot: use full config nameMax Krummenacher
U-Boot used to be configured by 'make <board>_config', however with the move integration of the Kconfig system that changed to use a config file ending in _defconfig. Usually those names are <board>_defconfig. So nowadays one configures with 'make <whatever>_defconfig'. If make is called with <whatever>_config that is silently changed to <whatever>_defconfig. Change our config targets to the new name to prevent confusion. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 30b49e9696e82869cffc9994d7b5391d75c13dec)
2020-06-09machines: apalis-imx8x-v11a: fix image namingMax Krummenacher
MACHINE_NAME must be set after including the apalis-imx8x.conf file or it will be reset back to the standard Apalis-iMX8X value. Use DISTRO_FLAVOUR to get a different string into the TEZI image list. Related-to: ELB-2729 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit e914e84d24d99ddbd2b33d92e0fa5c913bb78ee4)
2020-06-09machines: colibri-imx8x-v10b: fix image namingMax Krummenacher
MACHINE_NAME must be set after including the colibri-imx8x.conf file or it will be reset back to the standard Colibri-iMX8X value. Use DISTRO_FLAVOUR to get a different string into the TEZI image list. Related-to: ELB-2729 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 2bc9708307b480e80b2dbd88921eb24e44fedcfd)
2020-06-09machines: apalis-imx8x: build for c0 siliconMax Krummenacher
Change the machine 'apalis-imx8x' to build for the C0 silicon SoC version. Add an additional machine 'apalis-imx8x-v11a' which builds for the B0 SoC version. Related-to: ELB-2729 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit efcc1988ef0bc0d7d6f6651f20cda7c36afa9f8c)
2020-06-09machines: colibri-imx8x: build for c0 siliconMax Krummenacher
Change the machine 'colibri-imx8x' to build for the C0 silicon SoC version. Add an additional machine 'colibri-imx8x-v10b' which builds for the B0 SoC version. Related-to: ELB-2729 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 0911ad890d40dfc9bd7df886c0dcde74a1b41fa7)
2020-06-09meta: fix some inconsistent code styleMing Liu
Signed-off-by: Ming Liu <ming.liu@toradex.com> (cherry picked from commit 77e97f0d6e1c131b8039cd62937177b8f9688411)
2020-06-09machines: rt mainline kernel: use the common linux-toradex-mainlineMax Krummenacher
linux-toradex-mainline with prempt-rt in overrides now builds a kernel with the RT patch applied. Change PREFERRED_PROVIDER to use linux-toradex-mainline when use-mainline-bsp and prempt-rt are in overrides. Related-to: ELB-2631 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit ac5028651745ea2b541dbc0a847ffd737fc5ef76)
2020-06-09meta: replace upstream with use-mainline-bsp overrides in some placesMing Liu
There is a little bit messing with the usages of upstream and use-mainline-bsp overrides, let's change to use use-mainline-bsp for kernel and devicetree choosing, upstream would be used to set use-mainline-bsp in MACHINEOVERRIDES. Signed-off-by: Ming Liu <ming.liu@toradex.com> (cherry picked from commit 06e21ad7f07f03604c405a6ef0ca119f1d9aabc5)
2020-06-09colibri-imx8x.conf: add comment on ↵Ming Liu
PREFERRED_PROVIDER_virtual/kernel_upstream_preempt-rt So far colibri-imx8x is not supported yet in linux-toradex-mainline-rt source, we need spin it to linux-toradex-mainline temporarily, add note for this to not confuse developers. Signed-off-by: Ming Liu <ming.liu@toradex.com> (cherry picked from commit f22d1f900a27ec90660f3dd3f4993c604e59006b)
2020-06-09verdin-imx8mm: follow renamed dtb name and add new oneMax Krummenacher
Note that currently the Toradex Easy Installer does nothing with the TORADEX_PRODUCT_IDS[0055] setting on eMMC machines. Related-to: ELB-2322 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit bdde1ace3087c72ee7129623546c240b905df50c)
2020-06-09colibri-imx6ull: drop upstreamed machine and deploy additional device treesMax Krummenacher
Drop the upstreamed machine configuration file and move all differences into conf/machine/include/colibri-imx6ull.inc. Deploy additional device trees. Related-to: ELB-2593 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit f2f7e066e25c02da2f6448a015b38449c77b0b21) Corrected with changes to the machine conf files in meta-freescale-3rdparty. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Conflicts: conf/machine/include/colibri-imx6ull.inc
2020-06-09colibri-imx7, colibri-imx7-emmc: deploy additional device treesMax Krummenacher
Related-to: ELB-2593 (cherry picked from commit 29126c67d573f446f837b11a5d911cd0b00a13ea) Corrected with changes to the machine conf files in meta-freescale-3rdparty. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-06-09colibri-imx6: deploy additional device treesMax Krummenacher
Related-to: ELB-2593 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit a840715b5902b03f4ce62376985e19459f88d4e6) (cherry picked from commit 28e901b9884286420810af7c5e9339b0bf132975)
2020-06-09apalis-imx6: deploy additional device treesMax Krummenacher
Related-to: ELB-2593 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 20a52efb4a09b37cc4ce76fc0d1b57702997e3ac) (cherry picked from commit 82f885af14e9dfd5f27a6b8b6f7237d065f542be)
2020-06-09colibri-imx6ull: add wifi firmwareMarcel Ziswiler
Wi-Fi firmware may help (;-p). Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 5ee38688543f6f135774ac9454abf02bcabf6501)
2020-06-09machines: drop the *imx6-mainline machinesMax Krummenacher
We now have distos which set everything up to build a mainlinsh kernel where possible. Drop the machines which did choose the meta-freescale mainlinish kernel and userspace. Releated-to: ELB-2311 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit dc3a9bdf8b7871385989b26f490ea63c3185f499)
2020-06-09apalis-imx8.conf: deploy additional device treesMax Krummenacher
Related-to: ELB-1254 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit ad827347548201612eee97129b63db07b3e9a884) (cherry picked from commit e64e8892ddc0527ec157ed82bf917929774f0916)
2020-06-09firmware: update to 4.14.98 2.3.1Max Krummenacher
The seco firmware is now split out of firmware-imx. The seco firmware has now a i.MX8X B0 and C0 silicon version. Related-to: ELB-2351 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 78802e3ecd139a5031c06821526f249e060894c1) (cherry picked from commit 264c9e55a59849b1370e4638020cb364662357b0)
2020-06-09machines: choose upstream and upstream-rt kernelMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 3d68713e7e28fae312fa869f0742a13edf1700c9)
2020-04-06meta: adapt to the latest changes in meta-freescale-3rdparty layerMing Liu
The changes include: - Set PREFERRED_PROVIDER_u-boot-default-script to u-boot-distro-boot. - Drop MACHINE_BOOT_FILES, we dont have to maintain a extra variable. - Drop colibri-imx7-emmc.conf file, it's already in meta-freescale-3rdparty layer, move Toradex related definitions to colibri-imx7-emmc.inc file. - Drop u-boot-distro-boot from WKS_FILE_DEPENDS, to avoid multiple boot scripts in it. Signed-off-by: Ming Liu <ming.liu@toradex.com>
2020-03-28colibri-imx6ull: reset UBOOT_ENTRYPOINTMing Liu
This fixes a problem of tezi fitimage not boot issue. Related-to: TEI-498 Signed-off-by: Ming Liu <ming.liu@toradex.com> (cherry picked from commit 6eaffd7923d9f5905bbeb8db3cfc8071da993cbf) (cherry picked from commit aa92a5f987267f557aecf5d312fd7f99554a9515)
2020-03-28machines: colibri-imx8x: configure the kernel version for upstreamMax Krummenacher
React on the upstream override and then use a mainlinish kernel. Use the same kernel also for upstream-rt as we currently don't have a mainlinish rt flavour ready for i.MX8 X. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit f513116f29ee1533af9d51e72526acd3f00893d7)
2020-03-28colibri-imx7: keep old machine name as an aliasMax Krummenacher
The machine got renamed in meta-freescale-3rdparty to colibri-imx7-nand. To keep documentation and scripts working keep the old machine name as an alias of the new one. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-03-28layer.conf: follow changed meta-freescale-3rdparty nameMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-03-27layer.conf: add dunfell, drop warrior in compat layerMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-03-02machines: i.mx 8/8X/8MM: keep tune pinned to aarch64Max Krummenacher
meta-freescale started to set specialised tunes for the i.MX8 based machines. Override that in our machine specific files so that the user space packages all have the same ARCH 'aarch64' and need not be built for each CPU flavour individually. However change the tune include file so that one could change to one of the more speciallized tune if one wants to do so at the expense of additional compile time. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-13mainline machines: use our mainline forkMax Krummenacher
Move from the meta-freescale provided mainline kernel to the linux-toradex-mainline kernel. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-13verdin-imx8mm: use sdma firmware from linux-firmwareMax Krummenacher
Use the sdma firmware from the linux-firmware recipe. The firmware-imx recipe no longer provides it: meta-freescale commit 'abc7fdf4cefc firmware-imx: remove sdma-imx6q.bin and sdma-imx7d.bin' Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-13meta:mx8: add UBOOT_ENTRYPOINT and UBOOT_RD_LOADADDRESSMing Liu
Add UBOOT_ENTRYPOINT and UBOOT_RD_LOADADDRESS which are needed by fitimage. Signed-off-by: Ming Liu <ming.liu@toradex.com> (cherry picked from commit 3371f4972842fedb804d2a350e877ab51b5db6e6) (cherry picked from commit 64f948358c954682cec75b1e76ac66e0cb93c660)
2020-01-30meta: drop do_image_teziimg dependenciesMing Liu
That's already handled by WKS_FILE_DEPENDS, drop the redundant dependencies. Signed-off-by: Ming Liu <ming.liu@toradex.com>
2020-01-05colibri-imx6ull: fix use-mainline-bspMarcel Ziswiler
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2019-12-30verdin-imx8mm.conf: define serial consoleMax Krummenacher
Without this a getty on the non existing ttyS0 gets additionally started which then fails and gets continously restarted. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 271c46d3c0202a3cfde6d595d667a97a6b6b84ce)
2019-12-18colibri-imx7/-emmc: remove aster device tree when building upstreamStefan Agner
Currently we do not have device trees for the Aster Carrier board in upstream kernels. Remove them from the list of device trees when building mainline kernels. Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
2019-12-17verdin-imx8mm.conf: drop preferred versions for masterMax Krummenacher
The preferred versions for weston/wayland-protocols are correctly set in meta-freescale. Do not pin to an unavailable old version. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-12-16verdin: machine: use aarch64 tuneMax Krummenacher
Use the same tune for all i.MX8/8X/8MM members. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-12-03verdin-imx8mm.conf: add machine config fileMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-12-03machines: unify name and descriptionMing Liu
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Ming Liu <ming.liu@toradex.com>
2019-11-03apalis-imx8x.conf: drop some PREFERRED_PROVIDER/VERSIONMing Liu
They are already in meta-freescale layer, we could drop them. Signed-off-by: Ming Liu <ming.liu@toradex.com>
2019-11-03Revert "machine: apalis-imx8: use newer devicetree only for use-head-next"Philippe Schenker
This reverts commit e3e5aba1c725ad3ff4daf128ad525625923a653d.