diff options
author | Simon Glass <sjg@chromium.org> | 2022-03-27 14:26:19 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-04-18 17:53:56 -0400 |
commit | 092d5c2a83b730844aeaa5ac300ddc7f13a75f49 (patch) | |
tree | a1eb7b69290ad103c95dc2688dfd227a1eaa45d3 | |
parent | 0c6be933ffeb991c1b9b70bce9cf9e9cdb92c9ed (diff) | |
download | u-boot-092d5c2a83b730844aeaa5ac300ddc7f13a75f49.zip u-boot-092d5c2a83b730844aeaa5ac300ddc7f13a75f49.tar.gz u-boot-092d5c2a83b730844aeaa5ac300ddc7f13a75f49.tar.bz2 |
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>
-rw-r--r-- | drivers/core/Makefile | 2 | ||||
-rw-r--r-- | drivers/core/device.c | 2 | ||||
-rw-r--r-- | include/dm/device-internal.h | 6 | ||||
-rw-r--r-- | include/dm/device.h | 2 | ||||
-rw-r--r-- | include/dm/devres.h | 4 | ||||
-rw-r--r-- | test/dm/Makefile | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/drivers/core/Makefile b/drivers/core/Makefile index 3742e75..7099073 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 1b356f1..b7ce854 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); diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h index e24b033..94844d3 100644 --- a/include/dm/device-internal.h +++ b/include/dm/device-internal.h @@ -397,7 +397,7 @@ fdt_addr_t simple_bus_translate(struct udevice *dev, fdt_addr_t addr); #define DM_UCLASS_ROOT_S_NON_CONST (((gd_t *)gd)->uclass_root_s) /* device resource management */ -#ifdef CONFIG_DEVRES +#if CONFIG_IS_ENABLED(DEVRES) /** * devres_release_probe - Release managed resources allocated after probing @@ -417,7 +417,7 @@ void devres_release_probe(struct udevice *dev); */ void devres_release_all(struct udevice *dev); -#else /* ! CONFIG_DEVRES */ +#else /* ! DEVRES */ static inline void devres_release_probe(struct udevice *dev) { @@ -427,7 +427,7 @@ static inline void devres_release_all(struct udevice *dev) { } -#endif /* ! CONFIG_DEVRES */ +#endif /* DEVRES */ static inline int device_notify(const struct udevice *dev, enum event_t type) { diff --git a/include/dm/device.h b/include/dm/device.h index cb52a09..3d8961f 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -184,7 +184,7 @@ struct udevice { #if CONFIG_IS_ENABLED(OF_REAL) ofnode node_; #endif -#ifdef CONFIG_DEVRES +#if CONFIG_IS_ENABLED(DEVRES) struct list_head devres_head; #endif #if CONFIG_IS_ENABLED(DM_DMA) diff --git a/include/dm/devres.h b/include/dm/devres.h index 0ab277e..697534a 100644 --- a/include/dm/devres.h +++ b/include/dm/devres.h @@ -30,7 +30,7 @@ struct devres_stats { int total_size; }; -#ifdef CONFIG_DEVRES +#if CONFIG_IS_ENABLED(DEVRES) #ifdef CONFIG_DEBUG_DEVRES void *__devres_alloc(dr_release_t release, size_t size, gfp_t gfp, @@ -207,7 +207,7 @@ void devm_kfree(struct udevice *dev, void *ptr); /* Get basic stats on allocations */ void devres_get_stats(const struct udevice *dev, struct devres_stats *stats); -#else /* ! CONFIG_DEVRES */ +#else /* ! DEVRES */ static inline void *devres_alloc(dr_release_t release, size_t size, gfp_t gfp) { diff --git a/test/dm/Makefile b/test/dm/Makefile index d46552f..9a1a904 100644 --- a/test/dm/Makefile +++ b/test/dm/Makefile @@ -32,7 +32,7 @@ obj-$(CONFIG_CLK) += clk.o clk_ccf.o obj-$(CONFIG_CPU) += cpu.o obj-$(CONFIG_CROS_EC) += cros_ec.o obj-$(CONFIG_PWM_CROS_EC) += cros_ec_pwm.o -obj-$(CONFIG_DEVRES) += devres.o +obj-$(CONFIG_$(SPL_TPL_)DEVRES) += devres.o obj-$(CONFIG_DMA) += dma.o obj-$(CONFIG_VIDEO_MIPI_DSI) += dsi_host.o obj-$(CONFIG_DM_DSA) += dsa.o |