projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
imx: ocotp: mxc add i.MX7D support
[oweals/u-boot.git]
/
drivers
/
core
/
root.c
diff --git
a/drivers/core/root.c
b/drivers/core/root.c
index 12d046051fdb3af8065adcd18d5bc017d6dc25b9..78ab00c7bfbf9e4d46cdf2c9e83e3cf2011d23e8 100644
(file)
--- a/
drivers/core/root.c
+++ b/
drivers/core/root.c
@@
-114,7
+114,7
@@
int dm_init(void)
ret = device_bind_by_name(NULL, false, &root_info, &DM_ROOT_NON_CONST);
if (ret)
return ret;
ret = device_bind_by_name(NULL, false, &root_info, &DM_ROOT_NON_CONST);
if (ret)
return ret;
-#if
def CONFIG_OF_CONTROL
+#if
CONFIG_IS_ENABLED(OF_CONTROL)
DM_ROOT_NON_CONST->of_offset = 0;
#endif
ret = device_probe(DM_ROOT_NON_CONST);
DM_ROOT_NON_CONST->of_offset = 0;
#endif
ret = device_probe(DM_ROOT_NON_CONST);
@@
-145,7
+145,7
@@
int dm_scan_platdata(bool pre_reloc_only)
return ret;
}
return ret;
}
-#if
def CONFIG_OF_CONTROL
+#if
CONFIG_IS_ENABLED(OF_CONTROL)
int dm_scan_fdt_node(struct udevice *parent, const void *blob, int offset,
bool pre_reloc_only)
{
int dm_scan_fdt_node(struct udevice *parent, const void *blob, int offset,
bool pre_reloc_only)
{
@@
-198,7
+198,7
@@
int dm_init_and_scan(bool pre_reloc_only)
return ret;
}
return ret;
}
- if (
OF_CONTROL
) {
+ if (
CONFIG_IS_ENABLED(OF_CONTROL)
) {
ret = dm_scan_fdt(gd->fdt_blob, pre_reloc_only);
if (ret) {
debug("dm_scan_fdt() failed: %d\n", ret);
ret = dm_scan_fdt(gd->fdt_blob, pre_reloc_only);
if (ret) {
debug("dm_scan_fdt() failed: %d\n", ret);