mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-28 23:50:26 +09:00
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>
This commit is contained in:
parent
e00e8b3989
commit
0a5804b53a
@ -9,7 +9,7 @@ obj-$(CONFIG_DEVRES) += devres.o
|
|||||||
ifndef CONFIG_SPL_BUILD
|
ifndef CONFIG_SPL_BUILD
|
||||||
obj-$(CONFIG_OF_CONTROL) += simple-bus.o
|
obj-$(CONFIG_OF_CONTROL) += simple-bus.o
|
||||||
endif
|
endif
|
||||||
obj-$(CONFIG_DM_DEVICE_REMOVE) += device-remove.o
|
obj-$(CONFIG_$(SPL_)DM_DEVICE_REMOVE) += device-remove.o
|
||||||
obj-$(CONFIG_DM) += dump.o
|
obj-$(CONFIG_DM) += dump.o
|
||||||
obj-$(CONFIG_REGMAP) += regmap.o
|
obj-$(CONFIG_REGMAP) += regmap.o
|
||||||
obj-$(CONFIG_SYSCON) += syscon-uclass.o
|
obj-$(CONFIG_SYSCON) += syscon-uclass.o
|
||||||
|
@ -140,7 +140,7 @@ int device_bind(struct udevice *parent, const struct driver *drv,
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
fail_child_post_bind:
|
fail_child_post_bind:
|
||||||
if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
|
if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) {
|
||||||
if (drv->unbind && drv->unbind(dev)) {
|
if (drv->unbind && drv->unbind(dev)) {
|
||||||
dm_warn("unbind() method failed on dev '%s' on error path\n",
|
dm_warn("unbind() method failed on dev '%s' on error path\n",
|
||||||
dev->name);
|
dev->name);
|
||||||
@ -148,14 +148,14 @@ fail_child_post_bind:
|
|||||||
}
|
}
|
||||||
|
|
||||||
fail_bind:
|
fail_bind:
|
||||||
if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
|
if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) {
|
||||||
if (uclass_unbind_device(dev)) {
|
if (uclass_unbind_device(dev)) {
|
||||||
dm_warn("Failed to unbind dev '%s' on error path\n",
|
dm_warn("Failed to unbind dev '%s' on error path\n",
|
||||||
dev->name);
|
dev->name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fail_uclass_bind:
|
fail_uclass_bind:
|
||||||
if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
|
if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) {
|
||||||
list_del(&dev->sibling_node);
|
list_del(&dev->sibling_node);
|
||||||
if (dev->flags & DM_FLAG_ALLOC_PARENT_PDATA) {
|
if (dev->flags & DM_FLAG_ALLOC_PARENT_PDATA) {
|
||||||
free(dev->parent_platdata);
|
free(dev->parent_platdata);
|
||||||
|
@ -435,7 +435,7 @@ err:
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_DM_DEVICE_REMOVE
|
#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
|
||||||
int uclass_unbind_device(struct udevice *dev)
|
int uclass_unbind_device(struct udevice *dev)
|
||||||
{
|
{
|
||||||
struct uclass *uc;
|
struct uclass *uc;
|
||||||
@ -515,7 +515,7 @@ int uclass_post_probe_device(struct udevice *dev)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_DM_DEVICE_REMOVE
|
#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
|
||||||
int uclass_pre_remove_device(struct udevice *dev)
|
int uclass_pre_remove_device(struct udevice *dev)
|
||||||
{
|
{
|
||||||
struct uclass_driver *uc_drv;
|
struct uclass_driver *uc_drv;
|
||||||
|
@ -32,7 +32,6 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#undef CONFIG_DM_WARN
|
#undef CONFIG_DM_WARN
|
||||||
#undef CONFIG_DM_DEVICE_REMOVE
|
|
||||||
#undef CONFIG_DM_SEQ_ALIAS
|
#undef CONFIG_DM_SEQ_ALIAS
|
||||||
#undef CONFIG_DM_STDIO
|
#undef CONFIG_DM_STDIO
|
||||||
|
|
||||||
|
@ -87,7 +87,7 @@ int device_probe_child(struct udevice *dev, void *parent_priv);
|
|||||||
* @dev: Pointer to device to remove
|
* @dev: Pointer to device to remove
|
||||||
* @return 0 if OK, -ve on error (an error here is normally a very bad thing)
|
* @return 0 if OK, -ve on error (an error here is normally a very bad thing)
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_DM_DEVICE_REMOVE
|
#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
|
||||||
int device_remove(struct udevice *dev);
|
int device_remove(struct udevice *dev);
|
||||||
#else
|
#else
|
||||||
static inline int device_remove(struct udevice *dev) { return 0; }
|
static inline int device_remove(struct udevice *dev) { return 0; }
|
||||||
@ -101,7 +101,7 @@ static inline int device_remove(struct udevice *dev) { return 0; }
|
|||||||
* @dev: Pointer to device to unbind
|
* @dev: Pointer to device to unbind
|
||||||
* @return 0 if OK, -ve on error
|
* @return 0 if OK, -ve on error
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_DM_DEVICE_REMOVE
|
#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
|
||||||
int device_unbind(struct udevice *dev);
|
int device_unbind(struct udevice *dev);
|
||||||
#else
|
#else
|
||||||
static inline int device_unbind(struct udevice *dev) { return 0; }
|
static inline int device_unbind(struct udevice *dev) { return 0; }
|
||||||
@ -112,7 +112,7 @@ static inline int device_unbind(struct udevice *dev) { return 0; }
|
|||||||
* @dev: The device whose children are to be removed
|
* @dev: The device whose children are to be removed
|
||||||
* @return 0 on success, -ve on error
|
* @return 0 on success, -ve on error
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_DM_DEVICE_REMOVE
|
#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
|
||||||
int device_remove_children(struct udevice *dev);
|
int device_remove_children(struct udevice *dev);
|
||||||
#else
|
#else
|
||||||
static inline int device_remove_children(struct udevice *dev) { return 0; }
|
static inline int device_remove_children(struct udevice *dev) { return 0; }
|
||||||
@ -127,13 +127,13 @@ static inline int device_remove_children(struct udevice *dev) { return 0; }
|
|||||||
* @dev: The device that is to be stripped of its children
|
* @dev: The device that is to be stripped of its children
|
||||||
* @return 0 on success, -ve on error
|
* @return 0 on success, -ve on error
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_DM_DEVICE_REMOVE
|
#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
|
||||||
int device_unbind_children(struct udevice *dev);
|
int device_unbind_children(struct udevice *dev);
|
||||||
#else
|
#else
|
||||||
static inline int device_unbind_children(struct udevice *dev) { return 0; }
|
static inline int device_unbind_children(struct udevice *dev) { return 0; }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_DM_DEVICE_REMOVE
|
#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
|
||||||
void device_free(struct udevice *dev);
|
void device_free(struct udevice *dev);
|
||||||
#else
|
#else
|
||||||
static inline void device_free(struct udevice *dev) {}
|
static inline void device_free(struct udevice *dev) {}
|
||||||
|
@ -116,7 +116,7 @@ int uclass_bind_device(struct udevice *dev);
|
|||||||
* @dev: Pointer to the device
|
* @dev: Pointer to the device
|
||||||
* #return 0 on success, -ve on error
|
* #return 0 on success, -ve on error
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_DM_DEVICE_REMOVE
|
#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
|
||||||
int uclass_unbind_device(struct udevice *dev);
|
int uclass_unbind_device(struct udevice *dev);
|
||||||
#else
|
#else
|
||||||
static inline int uclass_unbind_device(struct udevice *dev) { return 0; }
|
static inline int uclass_unbind_device(struct udevice *dev) { return 0; }
|
||||||
@ -153,7 +153,7 @@ int uclass_post_probe_device(struct udevice *dev);
|
|||||||
* @dev: Pointer to the device
|
* @dev: Pointer to the device
|
||||||
* #return 0 on success, -ve on error
|
* #return 0 on success, -ve on error
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_DM_DEVICE_REMOVE
|
#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
|
||||||
int uclass_pre_remove_device(struct udevice *dev);
|
int uclass_pre_remove_device(struct udevice *dev);
|
||||||
#else
|
#else
|
||||||
static inline int uclass_pre_remove_device(struct udevice *dev) { return 0; }
|
static inline int uclass_pre_remove_device(struct udevice *dev) { return 0; }
|
||||||
|
@ -15,6 +15,4 @@ CONFIG_DM_SPI=
|
|||||||
CONFIG_DM_SPI_FLASH=
|
CONFIG_DM_SPI_FLASH=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CONFIG_DM_DEVICE_REMOVE=
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user