summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-10imx: mx6ull: fix REFTOP_VBGADJ settingDario Binacchi
[ Upstream commit c1af358cf51a85ed8c47fc576d3cae34196ec47f ] The previous code wrote the contents of the fuse as is in the REFTOP_VBGADJ[2:0], but this was wrong if you consider the contents of the table in the code comment. This table is also different from the table in the commit description. But then, which of the two is correct? If it is assumed that an unprogrammed fuse has a value of 0 then for backward compatibility of the code REFTOP_VBGADJ[2:0] must be set to 6 (b'110). Therefore, the table in the code comment can be considered correct as well as this patch. Fixes: 97c16dc8bf098 ("imx: mx6ull: update the REFTOP_VBGADJ setting") Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
2022-04-04apalis-tk1: fix tezi fit image configuration nameMax Krummenacher
The Toradex Easy Installer uses a fitimage for kernel/fdt/rootfs. With moving to the meta-toradex-bsp-common fitimage class to create the fitimage the configuration name is changed. For the Apalis TK1 used in recovery mode we set the configuration used in the U-Boot environment. Change that to the new name. Related-to: ELB-4417 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2022-04-04colibri_imx7: fix tezi fit image configuration nameMax Krummenacher
The Toradex Easy Installer uses a fitimage for kernel/fdt/rootfs. With moving to the meta-toradex-bsp-common fitimage class to create the fitimage the configuration name is changed. For the Colibri iMX7 with RawNAND we set the configuration used in the U-Boot environment. Change that to the new name. Related-to: ELB-4417 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2022-03-28gitlab-ci: fix u-boot-test-hooks to specific versionPhilippe Schenker
The latest master tests do no longer pass. So use the state from September 2020 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2022-03-28uboot-test-hooks: Switch to our GitLab instanceTom Rini
As Stephen is no longer actively maintaining the uboot-test-hooks repository, switch to using the instance on our GitLab. Acked-by: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Tom Rini <trini@konsulko.com> (cherry picked from commit 85ae52b9593894fa31d80d83d76bdb3b6432c4be)
2022-03-28gitlab-ci: update containerPhilippe Schenker
We got an error that triggered a rebuild of the container. Since it got updated to the one used also upstream by Oleksandr use this new one Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2022-02-14colibri-imx7: remove hard-coded variantMarcel Ziswiler
Remove hard-coded variant in the eMMC build case as since the following commit it will anyway always get overridden by the detection routing in board code. eee9c9f11383 ("board: colibri_imx7: Set variant variable also for non-emmc variants") Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2022-02-14board: colibri_imx7_emmc: fix emmc detectionMarcel Ziswiler
Later Colibri iMX7D V1.1B modules are using a “new” SoC fusing. The difference has to do with whether or not we do enable the boot ROM to enable/use the eMMC reset signal. Depending on that SoC fuse, the boot ROM configures this pin as a GPIO output to actually be able to do/drive the reset signal. Our eMMC vs. NAND detection so far only sets that signal to a GPIO but without explicitly setting any direction as, of course, so far, by default, it was an input. As the boot ROM now sets it as an output we do get back a value of zero instead of a one which would indicate the pull-up being present on eMMC modules. Fix this by setting the SION bit which allows reading back the value even if it is set to be an output by the boot ROM. Note that with the new SoC fusing we now read back what the boot ROM drived rather than the real value caused by the pull-up resistor. However, if it would ever be driven low the eMMC would anyway permanently be reset. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2021-12-28board: colibri-imx6ull: fix detecting ethernet phyPhilippe Schenker
now that it is possible to use regulator-fixed-clock make use of it. This makes U-Boot detect the PHY on first cold-boot. This commit also adjusts the code in setup_fec and follows how it is done in mx6ullevk.c This commit also slows down the boot-process by about 150ms as it now waits for the regulator-fixed-clock voltage that drives the PHY to go up. If you rely on very fast boot-speeds and don't need ethernet for your boot-process you can safely revert the changes on imx6ull-colibri.dtsi Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2021-12-28regulator: fixed: add possibility to enable by clockPhilippe Schenker
This commit adds the possibility to choose the compatible "regulator-fixed-clock" in devicetree. This is a special case of regulator-fixed where a clock has to be used to switch the regulator on and off. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2021-11-15configs: tdx: Do not overwrite fdtfile if it got set manuallyPhilippe Schenker
In case a customer wants to set fdtfile currently preboot overrides it always with preboot just before the bootdelay. Use test -n to check if fdtfile is already set and only set it if nothing got touched manually Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2021-11-12board: colibri-imx6ull: Do not leave variant variable unsetPhilippe Schenker
Toradex uses the variable variant to distinguish between modules with eMMC, NAND with wifi and NAND without wifi. This variable is set on every boot. Set this variable also if we have a NAND module without wifi to prevent issues. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2021-11-12board: colibri_imx7: Set variant variable also for non-emmc variantsPhilippe Schenker
Toradex uses the variable variant to distinguish between eMMC or NAND modules. This variable is set on every boot. Set this variable also if we have a NAND module to prevent issues. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2021-11-04apalis-tk1: avoid save environment unaskedDenys Drozdov
U-boot should never save the environment unasked. Avoid storing broken ftd_module to flash Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>
2021-11-04apalis-imx6: avoid save environment unaskedDenys Drozdov
u-boot should never save the environment unasked. Avoid storing broken ftd_file to eMMC Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>
2021-10-12colibri-imx6ull: fix setup of nand gpmi clockPhilippe Schenker
NXP used to setup the gpmi clock root from gpmi_clk in early versions in their downstream BSP. [1] However on mainline the gpmi clock root was always setup from enfc since the beginning of the i.MX 6 series SoCs, which is still the same today. [2] NXP followed the mainline approach at some point and changed setup_gpmi_io_clk to setup gpmi clock root from enfc which left faulty code behind in our board file. [3] This commit follows the change of NXP as it improves the performance of the NAND from ~1.2 MiB/s to ~12 MiB/s. [3] This change was verified to work in recovery-mode and u-boot loaded from NAND on all four Colibri iMX6ULL SKUs from Toradex. The frequency used to read the NAND, measured on RE# (Read Enable): before this patch: 1.4 MHz after this patch: 22 MHz in Linux Kernel: 50 MHz [1] https://source.codeaurora.org/external/imx/uboot-imx/tree/arch/arm/cpu/armv7/mx6/clock.c?h=nxp/imx_v2016.03_4.1.15_2.0.0_ga#n62 [2] 23608e23fd65 (i.mx: add the initial support for freescale i.MX6Q processor) [3] https://source.codeaurora.org/external/imx/uboot-imx/commit/?id=7a82a19ceabfb04bbc1591a67c99751748781c7d Related-to: ELB-4176 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2021-10-12colibri-imx7: remove vidargs for emmc variantDenys Drozdov
Default vidargs are set to 640x480@60 which causes incorrect lt161010 touchscreen resolution. eMMC variant should use overlays to select proper touchscreen timing and resolution Related-to: ELB-4191 Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>
2021-10-11colibri_imx7: tezi: move CONFIG_BOOTCOMMAND from header to defconfigMax Krummenacher
Completes / fixes commit cbc67000af2 ("colibri_imx7: move CONFIG_BOOTCOMMAND from header to defconfig"). Without this if U-Boot is configured with colibri_imx7_tezi_defconfig CONFIG_BOOTCOMMAND defaults to 'run distro_boot' which fails on this NAND module. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2021-10-11colibri-imx6ull: tezi: move CONFIG_BOOTCOMMAND from header to defconfigMax Krummenacher
Completes / fixes commit 1e9685556d2 ("colibri-imx6ull: move CONFIG_BOOTCOMMAND from header to defconfig"). Without this if U-Boot is configured with colibri-imx6ull_tezi_defconfig CONFIG_BOOTCOMMAND defaults to 'run distro_boot' which fails on this NAND module. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2021-10-05colibri-imx7: move CONFIG_BOOTCOMMAND from header to defconfigMing Liu
Move CONFIG_BOOTCOMMAND definition from colibri_imx7.h to colibri_imx7_defconfig, to be more flexible, for instance, it could be overridden by merge_config.sh script. Signed-off-by: Ming Liu <ming.liu@toradex.com>
2021-10-05colibri-imx6ull: move CONFIG_BOOTCOMMAND from header to defconfigMing Liu
Move CONFIG_BOOTCOMMAND definition from colibri-imx6ull.h to colibri-imx6ull_defconfig, to be more flexible, for instance, it could be overridden by merge_config.sh script. Signed-off-by: Ming Liu <ming.liu@toradex.com>
2021-09-21colibri-imx6ull: reset vidargs env variableMarcel Ziswiler
Unfortunately, vidargs cause very suboptimal display timings to be calculated which destroys our nice VESA VGA definition from the device tree. Get rid of it. Related-to: ELB-4080 Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2021-09-20ARM: dts: colibri-imx6ull: fix mac address passingFrancesco Dolcini
colibri-imx6ull ethernet device is fec2, while the optional secondary ethernet is fec1, update the ethernet aliases in the .dts file so that ethaddr is set to fec2 and eth1addr to fec1. Without this change the ethernet interfaces have a different mac address between Linux and U-Boot. Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
2021-09-10disk: part: add the device search failed log msgOleksii Bidnichenko
Add missing error message to blk_get_device_part_str. Related-to: ELB-4082 Signed-off-by: Oleksii Bidnichenko <oleksii.bidnichenko@toradex.com> (cherry picked from commit 866d51e3fde2771d0e83a6ea831b84a2cbc66fd1)
2021-09-10mmc: merge upstream __mmc_switch fixesOleksii Bidnichenko
commit 8e2b0af7216d78b60fccb46a107a4a047938aea9 upstream. commit ef5ab0d13a7a44469f6c765c8acc8d54c23213de upstream. Update a __mmc_switch MMC_STATUS_SWITCH_ERROR notification level from debug to error. Related-to: ELB-4082 Signed-off-by: Oleksii Bidnichenko <oleksii.bidnichenko@toradex.com> (cherry picked from commit 675f0f6db0de49316f839f6e9fcbc6f2a007b7d8)
2021-09-06cfgblock: extend get_cfgblock_interactiveOleksii Bidnichenko
- Correct the hardware product id for the Colibri IMX7D (eMMC) module. - Exclude IT check since Colibri IMX7D (eMMC) is always IT. Related-to: ELB-4076 Signed-off-by: Oleksii Bidnichenko <oleksii.bidnichenko@toradex.com>
2021-09-01colibri-imx7: improve env badblock managementFrancesco Dolcini
Use the complete 512kb (4 blocks) nand partition reserved for u-boot environment instead of just the first block, this allows the module to have a working environment even if 3 blocks are bad. Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
2021-09-01colibri-imx6ull: improve env badblock managementFrancesco Dolcini
Use the complete 512kb (4 blocks) nand partition reserved for u-boot environment instead of just the first block, this allows the module to have a working environment even if 3 blocks are bad. Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
2021-08-30colibri-imx6ull: reset vidargs env variableOleksii Bidnichenko
The "vidargs" variable is needed only if the board is not aware of the display that is connected to it. Since the EMMC version with the usage of overlays is able to specify display settings, such a variable becomes redundant. Related-to: ELB-4065
2021-08-20apalis-imx6: use dynamic DDR calibrationFrancesco Dolcini
Enable dynamic DDR calibration to have a reliable behavior on edge temperatures conditions. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
2021-08-20colibri-imx6: use dynamic DDR calibrationFrancesco Dolcini
Enable dynamic DDR calibration to have a reliable behavior on edge temperatures conditions. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
2021-08-12colibri-imx6ull: add tezi recovery configMax Krummenacher
This configuration creates an U-Boot which does not use any storage device, i.e. no eMMC or NAND. It is used to boot U-Boot over recovery aka. Serial Downloader without the need to know if the module uses eMMC or NAND for storage. It detects the storage device type and start the Toradex Easy Installer with the matching configuration. Note that for NAND devices the mtd partitioning is not patched into the device tree by U-Boot. It must be part of the provided device tree. Related-to: TEI-922 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2021-08-12colibri-imx6ull-emmc: add tezi configMax Krummenacher
This configuration creates an U-Boot which is installed on eMMC to then boot the Toradex Easy Installer. Related-to: TEI-922 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2021-07-29toradex: tdx-cfg-block: add colibri imx6ull emmc variantMax Krummenacher
While at it complete the list of the known module product ids. Related-to: ELB-4056, ELB-4057 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2021-07-29toradex: tdx-cfg-block: fix verdin handlingMax Krummenacher
| #if !defined(CONFIG_TARGET_VERDIN_IMX8MM) || !defined(CONFIG_TARGET_VERDIN_IMX8MN) is never false. Fix that so that the condition is 'true' for any board but the two verdins. Fixes commit c0c3978cba3 ("toradex: tdx-cfg-block: add Verdin iMX8M Mini/Nano support"). Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2021-07-29colibri-imx6ull: add emmc variantMax Krummenacher
Add code to build the eMMC variant of the Colibri iMX6ULL, i.e. the 'Colibri iMX6ULL 1GB' which has a eMMC instead of the raw NAND used on other SKUs. Related-to: ELB-4056, ELB-4057 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2021-07-28tools: imx image: fix write warningPeng Fan
Fix the warning by set the variable zero to uint64_t "warning: ‘write’ reading 5 bytes from a region of size 4" Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 16841a6a500766662f6e5d3c07ad1595c7deaceb)
2021-07-28buildman: 'Thread' object has no attribute 'isAlive'Heinrich Schuchardt
The isAlive() method was deprecated in Python 3.8 and has been removed in Python 3.9. See https://bugs.python.org/issue37804. Use is_alive() instead. Since Python 2.6 is_alive() has been a synonym for isAlive(). So there should be no problems for users using elder Python 3 versions. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Simon Glass <sjg@chromium.org> (cherry picked from commit fd434f47d4d008d41f4ee2fe5cb94791f780395c)
2021-07-28colibri-imx6ull: refresh defconfigMax Krummenacher
Use savedefconfig. The change does produce the same .config as before. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2021-07-28colibri-imx6ull: imximage.cfg: integrate new 1GiB RAM variantPhilippe Schenker
Integrate new Toradex SKU 0062 Colibri iMX6ULL 1GB IT. This commit basically adjusts three parameters of the RAM settings: Increase density from 4Gb to 8Gb Increase ROW address from 15 to 16 Increase tRFC (refresh command time) from 260 to 350 This timing is valid for all Toradex Colibri iMX6ULL SKUs Related-to: ELB-4055, ELB-4057 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
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>