[PATCH v3 1/2] dm: core: Correct reference to DM_SPL in SPL_DM_STATS

This does not existing anymore. Update SPL_DM_STATS to use the correct Kconfig option, which is SPL_DM
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: - Split the patch into two
Changes in v2: - Add new patch to correct references to DM_SPL
drivers/core/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig index fe5c41d57ecd..209d90e01fa5 100644 --- a/drivers/core/Kconfig +++ b/drivers/core/Kconfig @@ -88,7 +88,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

The intent here is to only allow SPL_LEGACY_BLK if !SPL_DM - i.e. that when driver model is enabled in SPL, legacy block cannot be used.
However this combination is used by about 240 boards, so we cannot disallow it, at least not yet.
So just drop the condition.
Signed-off-by: Simon Glass sjg@chromium.org ---
(no changes since v1)
drivers/block/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index b897cf1a3d1b..6ad18889f61e 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -13,7 +13,7 @@ config BLK
config SPL_LEGACY_BLOCK bool # "Enable Legacy Block Device" - depends on SPL && !DM_SPL + depends on SPL default y if SPL_MMC || SPL_USB_STORAGE || SCSI || NVME || IDE default y if SPL_AHCI_PCI help

On Sun, Nov 12, 2023 at 01:03:47PM -0700, Simon Glass wrote:
The intent here is to only allow SPL_LEGACY_BLK if !SPL_DM - i.e. that when driver model is enabled in SPL, legacy block cannot be used.
However this combination is used by about 240 boards, so we cannot disallow it, at least not yet.
So just drop the condition.
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/next, thanks!

On Sun, Nov 12, 2023 at 01:03:46PM -0700, Simon Glass wrote:
This does not existing anymore. Update SPL_DM_STATS to use the correct Kconfig option, which is SPL_DM
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/next, thanks!
participants (2)
-
Simon Glass
-
Tom Rini