diff options
| author | Tom Rini <trini@konsulko.com> | 2023-02-01 09:31:17 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-02-01 09:31:17 -0500 |
| commit | 1e1cd8eb2d0c8e5b28b2dd6622ec9cbbd5eb61b8 (patch) | |
| tree | 8c4cec2656454d0049b047fee0a33d35c31e8127 /arch/arm/cpu | |
| parent | 3592a61fa8b4b55c0fab9a75bfb9ac3c73fdcbc0 (diff) | |
| parent | 4992d8360d83e0f9795abe5e54d75962e2fe3f48 (diff) | |
| download | u-boot-1e1cd8eb2d0c8e5b28b2dd6622ec9cbbd5eb61b8.zip u-boot-1e1cd8eb2d0c8e5b28b2dd6622ec9cbbd5eb61b8.tar.gz u-boot-1e1cd8eb2d0c8e5b28b2dd6622ec9cbbd5eb61b8.tar.bz2 | |
Merge tag 'fsl-qoriq-2023-2-1' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq
make QSPI clock selection optional during SoC init for ls102xa
Fix regulator name for ls2_sfp
Update NXP RCW github repo
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/armv7/ls102xa/Kconfig | 9 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/ls102xa/soc.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig index 0edcf4c..3e292bf 100644 --- a/arch/arm/cpu/armv7/ls102xa/Kconfig +++ b/arch/arm/cpu/armv7/ls102xa/Kconfig @@ -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 diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c b/arch/arm/cpu/armv7/ls102xa/soc.c index 1dafa3c..84d4ea3 100644 --- a/arch/arm/cpu/armv7/ls102xa/soc.c +++ b/arch/arm/cpu/armv7/ls102xa/soc.c @@ -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 |