random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-19 10:24:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'fsl-qoriq-2023-2-1' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq

Browse Source 
make QSPI clock selection optional during SoC init for ls102xa
Fix regulator name for ls2_sfp
Update NXP RCW github repo
This commit is contained in:
Tom Rini 2023-02-01 09:31:17 -05:00
commit 1e1cd8eb2d
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/cpu/armv7/ls102xa/Kconfig
View File

@ -96,4 +96,13 @@ config SYS_FSL_HAS_CCI400
config SYS_FSL_ERRATUM_A008407
bool
config SYS_FSL_QSPI_SKIP_CLKSEL
bool "Skip setting QSPI clock during SoC init"
default 0
help
To improve startup times when booting from QSPI flash, the QSPI
frequency can be set very early in the boot process. If this option
is enabled, the QSPI frequency will not be changed by U-Boot during
SoC initialization.
endmenu

2
arch/arm/cpu/armv7/ls102xa/soc.c
View File

@ -170,7 +170,7 @@ int arch_soc_init(void)
enable_layerscape_ns_access();
#endif
#ifdef CONFIG_FSL_QSPI
#if defined(CONFIG_FSL_QSPI) && !defined(CONFIG_SYS_FSL_QSPI_SKIP_CLKSEL)
out_be32(&scfg->qspi_cfg, SCFG_QSPI_CLKSEL);
#endif

2
board/freescale/ls1021atsn/README.rst
View File

@ -50,7 +50,7 @@ To compile and flash an SD card image::
For the QSPI flash, first obtain the Reset Configuration Word binary for
bootimg from the QSPI flash from the rcw project
(https://source.codeaurora.org/external/qoriq/qoriq-components/rcw)::
(https://github.com/nxp-qoriq/rcw)::
make -j 8 && sudo cp ls1021atsn/SSR_PNS_30/rcw_1200_qspiboot.bin.swapped /srv/tftpboot/

2
drivers/misc/ls2_sfp.c
View File

@ -229,7 +229,7 @@ static int ls2_sfp_probe(struct udevice *dev)
return -EINVAL;
}
ret = device_get_supply_regulator(dev, "ta-sfp-prog", &priv->supply);
ret = device_get_supply_regulator(dev, "ta-sfp-prog-supply", &priv->supply);
if (ret && ret != -ENODEV && ret != -ENOSYS) {
dev_dbg(dev, "problem getting supply (err %d)\n", ret);
return ret;