diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-14 12:46:52 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-14 12:46:52 +0200 |
| commit | bee1da7fcc005edab18fde60fd2ce956d12c5e18 (patch) | |
| tree | 77d02747d657192acb10500f979b83e20d0447a3 /arch/riscv | |
| parent | c29ce8d93f9403c3ce6ccc5e82fb7a7be41d6659 (diff) | |
| parent | 765ecaf52b834278a2449fcb097754a3aae9aa96 (diff) | |
| download | barebox-bee1da7fcc005edab18fde60fd2ce956d12c5e18.tar.gz barebox-bee1da7fcc005edab18fde60fd2ce956d12c5e18.tar.xz | |
Merge branch 'for-next/sandbox' into master
Diffstat (limited to 'arch/riscv')
| -rw-r--r-- | arch/riscv/boot/dtb.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/riscv/boot/dtb.c b/arch/riscv/boot/dtb.c index 5d73413a43..b9b68fc7f2 100644 --- a/arch/riscv/boot/dtb.c +++ b/arch/riscv/boot/dtb.c @@ -18,19 +18,7 @@ extern char __dtb_start[]; static int of_riscv_init(void) { - struct device_node *root; - - root = of_get_root_node(); - if (root) - return 0; - - root = of_unflatten_dtb(__dtb_start); - if (!IS_ERR(root)) { - pr_debug("using internal DTB\n"); - of_set_root_node(root); - if (IS_ENABLED(CONFIG_OFDEVICE)) - of_probe(); - } + barebox_register_fdt(__dtb_start); return 0; } |