aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-03-30net: dwc_eth_qos: Drop bogus return after gotoMarek Vasut
The return is never triggered due to the goto just above it. Drop it. No functional change. Reviewed-by: Ramon Fried <rfried.dev@gmail.com> Signed-off-by: Marek Vasut <marex@denx.de>
2023-03-30net: Pull board_interface_eth_init() into common codeMarek Vasut
Move the board_interface_eth_init() into common ethernet uclass code, since this function could be shared by multiple drivers. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Marek Vasut <marex@denx.de>
2023-03-30clk: imx8mp: Add EQoS MAC clockMarek Vasut
Add clock for the DWMAC EQoS block. This is used among other things to configure the MII clock via DM CLK. Acked-by: Sean Anderson <seanga2@gmail.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> Signed-off-by: Marek Vasut <marex@denx.de>
2023-03-30Revert "imx: imx8x: colibri: switch to binman"Andrejs Cainikovs
This reverts commit bdadc140a127b14a666d2007eddc3f65c8de7d5a. We do not want this, see [1]. [1] https://lore.kernel.org/all/56cf058164f331ce99ce75b0751b825ee2e07fc0.camel@toradex.com/ Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
2023-03-30colibri-imx8x: set bootdelayMarcel Ziswiler
Set the boot delay to one second. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
2023-03-30colibri-imx8x: set bootaux memory base and sizeAndrejs Cainikovs
Move i.MX auxiliary core memory base and size configuration to defconfig where it should belong. Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
2023-03-30colibri-imx8x: update env memory layoutMarcel Ziswiler
Update the distro config env memory layout for the Colibri iMX8X: - kernel_comp_addr_r=0xb0000000 temporary area for uncompressing (ie FIT images or Image.gz booted using booti) - kernel_comp_size=0x08000000 - loadaddr=0x95400000 avoiding any reserved areas located before that - fdt_addr_r = loadaddr + 128MB - allows for 128MB kernel - scriptaddr = fdt_addr_r + 512KB - allows for 512KB fdt - ramdisk_addr_r = scriptaddr + 512KB - allows for 512KB script Idea of memory layout taken from commit a9f1e35bedc4 ("apalis-imx8: update env memory layout"). Note that for our regular BSP Layers and Reference Images for Yocto Project an updated distro boot script is required (see meta-toradex-bsp-common/recipes-bsp/u-boot/u-boot-distro-boot). Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
2023-03-30colibri-imx8x: switch from fatload to loadAndrejs Cainikovs
Make sure M4 binary loading works equally well on ext4 as well as fat file systems. Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
2023-03-30colibri-imx8x: drop obsolete environment variablesAndrejs Cainikovs
Drop obsolete environment variables boot_file, bootcmd_mfg, fdt_addr, finduuid, image, mfgtool_args, mmcargs, mmcdev, mmcpart, panel, sec_boot, vidargs. Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
2023-03-30colibri-imx8x: construct fdtfile dynamicallyAndrejs Cainikovs
The following expression is used to construct the device tree name: fdtfile=${soc}-colibri-${fdt_board}.dtb - soc is set dynamically (either imx8qxp or imx8dx) - fdt_board can be modified by the user (eval-v3, aster, iris/iris-v2) Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
2023-03-30defconfig: colibri-imx8x: enable CONFIG_OF_SYSTEM_SETUPPhilippe Schenker
Enable a call to ft_system_setup() which reserves M4 memory region. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
2023-03-30colibri-imx8x: enable fuse commandAndrejs Cainikovs
This command is required for initial SoC provisioning. Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
2023-03-30colibri-imx8x: enable environment bootcount limitMarcel Ziswiler
Enable optional environment bootcount limit functionality. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
2023-03-30colibri-imx8x: provide proper CONFIG_SYS_PROMPTIgor Opaniuk
Provide proper sys prompt, which should be "Colibri iMX8X #". Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com> Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
2023-03-30colibri-imx8x: extract is_imx8dx() from ram detectionMax Krummenacher
Refactor the detection of QXP vs. DX SoC into its own helper function. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
2023-03-30colibri-imx8x: update update_uboot confirmation messageMarcel Ziswiler
Update update_uboot confirmation message. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
2023-03-30colibri-imx8x: remove obsolete sdhc related config definesMarcel Ziswiler
Remove obsolete SDHC related config defines. Nowadays, all SDHC related hardware configuration comes from the device tree. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
2023-03-30colibri-imx8x: remove obsolete net usb startMarcel Ziswiler
Remove obsolete net USB start. While at it also add a comment about enabling distro-boot. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
2023-03-30colibri-imx8x: Remove baudrate from console argumentPhilippe Schenker
This commit does remove the options argument from the console kernel-argument as it prevents the serial driver from outputting anything. Do this by switchting to use the variable "setup" as it is done on other Toradex modules. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
2023-03-30board: colibri-imx8x: add 2nd ethernet addressAndrejs Cainikovs
All Colibri iMX8X variants have 2nd RGMII on SoC, so add the address for 2nd ethernet. Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
2023-03-30ARM: dts: imx: Add support for DH electronics i.MX8M Plus DHCOM on PDK3Marek Vasut
Add support for DH electronics i.MX8M Plus DHCOM SoM on PDK3 carrier board. Currently supported are serial console, EQoS and FEC ethernets, eMMC, SD, SPI NOR and USB 3.0 host. Signed-off-by: Marek Vasut <marex@denx.de>
2023-03-30mx51evk: Remove unused mx51evk_video.c fileFabio Estevam
Since commit 1fa43cad8625 ("video: Drop references to CONFIG_VIDEO et al") the mx51evk_video.c is no longer used. Remove the unused file. Signed-off-by: Fabio Estevam <festevam@denx.de>
2023-03-30mx53loco: Remove unused mx53loco_video.c fileFabio Estevam
Since commit 1fa43cad8625 ("video: Drop references to CONFIG_VIDEO et al") the mx53loco_video.c is no longer used. Remove the unused file. Signed-off-by: Fabio Estevam <festevam@denx.de>
2023-03-30ARM: imx: Include on-SoM microSD in list of i.MX6 DHCOM boot devicesMarek Vasut
Add mmc1, which is mapped to optional on-SoM microSD socket, to the list of distro boot command boot devices. Signed-off-by: Marek Vasut <marex@denx.de> Reviewed-by: Fabio Estevam <festevam@denx.de>
2023-03-30ARM: imx: Convert DH i.MX6 DHSOM to DM_SERIALMarek Vasut
Enable CONFIG_DM_SERIAL on DH i.MX6 DHSOM to convert it to DM serial . Signed-off-by: Marek Vasut <marex@denx.de> Reviewed-by: Fabio Estevam <festevam@denx.de>
2023-03-30configs: remove gwventana_gw5904_defconfigTim Harvey
Now that the gwventana_emmc_defconfig is the same as the gwventana_gw5904_defconfig we can remove the latter. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
2023-03-30configs: gwventana_emmc_defconfig: add MV88E61XX DSA switch supportTim Harvey
The MV88E61XX switch is used on the GW5904 which is an eMMC based board. Adding it here allows us to remove the gwventana_gw5904_defconfig. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
2023-03-30misc: imx: remove DM dependency for ocotp driver in SPLJean-Marie Lemetayer
The ocotp driver is available for regular and SPL builds using the (SPL_)MXC_OCOTP configuration. Also, the ocotp driver does not support the driver model (DM) configuration. But, for SPL builds, the SPL_MXC_OCOTP configuration depends on SPL_MISC which implies on SPL_DM. This commit replaces the dependency on SPL_MISC with SPL_DRIVERS_MISC. So the only requirement is to have enabled miscellaneous drivers for the SPL. Signed-off-by: Jean-Marie Lemetayer <j.lemetayer@kerlink.fr>
2023-03-30arm64: dts: imx8mp: Do not delete PHY nodes on i.MX8MP DHCOM PDK2Marek Vasut
The PHY nodes may be activated via DTO in case another SoM variant is populated into the development kit. Do not delete the nodes. Signed-off-by: Marek Vasut <marex@denx.de>
2023-03-30arm64: dts: imx8mp: Add FEC RMII pin mux on i.MX8MP DHCOMMarek Vasut
The i.MX8MP DHCOM SoM may come with either external RGMII PHY or LAN8740Ai RMII PHY on the SoM attached to FEC MAC. Add pin mux settings for both options, so that DT overlay can override these settings on SoM variant with the LAN8740Ai PHY. Signed-off-by: Marek Vasut <marex@denx.de>
2023-03-30arm64: dts: imx8mp: Add EQoS RMII pin mux on i.MX8MP DHCOMMarek Vasut
The i.MX8MP DHCOM SoM may come with either KSZ9131RNXI RGMII PHY or LAN8740Ai RMII PHY on the SoM attached to EQoS MAC. Add pin mux settings for both options, so that DT overlay can override these settings on SoM variant with the LAN8740Ai PHY. Signed-off-by: Marek Vasut <marex@denx.de>
2023-03-30arm64: dts: imx8mp: Adjust EQoS PHY address on i.MX8MP DHCOMMarek Vasut
The current variant of the SoM has LAN8740Ai PHY connected to EQoS strapped to MDIO address 0 , adjust the MDIO address to match the hardware. Signed-off-by: Marek Vasut <marex@denx.de>
2023-03-30arm64: imx8mp: Auto-detect PHY on i.MX8MP DHCOMMarek Vasut
The i.MX8MP DHCOM SoM may be populated with either KSZ9131RNXI RGMII PHY or LAN8740Ai RMII PHY attached to EQoS MAC, and either external RGMII PHY or LAN8740Ai RMII PHY attached to FEC MAC. The SoM configuration can be detected for each MAC by reading RX_CTL pull resistor state early on boot. Make use of this, detect the exact PHY configuration, and patch control DT accordingly so that the ethernet is configured correctly in U-Boot. Signed-off-by: Marek Vasut <marex@denx.de>
2023-03-30ARM: imx: Add 2 GiB DRAM support for DH electronics i.MX8M Plus DHCOMMarek Vasut
The DH electronics i.MX8M Plus DHCOM SoM currently supports only 4 GiB of DRAM population option. Add another population option with 2 GiB of DRAM. The chips used on the 2 GiB option are 2x K4F6E3S4HM-MGCJ . Signed-off-by: Marek Vasut <marex@denx.de>
2023-03-30ARM: imx: Enable LTO for DH electronics i.MX8M Plus DHCOMMarek Vasut
Enable LTO to reduce the size of SPL, which with multiple DRAM calibration tables may be close to the limit. Signed-off-by: Marek Vasut <marex@denx.de>
2023-03-30configs: colibri-imx7: Fix bad block table in flash configurationStefan Eichenberger
Make sure that the bad block table in flash is used on Colibri iMX7. Without this configuration enabled U-Boot corrupts the bad block table and Linux will update the table on each reboot. The corruption occurs because if CONFIG_SYS_NAND_USE_FLASH_BBT is not set, U-boot will store bad blocks out of band, while the Linux driver for the iMX7 will store them in band in a bad block table. Fixes: fd8c1fc9430 ("arm: dts: imx7: colibri: add raw NAND support") Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com> Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com> Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com> Reviewed-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2023-03-30doc: sl-mx8mm: Fix mistake in merge conflict resolutionFrieder Schrempf
There was a conflict between the following two commits, that wasn't resolved correctly. Fix this. a93985ddfcc3 ("doc: sl-mx8mm: Update the NXP TF-A source reference") f0f461287eff ("imx: Suggest the NXP ATF github repo") Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de> Cc: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Cc: Fabio Estevam <festevam@denx.de> Cc: Stefano Babic <sbabic@denx.de> Reviewed-by: Fabio Estevam <festevam@denx.de>
2023-03-30arm: mvebu: Define all options for AXP BOOT_FROM_* macrosPali Rohár
Definitions are according to the MV78460 Hardware Specifications. Signed-off-by: Pali Rohár <pali@kernel.org> Tested-by: Tony Dinh <mibodhi@gmail.com> Tested-by: Martin Rowe <martin.p.rowe@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
2023-03-30arm: mvebu: Define all BOOTROM_ERR_MODE_* macrosPali Rohár
A385 BootROM fills into bits [31:28] of register 0x182d0 tracing value, which represents in which state BootROM currently is. BootROM fills one of the possible values: 0x2 (CPU initialization), 0x3 (UART detection), 0x6 (UART booting), 0x8 (PCI Express booting), 0x9 (parallel or SPI NOR booting), 0xA (parallel or SPI NAND booting), 0xB (SATA booting) and 0xE (SD / eMMC booting). Meaning of these values matches TRACE_* macros from Marvell soc_spec.h file: https://github.com/MarvellEmbeddedProcessors/u-boot-marvell/blob/u-boot-2013.01-armada-18.06/tools/marvell/doimage_mv/soc_spec.h Signed-off-by: Pali Rohár <pali@kernel.org> Tested-by: Tony Dinh <mibodhi@gmail.com> Tested-by: Martin Rowe <martin.p.rowe@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
2023-03-30arm: mvebu: Define all options for A38x BOOT_FROM_* macrosPali Rohár
Disassembling A385 BootROM binary reveal how BootROM interprets strapping pins for Boot Device Mode. All possible options are: 0x00..0x07 -> Parallel NOR 0x08..0x15 -> Parallel NAND 0x16..0x17 -> Parallel NOR 0x18..0x25 -> Parallel NAND 0x26..0x27 -> SPI NAND 0x28..0x29 -> UART xmodem 0x2a..0x2b -> SATA 0x2c..0x2d -> PCI Express 0x2e..0x2f -> Parallel NOR 0x30..0x31 -> SD / eMMC 0x32..0x39 -> SPI NOR 0x3a..0x3c -> Parallel NOR 0x3d..0x3e -> UART debug console 0x3f -> Invalid Note that Boot Device Mode Options in A38x Hardware Specifications is incomplete. Signed-off-by: Pali Rohár <pali@kernel.org> Tested-by: Tony Dinh <mibodhi@gmail.com> Tested-by: Martin Rowe <martin.p.rowe@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
2023-03-30arm: mvebu: Convert BOOT_FROM_* constants to function macrosPali Rohár
This allows to merge BOOT_FROM_MMC and BOOT_FROM_MMC_ALT constants to one macro. And also allows to extend other BOOT_FROM_* macros for other variants. Signed-off-by: Pali Rohár <pali@kernel.org> Tested-by: Tony Dinh <mibodhi@gmail.com> Tested-by: Martin Rowe <martin.p.rowe@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
2023-03-30arm: mvebu: Remove A38x BOOT_FROM_SATA 0x22 constantPali Rohár
A385 BootROM treats strapping configuration 0x22 as SPI-NAND. So remove incorrect definition 0x22 as SATA. SATA on A385 has configuration 0x2A. Signed-off-by: Pali Rohár <pali@kernel.org> Tested-by: Tony Dinh <mibodhi@gmail.com> Tested-by: Martin Rowe <martin.p.rowe@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
2023-03-30arm: mvebu: Remove A38x BOOT_FROM_UART_ALT 0x3f constantPali Rohár
A385 BootROM treats strapping configuration 0x3f as invalid. When booting fails (e.g. because of invalid configuration) then BootROM fallbacks to UART booting. Detecting BootROM fallback to UART booting is implemented in U-Boot since commit 2fd4284051e3 ("ARM: mach-mvebu: handle fall-back to UART boot"). So there is no need to define BOOT_FROM_UART_ALT constant and special handling for it anymore, remove it. This change effectively revers commit f3a88e2ca17a ("arm: mvebu: fix boot from UART on ClearFog Base"). Signed-off-by: Pali Rohár <pali@kernel.org> Tested-by: Tony Dinh <mibodhi@gmail.com> Tested-by: Martin Rowe <martin.p.rowe@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
2023-03-30arm: mvebu: Cleanup get_boot_device() codePali Rohár
Show correct information in debug() output and use correct names for variables. No functional change. Signed-off-by: Pali Rohár <pali@kernel.org> Reviewed-by: Stefan Roese <sr@denx.de>
2023-03-30arm: mvebu: clearfog: Detect MMC vs SDHC and fixup fdtMartin Rowe
[upstream of vendor commit 19a96f7c40a8fc1d0a6546ac2418d966e5840a99] The Clearfog devices have only one SDHC device. This is either eMMC if it is populated on the SOM or SDHC if not. The Linux device tree assumes the SDHC case. Detect if the device is an eMMC and fixup the device-tree so it will be detected by Linux. Ported from vendor repo at https://github.com/SolidRun/u-boot Signed-off-by: Martin Rowe <martin.p.rowe@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
2023-03-30arm: mvebu: clearfog: Add defconfig for SPI bootingMartin Rowe
This new clearfog_spi_defconfig file is a copy of existing clearfog_defconfig file modified to instruct build system to generate final kwbimage for SPI booting and to store the environment in SPI. Signed-off-by: Martin Rowe <martin.p.rowe@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
2023-03-30arm: mvebu: clearfog: Fix MMC detectionMartin Rowe
A388 Clearfog MMC is either SD Card or eMMC with different behaviour for both. Setting the device to non-removable in the u-boot.dtsi allows both to correctly detect the device. Signed-off-by: Martin Rowe <martin.p.rowe@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
2023-03-29Merge branch '2023-03-29-assorted-platform-updates' into nextTom Rini
- Assorted TI, Apple M1, and mpc83xx improvements / cleanups.
2023-03-30board: gateworks: venice: enable XWAY PHY supportTim Harvey
Enable XWAY PHY driver and remove board specific config from board_phy_config weak override. Signed-off-by: Tim Harvey <tharvey@gateworks.com> Reviewed-by: Fabio Estevam <festevam@denx.de>
2023-03-30power: pmic: Add NXP PCA9451A PMIC supportYe Li
PCA9451A uses similar BUCKs and LDO regulators as PCA9450B/C but has LDO2 and LDO3 removed. So reuse pca9450 PMIC and regulator driver and add new type for PCA9451A. Signed-off-by: Ye Li <ye.li@nxp.com> Reviewed-by: Marek Vasut <marex@denx.de>