summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-08-11 02:14:05 +0200
committerWolfgang Denk <wd@denx.de>2007-08-11 02:14:05 +0200
commit308e2b3a6c3fd84fceada79b3d4a559280d326a6 (patch)
tree452e7ed9e0ed6c11cc4a73a3a588a72cbc2646b7 /include
parent923efd286411ed052d9e074f59f8986d6081061c (diff)
parent5fe6be6208dda852c3564e384bd78d75784dea3e (diff)
downloadtalos-obmc-uboot-308e2b3a6c3fd84fceada79b3d4a559280d326a6.tar.gz
talos-obmc-uboot-308e2b3a6c3fd84fceada79b3d4a559280d326a6.zip
Merge with /home/wd/git/u-boot/custodian/u-boot-fdt
Diffstat (limited to 'include')
-rw-r--r--include/fdt_support.h6
-rw-r--r--include/libfdt.h8
-rw-r--r--include/libfdt_env.h2
3 files changed, 14 insertions, 2 deletions
diff --git a/include/fdt_support.h b/include/fdt_support.h
index a276834740..60fa423b33 100644
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -38,5 +38,11 @@ int fdt_env(void *fdt);
int fdt_bd_t(void *fdt);
#endif
+#ifdef CONFIG_OF_BOARD_SETUP
+void ft_board_setup(void *blob, bd_t *bd);
+void ft_cpu_setup(void *blob, bd_t *bd);
+void ft_pci_setup(void *blob, bd_t *bd);
+#endif
+
#endif /* ifdef CONFIG_OF_LIBFDT */
#endif /* ifndef __FDT_SUPPORT_H */
diff --git a/include/libfdt.h b/include/libfdt.h
index f8bac73a31..340e89d9ce 100644
--- a/include/libfdt.h
+++ b/include/libfdt.h
@@ -77,7 +77,13 @@ int fdt_subnode_offset_namelen(const void *fdt, int parentoffset,
const char *name, int namelen);
int fdt_subnode_offset(const void *fdt, int parentoffset, const char *name);
-int fdt_path_offset(const void *fdt, const char *path);
+int fdt_find_node_by_path(const void *fdt, const char *path);
+int fdt_find_node_by_type(const void *fdt, int nodeoffset, const char *type);
+
+int fdt_node_is_compatible(const void *fdt, int nodeoffset,
+ const char *compat);
+int fdt_find_compatible_node(const void *fdt, int nodeoffset,
+ const char *type, const char *compat);
struct fdt_property *fdt_get_property(const void *fdt, int nodeoffset,
const char *name, int *lenp);
diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index e746314b1e..78f725830d 100644
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -26,7 +26,7 @@
#include <asm/byteorder.h>
#include <linux/string.h>
-struct fdt_header *fdt; /* Pointer to the working fdt */
+extern struct fdt_header *fdt; /* Pointer to the working fdt */
#define fdt32_to_cpu(x) __be32_to_cpu(x)
#define cpu_to_fdt32(x) __cpu_to_be32(x)
OpenPOWER on IntegriCloud