summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-10-15 22:00:01 +0200
committerWolfgang Denk <wd@denx.de>2011-10-15 22:00:01 +0200
commit7bf5228ce190e1659eee0d99bbf4fc5d417a2369 (patch)
treefc826219272af416f02aef7c8f2670d1b6f86de7 /include
parente140aad18af5536a25c9ec2055ab53e9e4bc0721 (diff)
parenta2c1229c39e39d9a5ff90055d78b8de061943097 (diff)
downloadu-boot-imx-7bf5228ce190e1659eee0d99bbf4fc5d417a2369.zip
u-boot-imx-7bf5228ce190e1659eee0d99bbf4fc5d417a2369.tar.gz
u-boot-imx-7bf5228ce190e1659eee0d99bbf4fc5d417a2369.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-fdt
* 'master' of git://git.denx.de/u-boot-fdt: powerpc/85xx: use fdt_create_phandle() to create the Fman firmware phandles fdt: update fdt_alloc_phandle to use fdt_get_phandle fdt: check for fdt errors in fdt_create_phandle fdt: Add a do_fixup_by_path_string() function
Diffstat (limited to 'include')
-rw-r--r--include/fdt_support.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/include/fdt_support.h b/include/fdt_support.h
index 8f06aac..4826eee 100644
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -36,6 +36,13 @@ void do_fixup_by_path(void *fdt, const char *path, const char *prop,
const void *val, int len, int create);
void do_fixup_by_path_u32(void *fdt, const char *path, const char *prop,
u32 val, int create);
+
+static inline void do_fixup_by_path_string(void *fdt, const char *path,
+ const char *prop, const char *status)
+{
+ do_fixup_by_path(fdt, path, prop, status, strlen(status) + 1, 1);
+}
+
void do_fixup_by_prop(void *fdt,
const char *pname, const void *pval, int plen,
const char *prop, const void *val, int len,
@@ -90,7 +97,7 @@ int fdt_node_offset_by_compat_reg(void *blob, const char *compat,
phys_addr_t compat_off);
int fdt_alloc_phandle(void *blob);
int fdt_set_phandle(void *fdt, int nodeoffset, uint32_t phandle);
-int fdt_create_phandle(void *fdt, int nodeoffset);
+unsigned int fdt_create_phandle(void *fdt, int nodeoffset);
int fdt_add_edid(void *blob, const char *compat, unsigned char *buf);
int fdt_verify_alias_address(void *fdt, int anode, const char *alias,