diff options
| -rw-r--r-- | include/fdtdec.h | 9 | ||||
| -rw-r--r-- | lib/fdtdec.c | 26 |
2 files changed, 13 insertions, 22 deletions
diff --git a/include/fdtdec.h b/include/fdtdec.h index 12355afd7f..aa61a0fca1 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -555,15 +555,6 @@ uint64_t fdtdec_get_uint64(const void *blob, int node, const char *prop_name, int fdtdec_get_is_enabled(const void *blob, int node); /** - * Make sure we have a valid fdt available to control U-Boot. - * - * If not, a message is printed to the console if the console is ready. - * - * Return: 0 if all ok, -1 if not - */ -int fdtdec_prepare_fdt(void); - -/** * Checks that we have a valid fdt available to control U-Boot. * However, if not then for the moment nothing is done, since this function diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 64c5b3da15..6388bb8b89 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -586,24 +586,12 @@ int fdtdec_get_chosen_node(const void *blob, const char *name) return fdt_path_offset(blob, prop); } -int fdtdec_check_fdt(void) -{ - /* - * We must have an FDT, but we cannot panic() yet since the console - * is not ready. So for now, just assert(). Boards which need an early - * FDT (prior to console ready) will need to make their own - * arrangements and do their own checks. - */ - assert(!fdtdec_prepare_fdt()); - return 0; -} - /* * This function is a little odd in that it accesses global data. At some * point if the architecture board.c files merge this will make more sense. * Even now, it is common code. */ -int fdtdec_prepare_fdt(void) +static int fdtdec_prepare_fdt(void) { if (!gd->fdt_blob || ((uintptr_t)gd->fdt_blob & 3) || fdt_check_header(gd->fdt_blob)) { @@ -625,6 +613,18 @@ int fdtdec_prepare_fdt(void) return 0; } +int fdtdec_check_fdt(void) +{ + /* + * We must have an FDT, but we cannot panic() yet since the console + * is not ready. So for now, just assert(). Boards which need an early + * FDT (prior to console ready) will need to make their own + * arrangements and do their own checks. + */ + assert(!fdtdec_prepare_fdt()); + return 0; +} + int fdtdec_lookup_phandle(const void *blob, int node, const char *prop_name) { const u32 *phandle; |