Commit Graph

25 Commits

Author SHA1 Message Date
Khem Raj
4ac3c7265a layer: Convert to new override syntax
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-08-09 10:31:27 -07:00
Fabio Berton
bd4e85fc05 apalis-imx6: Use strong assignment to set IMX_DEFAULT_BOOTLOADER
The weak assignment doesn't override the default imx-base.inc value, and
as the only bootloader provider is u-boot-toradex, we don't need to
allow override.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
2021-04-16 14:15:35 -03:00
Otavio Salvador
fba28a52c4 apalis-imx6: Set IMX_DEFAULT_BOOTLOADER to u-boot-toradex
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2021-04-13 00:08:46 -03:00
Fabio Berton
83bb649465 apalis-imx6: Use linux-toradex only for NXP BSP
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
2020-05-11 16:25:08 -03:00
Otavio Salvador
8d9defa57f Rename virtual/bootscript to u-boot-default-script
After discussing this in OE-Core we are renaming it so it follows same
naming pattern as u-boot-default-env.

Fixes: 80be160 (u-boot-script-toradex: Set virtual/bootscript as provider)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2020-03-31 17:53:37 -03:00
Fabio Berton
80be160184 u-boot-script-toradex: Set virtual/bootscript as provider
Add virtual/bootscript to PROVIDES variable to make easier to use other
boot script just changing PREFERRED_PROVIDER_virtual/bootscript variable.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
2020-03-31 10:50:39 -03:00
Fabio Berton
79d845df0d u-boot-script-toradex: Rework to use boot.scr-${MACHINE}
Rework recipe changing do_mkimage task, adding a do_install task and
changing do_deploy to output boot.scr file using machine name appended.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
2020-03-31 10:50:39 -03:00
Max Krummenacher
efd834fa3c toradex machines: deploy boot script
With U-Boot 2019.07 booting from block devices is implemented with distro_bootcmd
needing an U-Boot script boot.cmd/scr.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-03-30 09:20:07 -03:00
Stefan Agner
0b03d2fdc1 apalis-imx6: build all device trees available upstream
At least since 4.14 all device trees are available in upsteram Linux
as well so drop the unnecessary use-mainline-bsp override.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
2019-09-20 10:40:30 -03:00
Ming Liu
9a96fb93f1 meta: change "+=" to "_append" for use-mainline-bsp overrides
The "KERNEL_DEVICETREE_use-mainline-bsp +=" would override any other
assignment like:
- "KERNEL_DEVICETREE +="
- "KERNEL_DEVICETREE ="
- "KERNEL_DEVICETREE ?="
- "KERNEL_DEVICETREE ??="

change it to "_append" could fix the problem.

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
2019-09-16 07:41:46 -03:00
Ming Liu
58c1ce8b43 u-boot-toradex-fw-utils: add new recipe
I observed a following build issue:
| ***
| *** Can't find default configuration "arch/../configs/colibri_imx7_emmc_defconfig"!
| ***
| scripts/kconfig/Makefile:128: recipe for target 'colibri_imx7_emmc_defconfig' failed

it's due to the colibri_imx7_emmc_defconfig does not exist in the
source, because u-boot-toradex and u-boot-fw-utils are not built from
same source. so the toradex machine specific uboot configs do not
present in the default u-boot-fw-utils source.

To fix it, a new u-boot-toradex-fw-utils recipe is added, it uses the
same source with u-boot-toradex, some common code is split out to
u-boot-toradex.inc, to be shared by both u-boot-toradex and
u-boot-toradex-fw-utils.

And we need set PREFERRED_PROVIDER and PREFERRED_RPROVIDER in machine
configs to u-boot-toradex-fw-utils.

Some files derive from u-boot-toradex-fw-utils recipe of:
git://git.toradex.com/meta-toradex-nxp.git

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-12-13 07:17:10 -02:00
Max Krummenacher
ccd17aa400 apalis/colibri-imx6.conf: remove inactive SERIAL_CONSOLE assignment
imx-base.inc unconditionally sets SERIAL_CONSOLE to ttymxc0.
So assigning with ?= here to the same value does nothing and may
confuse if someone wants to assign to a different UART.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2018-07-18 13:16:30 -03:00
Max Krummenacher
eb4cc5937f apalis/colibri machines: update RDEPENDS to match kernel naming
The kernel class now sets RDEPENDS_${KERNEL_PACKAGE_NAME}-base, follow this in
the config files, otherwise bitbake emits a warning and the kernel isn't
removed.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2018-07-18 13:16:30 -03:00
Max Krummenacher
e345432a34 u-boot-toradex: update to latest git
This updates to latest git which among others adds the new configurations
for Colibri iMX6ULL and moves to use a zImage kernel.

Change machine config to use zImage.

Also use 'older' 1.4.5 DTC which does not conflict with the fdt headers
used in U-boot.

The following commits since b121c6ab (minux non NXP related stuff):
eb660075db colibri-imx6ull: set module variant depending on config block
24db10ece3 tdx-cfg-block: simplify i.MX 6 module detection
bfe8950834 tdx-cfg-block: add support for new Colibri iMX6ULL SKUs
017ec39780 colibri_imx7_emmc: add fatwrite support
b5cc69a7e8 colibri-vf: use leveling evaluated by DDR validation tools
e2d5257acd colibri-vf: adjust timing according to data sheet
63d856627d ARM: vf610: ddrmc: do not write CR79 by default
743e081f34 ARM: vf610: ddrmc: fix CR138 preprocessor define
2881fc12d9 ARM: vf610: fix initialization completion detection
3ad050d4e4 arm: vf610: add UART2 pinmux/clock support
cd3e271cc5 colibri-imx6: added nreset gpio on reboot
addb87df8d cmd: ubi: print load size after establishing volume size
d507d86f8f cmd: set filesize variable in ubi read
9b02ad9e5d colibri-imx6ull: fix card detect GPIO of SD card
8890602daf colibri-imx6ull: Set the DDR RAM ASR bit
4c96a4f64d tdx-cfg-block: fix off by one issue
087e95a2dc colibri_t20: fix passing mac address via dt
a1c2045034 colibri_t20: integrate mtd partitions via dt
0940b3480a tools/env: allow equal sign as key value separation
0a9da66891 apalis/colibri_imx6: remove white space after string end
8a98158f8b script: Make the get_default_envs.sh script working with newest u-boot
d58b8057a7 colibri_vf_defconfig: enable MTD partitions via dt
04c6b570f7 arm: dts: imx7: add UART2/UART3
2fbebc49b5 apalis/colibri: switch to zimage
189e6ea804 tdx-cfg-block: add new SKUs
f05c11cd42 imx: initialize and use generic timer on i.MX 6UL/ULL
88b1209ca9 imx: introduce CONFIG_GPT_TIMER
e7a9e5a76b imx: move CONFIG_SYSCOUNTER_TIMER to Kconfig
393811db8e colibri-imx6ull: add MTD fixup compatible for mainline kernels
307a465108 colibri_imx7: do not mux SODIMM 169 as NAND chip select
30a1208727 apalis/colibri: disable undefined instruction events in user debug
980e216a8a colibri_imx6ull: add sensible default DFU configuration
af4cb91695 apalis/colibri: enable user debug by default
52259cf22a apalis: unify configs
48efc7c6be toradex apalis/colibri: set version variable for all modules
abec6c5697 colibri_imx6ull: add dtb for wifi variant
5e54aedd1c colibri_imx6ull.c: remove dead code
284ac523dd imx: imx6ull: correct get_cpu_speed_grade_hz
8d3bb7ea49 MLK-14839-2 imx: clean up print info for thermal and reset cause
1d4ece729e MLK-14839-1 mx6: Fix wrong CPU frequency
e2215315d9 envtools: make sure version/timestamp header file are available
19177c390e tools: env: allow to print U-Boot version

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2018-07-18 13:16:29 -03:00
Fabio Berton
3094682971 apalis-imx6: Remove imx-base.inc duplicate code
IMAGE_FSTYPES = "wic.gz" is already set in imx-base.inc

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-02-28 13:36:04 -03:00
Fabio Berton
6cdec74938 Remove --no-fstab-update option from WIC_CREATE_EXTRA_ARG for all machines
WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update" was add to imx-base.inc
and we can remove from all machines that includes imx-base.inc file.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2018-02-28 13:36:01 -03:00
Stefan Agner
fcc529237f apalis-imx6.conf: remove Apalis iMX6 V1.0 module support
Remove Apalis iMX6 V1.0 device trees. Newer kernel versions will
no longer provide device trees for those early sample devices.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2017-12-19 14:31:12 -02:00
Max Krummenacher
c0036cd746 apalis-imx6.conf: add a wic image in favour of sdcard image
The wic image can be used to boot kernel/dtb/rootfs from an SD card.
U-Boot gets booted from the on module eMMC, the image from the prepared
SD card can be started with 'run sdboot'.

zcat XXX.rootfs.wic.gz | dd of=/dev/sdX bs=1M

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2017-11-08 14:16:02 -02:00
Max Krummenacher
bbc134ef5d apalis-imx6.conf: add device trees for ixora and use-mainline-bsp
Add a device tree for the Ixora carrier board.

Add the device tree available in mainline for use with the
use-mainline-bsp override.

While at it unify the @SOC description variable with other boards.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2017-11-08 14:16:02 -02:00
Max Krummenacher
e1e53bf544 apalis-imx6.conf: do not deploy the kernel in the rootfs
The kernel is taken from a separate fat partition in the regular
boot process, so there is no need to deploy it in the rootfs.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2017-11-08 14:16:02 -02:00
Max Krummenacher
b5f9ee90d8 apalis-imx6.conf: build a spl based u-boot
U-Boot is now used with SPL, set the machine conf file accordingly.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2017-11-08 14:16:02 -02:00
Otavio Salvador
007b928155 Convert SOC_FAMILY to MACHINEOVERRIDES
The SOC_FAMILY is an indirection which makes the understanding, from
OpenEmbedded versed developers and users, more difficult. Instead of
using the SOC_FAMILY indirection which is rarely used, we now move to
the MACHINEOVERRIDES mechanism as this is in fact what is in use.

This change is done to align with the meta-fsl-arm BSP.

Change-Id: I81fc8b615db6c20a29d266fa68d17c3dd4de3a10
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2016-09-08 11:18:23 -03:00
Max Krummenacher
73dab3af46 toradex machine conf: build sdcard and tar.bz2 image
This helps deploying the images:

- The U-Boot booting from on module mass storage is able to directly boot the
  sdcard image.

- The tar.bz2 rootfs can easily be used to update on module mass storage.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2016-07-22 10:55:28 -03:00
Brandon Shibley
de2eb544d8 apalis-imx6.conf: change some assignments to soft default
Changed some machine variable assignments in apalis-imx6.conf
from hard assignments to soft defaults so they may be overridden
by user configuration (e.g. conf/local.conf).

Signed-off-by: Brandon Shibley <brandon.shibley@toradex.com>
2016-03-24 08:00:28 -03:00
Max Krummenacher
893ad6b25b apalis-imx6: add machine configuration
The Toradex Apalis iMX6 computer module is based on i.MX 6.

The Apalis iMX6 is a member of the pincompatible Apalis family.

They feature on module RAM and EMMC, Ethernet PHY, Resistive Touch
Controller and Audio Codec.

For additional specifications please visit:
https://www.toradex.com/computer-on-modules/apalis-arm-family/freescale-imx-6

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2015-12-04 13:03:42 -02:00