diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-08-12 07:31:52 +0900 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-08-18 13:46:04 -0400 |
commit | 0a5804b53a3c71dc0c9c43e5c747015b6e50e9e1 (patch) | |
tree | 81a01f1f1fc7d34a1e1076c72e88d71874de42f7 /drivers/core/device.c | |
parent | e00e8b3989480fab08931cd80aacc7d1718b5a22 (diff) | |
download | u-boot-imx-0a5804b53a3c71dc0c9c43e5c747015b6e50e9e1.zip u-boot-imx-0a5804b53a3c71dc0c9c43e5c747015b6e50e9e1.tar.gz u-boot-imx-0a5804b53a3c71dc0c9c43e5c747015b6e50e9e1.tar.bz2 |
dm: drop CONFIG_DM_DEVICE_REMOVE from uncmd list
We do not want to compile the DM remove code for SPL. Currently,
we undef it in include/config_uncmd_spl.h (for C files) and in
scripts/Makefile.uncmd_spl (for Makefiles). This is really ugly.
This commit demonstrates how we can deprecate those two files.
Use $(SPL_) for the entry in the Makfile and CONFIG_IS_ENABLED()
in C files.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/core/device.c')
-rw-r--r-- | drivers/core/device.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c index bbe7a94..56b9081 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -140,7 +140,7 @@ int device_bind(struct udevice *parent, const struct driver *drv, return 0; fail_child_post_bind: - if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) { + if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) { if (drv->unbind && drv->unbind(dev)) { dm_warn("unbind() method failed on dev '%s' on error path\n", dev->name); @@ -148,14 +148,14 @@ fail_child_post_bind: } fail_bind: - if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) { + if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) { if (uclass_unbind_device(dev)) { dm_warn("Failed to unbind dev '%s' on error path\n", dev->name); } } fail_uclass_bind: - if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) { + if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) { list_del(&dev->sibling_node); if (dev->flags & DM_FLAG_ALLOC_PARENT_PDATA) { free(dev->parent_platdata); |