Merge tag 'v2024.01-rc3' into next

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

diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig
index c9bf5de4332be1f2a00d38cdd7e5c0391331081a..1081d61fcf0112d1fecd5d4fed62cfce2c4958f2 100644 (file)
--- a/drivers/core/Kconfig
+++ b/drivers/core/Kconfig
@@ -1,7 +1,7 @@
 menu "Generic Driver Options"
 
 config DM
-       bool "Enable Driver Model"
+       def_bool y
        help
          This config option enables Driver Model. This brings in the core
          support, including scanning of platform data on start-up. If
@@ -14,7 +14,7 @@ config SPL_DM
        help
          Enable driver model in SPL. You will need to provide a
          suitable malloc() implementation. If you are not using the
-         full malloc() enabled by CONFIG_SYS_SPL_MALLOC_START,
+         full malloc() enabled by CFG_SPL_SYS_MALLOC_START,
          consider using CONFIG_SPL_SYS_MALLOC_SIMPLE. In that case you
          must provide CONFIG_SPL_SYS_MALLOC_F_LEN to set the size.
          In most cases driver model will only allocate a few uclasses
@@ -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 CONFIG_SYS_SPL_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 CONFIG_SYS_SPL_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
@@ -109,13 +108,14 @@ config DM_DEVICE_REMOVE
          causes USB host controllers to not be stopped when booting the OS.
 
 config DM_EVENT
-       bool "Support events with driver model"
-       depends on DM && EVENT
-       default y if SANDBOX
+       bool
+       depends on DM
+       select EVENT
        help
          This enables support for generating events related to driver model
          operations, such as prbing or removing a device. Subsystems can
-         register a 'spy' function that is called when the event occurs.
+         register a 'spy' function that is called when the event occurs. Such
+         subsystems must select this option.
 
 config SPL_DM_DEVICE_REMOVE
        bool "Support device removal in SPL"
@@ -300,6 +300,13 @@ config SPL_SIMPLE_BUS
          Supports the 'simple-bus' driver, which is used on some systems
          in SPL.
 
+config TPL_SIMPLE_BUS
+       bool "Support simple-bus driver in TPL"
+       depends on TPL_DM && TPL_OF_CONTROL
+       help
+         Supports the 'simple-bus' driver, which is used on some systems
+         in TPL.
+
 config SIMPLE_BUS_CORRECT_RANGE
        bool "Decode the 'simple-bus' <range> by honoring the #address-cells and #size-cells"
        depends on SIMPLE_BUS
@@ -350,6 +357,20 @@ config SPL_OF_TRANSLATE
          used for the address translation. This function is faster and
          smaller in size than fdt_translate_address().
 
+config TPL_OF_TRANSLATE
+       bool "Translate addresses using fdt_translate_address in TPL"
+       depends on TPL_DM && TPL_OF_CONTROL
+       help
+         If this option is enabled, the reg property will be translated
+         using the fdt_translate_address() function. This is necessary
+         on some platforms (e.g. MVEBU) using complex "ranges"
+         properties in many nodes. As this translation is not handled
+         correctly in the default simple_bus_translate() function.
+
+         If this option is not enabled, simple_bus_translate() will be
+         used for the address translation. This function is faster and
+         smaller in size than fdt_translate_address()
+
 config VPL_OF_TRANSLATE
        bool "Translate addresses using fdt_translate_address in SPL"
        depends on SPL_DM && VPL_OF_CONTROL
@@ -426,6 +447,7 @@ config OFNODE_MULTI_TREE_MAX
 
 config ACPIGEN
        bool "Support ACPI table generation in driver model"
+       depends on ACPI
        default y if SANDBOX || (GENERATE_ACPI_TABLE && !QEMU)
        select LIB_UUID
        help