summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-07-09colibri_vf: synchronize/improve memory optionsStefan Agner
Synchronize initramfs related configuration options and improve memory layout. The memory layout with an offset of 16MiB allows to boot bigger kernels. With AUTO_ZRELADDR, which is pretty much the standard nowadays, the kernel relacates itself to PC masked with 0xf8000000 plus a text offset of 0x8000 (hence 0x80008000 for Vybrid). With a 16MiB offset from the start of memory and a 16MiB distance to the device-tree, we allow kernel up to ~16MiB. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit c451702f146b4dffb10a5d76002e09d2e37315a9)
2021-06-24configs: tezi: use the same SYS_PROMPT style for all tezi ubootsPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2021-06-23toradex: use TEZI distro boot scriptMarcel Ziswiler
The distro boot script in TEZI image is called boot-tezi.scr. Enable using this particular script name for u-boot images which are used as a part of TEZI. Related-to: TEI-791 Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2021-06-15toradex: use TEZI distro boot scriptOleksandr Suvorov
The distro boot script in TEZI image names boot-tezi.scr. Enable using this particular name of script for u-boot images which are used as a part of TEZI. Related-to: TEI-791 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-06-14toradex: enable using another distro boot script for TEZIOleksandr Suvorov
The distro boot script for TEZI has another name to prevent u-boot of regular BSP trying to boot TEZI image. Expand the usage of TDX_EASY_INSTALLER Kconfig option to seek and use the TEZI-specific name of the script. Related-to: TEI-791 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-06-11configs: colibri_imx6ull_tezi_defconfig: add TDX_EASY_INSTALLERPhilippe Schenker
This config is needed that the correct ubiboot is selected Related-to: TEI-775 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2021-06-11configs: colibri_imx6ull: add ubiboot for easy installerPhilippe Schenker
Related-to: TEI-775 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2021-06-11configs: colibri_imx7*tezi*_defconfig: add TDX_EASY_INSTALLERPhilippe Schenker
This config is needed that the correct ubiboot is selected Related-to: TEI-775 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2021-06-11configs: colibri_imx7: add ubiboot for easy installerPhilippe Schenker
Related-to: TEI-775 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2021-06-11toradex: add easy installer configurabilityMarcel Ziswiler
Allow setting Toradex Easy Installer aka Tezi specific configuration options like not enabling SATA, directly continuing with the SDP command upon recovery, distrobooting otherwise or not storing the environment. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit 8b2f82e2aca52bac5b67fbeddccef2dd44f21444) Conflicts: board/toradex/common/Kconfig added it on the end of the file and reworded the Kconfig entry so it reflects what it is used for in this U-Boot. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2021-06-10mach-imx: Makefile: append 10k 0x00 at the end of u-boot-nand.imxPhilippe Schenker
Since NXPs 5.4. release zeros are needed at the end of the bootloader. Assume that never more than 10k of padding is needed and skip the shell magic to get a correct size. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2021-06-07Revert "colibri-imx6ull: empty default environment"Oleksandr Suvorov
This reverts commit 3e31ffee95704c1e23f0c109f6b0809e88bc4a39.
2021-06-07Revert "colibri-imx6: empty default environment"Oleksandr Suvorov
This reverts commit e0988b5e2b2dba58046c7b5d90a08b9e701bd0cf.
2021-06-07Revert "apalis-imx6: empty default environment"Oleksandr Suvorov
This reverts commit 1aabd391a32c1050407d0744bf9b0dc973da5dca.
2021-06-01apalis-tk1: launch toradex easy installer in usb recoveryMarcel Ziswiler
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2021-05-30colibri_imx6: add board_fit_config_name_match to support FIT in SPLMing Liu
Only one dtb is currently supported, so match with imx6-colibri. Related-to: TOR-1704 Signed-off-by: Ming Liu <ming.liu@toradex.com>
2021-05-28colibri_imx7_defconfig: add NAND configuration optionDenys Drozdov
Define CONFIG_TARGET_COLIBRI_IMX7_NAND for Colibri iMX7 NAND SoM Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>
2021-05-26colibri-imx7: full support of tezi-recovery imageOleksandr Suvorov
The recovery image needs to support both Colibri-iMX7 NAND and Colibri-iMX7 eMMC modules. Forward port the solution for this from u-boot 2016.11, originally developed by Stefan Agner <stefan.agner@toradex.com>. Related-to: TEI-775 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-26colibri-imx7: fix building tezi u-boot for nand moduleOleksandr Suvorov
Specify the particular target module as NAND to set required default values for the target. It also fixes the following warning and unblocks non-interactive building: ========== .config:167:warning: symbol value '' invalid for TDX_CFG_BLOCK_OFFSET ========== Related-to: TEI-775 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-26gitlab.ci: Workaround for u-boot buildingOleksandr Suvorov
Split building u-boot for Apalis and Colibri modules. It fixes the buildman stucking. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-25arm: dts: imx7: Fix error in coresight TPIU graph connectionIlko Iliev
OF graph endpoint connections must be bidirectional and dtc warn if they are not. i.MX7 based DTs have an error and generate warnings: arch/arm/dts/imx7d-sdb.dtb: Warning (graph_endpoint): /replicator/ports/port@0/endpoint: graph connection to node '/soc/tpiu@30087000/port/endpoint' is not bidirectional arch/arm/dts/imx7d-sdb.dtb: Warning (graph_endpoint): /soc/tpiu@30087000/port/endpoint: graph connection to node '/replicator/ports/port@1/endpoint' is not bidirectional Signed-off-by: Ilko Iliev <iliev@ronetix.at>
2021-05-25Makefile: fix making u-boot-nand.imxOleksandr Suvorov
The wrong dependency fails the building of colibri_vf. Fix the dependency of u-boot-nand.imx. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-20colibri-imx7: enable booting from USB SDPOleksandr Suvorov
For recovery version of u-boot the default source of booting should be the SDP over USB. Related-to: TEI-775 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-20colibri-imx7: enable target u-boot-nand.imxOleksandr Suvorov
Enable the target u-boot-nand.imx for the TEZI recovery defconfig. It needs to be enabled for all colibri-imx7 defconfigs due to current u-boot build flow. Related-to: TEI-775 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-20colibri-imx7: add configs for flashing imagesOleksandr Suvorov
Add configs for images, which should be flashed to NAND/eMMC as a part of the TEZI recovery image. Related-to: TEI-775 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-19board: colibri_vf: fix compiling warningOleksandr Suvorov
This patch fixes the following compiler warning: ============= board/toradex/colibri_vf/colibri_vf.c: In function 'ft_board_setup': board/toradex/colibri_vf/colibri_vf.c:436:6: warning: unused variable 'ret' [-Wunused-variable] ============= Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-18Makefile: add u-boot-nand.imx targetOleksandr Suvorov
NAND modules (Colibri Vybrid, iMX7, iMX6ULL) require the images with 1024 prepending bytes. Add the u-boot-nand.imx target which enables with CONFIG_IMX_NAND option. Related-to: TEI-775 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-17configs: arm32: add default value of rootpathOleksandr Suvorov
Variable rootpath is used by distroboot script as a default path to a rootfs on an NFS server. Set this variable properly for all aarch32 modules, which support a Distro Boot. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-12colibri-imx6ull: empty default environmentOleksandr Suvorov
Use the empty file as a source of default environment. It fixes the issue with merging default environment and environment from other configured media, say, eMMC. Related-to: TEI-775 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-12colibri-imx6: empty default environmentOleksandr Suvorov
Use the empty file as a source of default environment. It fixes the issue with merging default environment and environment from other configured media, say, eMMC. Related-to: TEI-775 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-12apalis-imx6: empty default environmentOleksandr Suvorov
Use the empty file as a source of default environment. It fixes the issue with merging default environment and environment from other configured media, say, eMMC. Related-to: TEI-775 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-12colibri-imx7: add defconfig for TEZIOleksandr Suvorov
Add the defconfig tuned to use in Toradex Easy Installer. Enable FASTBOOT options to support using uuu instead of imx_usb tool in advance. Disable using a config block for USB PID. Related-to: TEI-775 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-12colibri-imx6ull: add defconfig for TEZIOleksandr Suvorov
Add the defconfig tuned to use in Toradex Easy Installer. Enable FASTBOOT-related options to support the uuu instead of imx_usb tool in the future. Disable using a config block for USB PID. Related-to: TEI-775 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-12colibri-imx6: add defconfig for TEZIOleksandr Suvorov
Add the defconfig tuned to use in Toradex Easy Installer. Enable FASTBOOT options to support using uuu instead of imx_usb tool in advance. Disable using a config block for USB PID. Related-to: TEI-775 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-12apalis-imx6: add defconfig for TEZIOleksandr Suvorov
Add the defconfig tuned to use in Toradex Easy Installer. Enable FASTBOOT options to support using uuu instead of imx_usb tool in advance. Disable using a config block for USB PID. Related-to: TEI-775 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-12toradex: add empty environment fileOleksandr Suvorov
Add the file with an empty environment to use it in TEZI. Related-to: TEI-775 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-12gitlab-ci: replace docker image with upgradedOleksandr Suvorov
The solution to use empty default environment requires the docker CI image to include the xxd tool. Replace the docker image with another one with xxd. Related-to: TEI-775 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-12Makefile: fix generation of defaultenv.h from empty initial fileRasmus Villemoes
When CONFIG_USE_DEFAULT_ENV_FILE=y and the file CONFIG_DEFAULT_ENV_FILE is empty (or at least doesn't contain any non-comment, non-empty lines), we end up feeding nothing into xxd, which in turn then outputs nothing. Then blindly appending ", 0x00" means that we end up trying to compile (roughly) const char defaultenv[] = { , 0x00 } which is of course broken. To fix that, change the frobbing of the text file so that we always end up printing an extra empty line (which gets turned into that extra nul byte we need) - that corresponds better to the binary format consisting of a series of key=val nul terminated strings, terminated by an empty string. (cherry-picked from https://patchwork.ozlabs.org/project/uboot/patch/20210422074418.1573153-1-rasmus.villemoes@prevas.dk/) Reported-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-12toradex: make USB PID from config block optionalStefan Agner
If config block support is enabled, USB gadget modes unconditionally use Toradex Product ID as USB PID. Some applications might prefer a different and/or static USB PID. Add a Kconfig configuration option to descide whether to use USB PID from config block or the fallback config option CONFIG_G_DNL_PRODUCT_NUM. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Brandon Shibley <brandon.shibley@toradex.com> (cherry-picked from commit f72fe627c3e7a97008b8dd5d9ceb6df1dcd347ee) Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-05-12colibri_imx7: use SDP if USB serial downloader has been usedStefan Agner
In case USB serial downloader has been used to load U-Boot start the serial download protocol (SDP) emulation. This allows to download complete images such as Toradex Easy Installer over USB SDP as well. This code uses the boot ROM provided boot information to reliably detect USB serial downloader. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry-picked from a2e77a650a496e2be0b1630b874f531e9f394d47) Forward-ported to 2020.07: Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-04-01apalis_imx6: fix module revision in config blockDenys Drozdov
U-boot might display wrong module revision information for modules with an assembly version 'K'. "cfgblock create" does not takes into account all revision digits from PID8. This fix takes into account 6th,7th digits of PID8 to store module revision. Related-to: ELB-3893 Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>
2021-02-25configs: toradex: enable missing FIT optionsOleksandr Suvorov
Add missing support of FIT-images and enable a verbosity for this feature. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2021-02-19imx_bootaux: fix elf loadingMax Krummenacher
imx-bootaux loads an elf file linked for an auxilary core. Thus the loader function requires address translation from the auxilary core's address space to where those are mapped into U-Boot's address space. So the elf loader is specific and must not be replaced with a generic loader which doesn't provide the address translation functionality. Fixes commit 805b3cac1e0 ("lib: elf: Move the generic elf loading/validating functions to lib") Related-to: ELB-3520 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2021-02-17apalis/colibri_imx6: remove video= settingsOleksandr Suvorov
Since we have a full set of overlays for display interfaces for both Apalis iMX6Q and Colibri iMX6DL modules, the video= settings are obsolete. Remove these settings from the U-Boot. Related-to: ELB-3395, ELB-3243, ELB-3240 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-12-29include: colibri*imx6ull/imx7: add missing tdxargs variablePhilippe Schenker
All the other boards have tdxargs specified for setting manual kernel command-line arguments. Add them also to NAND-based boards. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-11-30apalis_imx6: fix vidargs settingsOleksandr Suvorov
The default mxcfb devices were changed in the Toradex Linux kernel. Make the appropriate change in vidargs u-boot env variable. Realted-to: ELB-3240 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-11-29colibri_imx6: adjust boot orderIgor Opaniuk
Remove duplicate of mmc0, set this boot order: 1) SD 2) eMMC 3) USB 4) DHCP boot Related-to: ELB-3041 Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-10-29distro_bootcmd: set devtype for dhcp bootIgor Opaniuk
Set $devtype for DHCP boot, which can be handy for the boot.scr for detection of devtype used (for example, when the same boot.scr is used for both mmc/dhcp boot): if test ${devtype} = "dhcp"; then ... fi Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-10-29toradex: drop legacy nfsboot scriptIgor Opaniuk
Drop legacy nfsboot script in favor of distroboot DHCP boot. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-10-29toradex: set default dhcp distroboot scriptnameIgor Opaniuk
Use the same name of DHCP Distroboot script as in regular eMMC case. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>