diff options
| author | Simon Glass <sjg@chromium.org> | 2022-03-27 23:26:19 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-04-19 00:53:56 +0300 |
| commit | 092d5c2a83b730844aeaa5ac300ddc7f13a75f49 (patch) | |
| tree | a1eb7b69290ad103c95dc2688dfd227a1eaa45d3 /drivers | |
| parent | 0c6be933ffeb991c1b9b70bce9cf9e9cdb92c9ed (diff) | |
| download | u-boot-092d5c2a83b730844aeaa5ac300ddc7f13a75f49.tar.xz | |
dm: core: Allow devres to be disabled in SPL
At present if devres is enabled in U-Boot proper it is enabled in SPL.
We don't normally want it there, so disable it.
Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Angus Ainslie <angus@akkea.ca>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/core/Makefile | 2 | ||||
| -rw-r--r-- | drivers/core/device.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/core/Makefile b/drivers/core/Makefile index 3742e75745..7099073a53 100644 --- a/drivers/core/Makefile +++ b/drivers/core/Makefile @@ -4,7 +4,7 @@ obj-y += device.o fdtaddr.o lists.o root.o uclass.o util.o tag.o obj-$(CONFIG_$(SPL_TPL_)ACPIGEN) += acpi.o -obj-$(CONFIG_DEVRES) += devres.o +obj-$(CONFIG_$(SPL_TPL_)DEVRES) += devres.o obj-$(CONFIG_$(SPL_)DM_DEVICE_REMOVE) += device-remove.o obj-$(CONFIG_$(SPL_)SIMPLE_BUS) += simple-bus.o obj-$(CONFIG_SIMPLE_PM_BUS) += simple-pm-bus.o diff --git a/drivers/core/device.c b/drivers/core/device.c index 1b356f12dd..b7ce854414 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -68,7 +68,7 @@ static int device_bind_common(struct udevice *parent, const struct driver *drv, INIT_LIST_HEAD(&dev->sibling_node); INIT_LIST_HEAD(&dev->child_head); INIT_LIST_HEAD(&dev->uclass_node); -#ifdef CONFIG_DEVRES +#if CONFIG_IS_ENABLED(DEVRES) INIT_LIST_HEAD(&dev->devres_head); #endif dev_set_plat(dev, plat); |