da1f91422c
Of_unflatten_dtb returns a ERR_PTR value so checking it against NULL is incorrect. Fix it in all of the places where this was happening. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
61 lines
1.4 KiB
C
61 lines
1.4 KiB
C
/*
|
|
* Copyright (c) 2013 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2
|
|
* as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
*/
|
|
#include <common.h>
|
|
#include <init.h>
|
|
#include <of.h>
|
|
#include <asm/barebox-arm.h>
|
|
|
|
extern char __dtb_start[];
|
|
|
|
static int of_arm_init(void)
|
|
{
|
|
struct device_node *root;
|
|
void *fdt;
|
|
|
|
/* See if we already have a dtb */
|
|
root = of_get_root_node();
|
|
if (root)
|
|
return 0;
|
|
|
|
/* See if we are provided a dtb in boarddata */
|
|
fdt = barebox_arm_boot_dtb();
|
|
if (fdt)
|
|
pr_debug("using boarddata provided DTB\n");
|
|
|
|
/* Next see if we have a builtin dtb */
|
|
if (!fdt && IS_ENABLED(CONFIG_BUILTIN_DTB)) {
|
|
fdt = __dtb_start;
|
|
pr_debug("using internal DTB\n");
|
|
}
|
|
|
|
if (!fdt) {
|
|
pr_debug("No DTB found\n");
|
|
return 0;
|
|
}
|
|
|
|
root = of_unflatten_dtb(fdt);
|
|
if (!IS_ERR(root)) {
|
|
of_set_root_node(root);
|
|
of_fix_tree(root);
|
|
if (IS_ENABLED(CONFIG_OFDEVICE))
|
|
of_probe();
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
core_initcall(of_arm_init);
|