Merge tag 'v2024.01-rc3' into next

[u-boot.git] / drivers / core / Kconfig

diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig
index 4c5a00f6f9c293dcdcae92b649eabcc2030023a9..1081d61fcf0112d1fecd5d4fed62cfce2c4958f2 100644 (file)
--- a/drivers/core/Kconfig
+++ b/drivers/core/Kconfig
@@ -27,12 +27,12 @@ config TPL_DM
        help
          Enable driver model in TPL. You will need to provide a
          suitable malloc() implementation. If you are not using the
-         full malloc() enabled by CFG_SPL_SYS_MALLOC_START,
+         full malloc() enabled by CFG_TPL_SYS_MALLOC_START,
          consider using CONFIG_TPL_SYS_MALLOC_SIMPLE. In that case you
-         must provide CONFIG_SPL_SYS_MALLOC_F_LEN to set the size.
+         must provide CONFIG_TPL_SYS_MALLOC_F_LEN to set the size.
          In most cases driver model will only allocate a few uclasses
-         and devices in SPL, so 1KB should be enough. See
-         CONFIG_SPL_SYS_MALLOC_F_LEN for more details on how to enable it.
+         and devices in TPL, so 1KB should be enough. See
+         CONFIG_TPL_SYS_MALLOC_F_LEN for more details on how to enable it.
          Disable this for very small implementations.
 
 config VPL_DM
@@ -42,13 +42,12 @@ config VPL_DM
        help
          Enable driver model in VPL. You will need to provide a
          suitable malloc() implementation. If you are not using the
-         full malloc() enabled by CFG_SPL_SYS_MALLOC_START,
-         consider using CONFIG_SPL_SYS_MALLOC_SIMPLE.
+         full malloc() enabled by CFG_TPL_SYS_MALLOC_START,
+         consider using CONFIG_TPL_SYS_MALLOC_SIMPLE.
 
 config DM_WARN
        bool "Enable warnings in driver model"
        depends on DM
-       default y
        help
          Enable this to see warnings related to driver model.
 
@@ -88,7 +87,7 @@ config DM_STATS
 
 config SPL_DM_STATS
        bool "Collect and show driver model stats in SPL"
-       depends on DM_SPL
+       depends on SPL_DM
        help
          Enable this to collect and display memory statistics about driver
          model. This can help to figure out where all the memory is going and