diff options
| author | Tom Rini <trini@ti.com> | 2014-06-20 20:03:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-06-20 20:03:51 -0400 |
| commit | 39b6d07fd7e692736cdb05a000b1c84ab43de4fb (patch) | |
| tree | 72b3530f77de13dab378b5be9789edd952bc9e03 /drivers/core/root.c | |
| parent | 45f0ad9545578b4436fdf04ba25a10173bcb75ef (diff) | |
| parent | 22ec136325fdfc805b1e48e5ac8e17f23b4e9fc6 (diff) | |
| download | u-boot-imx-39b6d07fd7e692736cdb05a000b1c84ab43de4fb.zip u-boot-imx-39b6d07fd7e692736cdb05a000b1c84ab43de4fb.tar.gz u-boot-imx-39b6d07fd7e692736cdb05a000b1c84ab43de4fb.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/core/root.c')
| -rw-r--r-- | drivers/core/root.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/core/root.c b/drivers/core/root.c index 4977875..1cbb096 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -10,6 +10,7 @@ #include <common.h> #include <errno.h> #include <malloc.h> +#include <libfdt.h> #include <dm/device.h> #include <dm/device-internal.h> #include <dm/lists.h> @@ -42,9 +43,9 @@ int dm_init(void) dm_warn("Virtual root driver already exists!\n"); return -EINVAL; } - INIT_LIST_HEAD(&gd->uclass_root); + INIT_LIST_HEAD(&DM_UCLASS_ROOT_NON_CONST); - ret = device_bind_by_name(NULL, &root_info, &gd->dm_root); + ret = device_bind_by_name(NULL, &root_info, &DM_ROOT_NON_CONST); if (ret) return ret; @@ -55,7 +56,7 @@ int dm_scan_platdata(void) { int ret; - ret = lists_bind_drivers(gd->dm_root); + ret = lists_bind_drivers(DM_ROOT_NON_CONST); if (ret == -ENOENT) { dm_warn("Some drivers were not found\n"); ret = 0; |