Merge patch series "Bug-fixes for a few boards"

[J-u-boot.git] / common / Kconfig

diff --git a/common/Kconfig b/common/Kconfig
index 0283701f1d059fbca93bf11ddb8af0b77ac5f89b..83c81edac20f87e3c567e9c33cadc3e144bcb341 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -231,7 +231,7 @@ config PRE_CON_BUF_ADDR
        default 0x2f000000 if ARCH_SUNXI && MACH_SUN9I
        default 0x4f000000 if ARCH_SUNXI && !MACH_SUN9I
        default 0x0f000000 if ROCKCHIP_RK3288
-       default 0x0f200000 if ROCKCHIP_RK3399
+       default 0x0f200000 if ROCKCHIP_RK3399 || ROCKCHIP_RK3328
        help
          This sets the start address of the pre-console buffer. This must
          be in available memory and is accessed before relocation and
@@ -626,9 +626,18 @@ config CYCLIC
 
 if CYCLIC
 
+config SPL_CYCLIC
+       bool "General-purpose cyclic execution mechanism (SPL)"
+       help
+         This enables a general-purpose cyclic execution infrastructure in SPL,
+         to allow "small" (run-time wise) functions to be executed at
+         a specified frequency. Things like LED blinking or watchdog
+         triggering are examples for such tasks.
+
 config CYCLIC_MAX_CPU_TIME_US
        int "Sets the max allowed time for a cyclic function in us"
-       default 1000
+       default 100000 if SANDBOX  # sandbox video is quite slow
+       default 5000
        help
          The max allowed time for a cyclic function in us. If a functions
          takes longer than this duration this function will get unregistered