summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Van Baren <vanbaren@cideas.com>2007-04-06 14:17:14 -0400
committerGerald Van Baren <vanbaren@cideas.com>2007-04-06 14:17:14 -0400
commit6679f9299534e488a171a9bb8f9bb891de247aab (patch)
tree54a46588f754667b0bc23eed590df587922d298d
parent25b0806fff1f1fd24f69f6d9ef04d8345667e60b (diff)
downloadu-boot-imx-6679f9299534e488a171a9bb8f9bb891de247aab.zip
u-boot-imx-6679f9299534e488a171a9bb8f9bb891de247aab.tar.gz
u-boot-imx-6679f9299534e488a171a9bb8f9bb891de247aab.tar.bz2
libfdt: Make fdt_check_header() public
Changed _fdt_check_header() to fdt_check_header() and made it part of the interface - it is a useful routine. Also did some asthetics cleanup to the include files (headers).
-rw-r--r--include/fdt.h19
-rw-r--r--include/libfdt.h7
-rw-r--r--include/libfdt_env.h20
-rw-r--r--libfdt/fdt.c4
-rw-r--r--libfdt/fdt_ro.c4
-rw-r--r--libfdt/fdt_rw.c2
6 files changed, 49 insertions, 7 deletions
diff --git a/include/fdt.h b/include/fdt.h
index 48ccfd9..3dd3aca 100644
--- a/include/fdt.h
+++ b/include/fdt.h
@@ -1,3 +1,22 @@
+/*
+ * libfdt - Flat Device Tree manipulation
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
#ifndef _FDT_H
#define _FDT_H
diff --git a/include/libfdt.h b/include/libfdt.h
index a0b4d55..61f56ec 100644
--- a/include/libfdt.h
+++ b/include/libfdt.h
@@ -1,5 +1,3 @@
-#ifndef _LIBFDT_H
-#define _LIBFDT_H
/*
* libfdt - Flat Device Tree manipulation
* Copyright (C) 2006 David Gibson, IBM Corporation.
@@ -19,6 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef _LIBFDT_H
+#define _LIBFDT_H
+
#include <fdt.h>
#include <libfdt_env.h>
@@ -60,6 +61,8 @@
#define fdt_set_header(fdt, field, val) \
((struct fdt_header *)(fdt))->field = cpu_to_fdt32(val)
+int fdt_check_header(const void *fdt);
+
void *fdt_offset_ptr(const void *fdt, int offset, int checklen);
#define fdt_offset_ptr_typed(fdt, offset, var) \
diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 6c77852..e746314 100644
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -1,3 +1,23 @@
+/*
+ * libfdt - Flat Device Tree manipulation (build/run environment adaptation)
+ * Copyright (C) 2007 Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com
+ * Original version written by David Gibson, IBM Corporation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
#ifndef _LIBFDT_ENV_H
#define _LIBFDT_ENV_H
diff --git a/libfdt/fdt.c b/libfdt/fdt.c
index 4b1c8ab..212b838 100644
--- a/libfdt/fdt.c
+++ b/libfdt/fdt.c
@@ -23,7 +23,7 @@
#include "libfdt_internal.h"
-int _fdt_check_header(const void *fdt)
+int fdt_check_header(const void *fdt)
{
if (fdt_magic(fdt) == FDT_MAGIC) {
/* Complete tree */
@@ -72,7 +72,7 @@ const char *_fdt_find_string(const char *strtab, int tabsize, const char *s)
int fdt_move(const void *fdt, void *buf, int bufsize)
{
- int err = _fdt_check_header(fdt);
+ int err = fdt_check_header(fdt);
if (err)
return err;
diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c
index ce01dc7..2711324 100644
--- a/libfdt/fdt_ro.c
+++ b/libfdt/fdt_ro.c
@@ -25,7 +25,7 @@
#define CHECK_HEADER(fdt) { \
int err; \
- if ((err = _fdt_check_header(fdt)) != 0) \
+ if ((err = fdt_check_header(fdt)) != 0) \
return err; \
}
@@ -188,7 +188,7 @@ struct fdt_property *fdt_get_property(const void *fdt,
int offset, nextoffset;
int err;
- if ((err = _fdt_check_header(fdt)) != 0)
+ if ((err = fdt_check_header(fdt)) != 0)
goto fail;
err = -FDT_ERR_BADOFFSET;
diff --git a/libfdt/fdt_rw.c b/libfdt/fdt_rw.c
index b33fbf4..aaafc53 100644
--- a/libfdt/fdt_rw.c
+++ b/libfdt/fdt_rw.c
@@ -27,7 +27,7 @@ static int rw_check_header(void *fdt)
{
int err;
- if ((err = _fdt_check_header(fdt)))
+ if ((err = fdt_check_header(fdt)))
return err;
if (fdt_version(fdt) < 0x11)
return -FDT_ERR_BADVERSION;