summaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2021-12-27 17:20:21 -0500
committerTom Rini <[email protected]>2021-12-27 17:20:21 -0500
commit111a8b57354bb5aff55635502a0cdf74cb63e835 (patch)
treecbdb6857df2ae710e4cf3f7103195d39b6e3fd54 /boot
parentbc0abd80b3c2d395a0245d4e1ce4f8f445f79cde (diff)
parent5e2fd60b97b3a67a9bbcfe8910b59b2b44d1c9a0 (diff)
Merge branch '2021-12-27-CONFIG-migrations' into next
- Merge a large number of CONFIG migration patches. Most of these are taking existing migrations and re-running them. A few of these needed additional minor conversions done first, so that more complex dependencies could be expressed. In the end we now have CI jobs to ensure that no migrated symbols are used in board config header files.
Diffstat (limited to 'boot')
-rw-r--r--boot/Kconfig27
1 files changed, 25 insertions, 2 deletions
diff --git a/boot/Kconfig b/boot/Kconfig
index d3a12be2281..f1ce576ab2f 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -358,11 +358,27 @@ config SYS_TEXT_BASE
help
The address in memory that U-Boot will be running from, initially.
+config DYNAMIC_SYS_CLK_FREQ
+ bool "Determine CPU clock frequency at run-time"
+ help
+ Implement a get_board_sys_clk function that will determine the CPU
+ clock frequency at run time, rather than define it statically.
+
config SYS_CLK_FREQ
- depends on ARC || ARCH_SUNXI || MPC83xx
+ depends on !DYNAMIC_SYS_CLK_FREQ
int "CPU clock frequency"
+ default 125000000 if ARCH_LS1012A
+ default 100000000 if ARCH_P2020 || ARCH_T1024 || ARCH_T1042 || \
+ ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3
+ default 66666666 if ARCH_P1010 || ARCH_P1020 || ARCH_T4240
+ default 66660000 if ARCH_T2080
+ default 33333333 if RCAR_GEN3
+ default 24000000 if ARCH_EXYNOS
+ default 20000000 if RCAR_GEN2
+ default 0
help
- TODO: Move CONFIG_SYS_CLK_FREQ for all the architecture
+ A static value for the CPU frequency. Note that if not required
+ for a given SoC, this can be left at 0.
config ARCH_FIXUP_FDT_MEMORY
bool "Enable arch_fixup_memory_banks() call"
@@ -762,6 +778,13 @@ config SD_BOOT
booted via SD/EMMC. This is not a must, some SoCs need this,
some not.
+config SD_BOOT_QSPI
+ bool "Support for booting from SD/EMMC and enable QSPI"
+ help
+ Enabling this will make a U-Boot binary that is capable of being
+ booted via SD/EMMC while enabling QSPI on the platform as well. This
+ is not a must, some SoCs need this, some not.
+
config SPI_BOOT
bool "Support for booting from SPI flash"
help