diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2013-01-16 13:59:50 +0000 |
|---|---|---|
| committer | Gerald Van Baren <gvb@unssw.com> | 2013-02-07 20:38:55 -0500 |
| commit | b2ba62a1aa7f2b68c418cf44ab15eee718913272 (patch) | |
| tree | bff596e4205ca600bc5948901b9f675791f5775e /lib/libfdt | |
| parent | 71bbb3df90740fb7aa7edaaf7445c304aed69db8 (diff) | |
| download | u-boot-imx-b2ba62a1aa7f2b68c418cf44ab15eee718913272.zip u-boot-imx-b2ba62a1aa7f2b68c418cf44ab15eee718913272.tar.gz u-boot-imx-b2ba62a1aa7f2b68c418cf44ab15eee718913272.tar.bz2 | |
libfdt: update from upstream dtc commit 142419e
commit 142419e "dtc/libfdt: sparse fixes", for u-boot's libfdt copy.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Cc: Jerry Van Baren <gvb.uboot@gmail.com>
Diffstat (limited to 'lib/libfdt')
| -rw-r--r-- | lib/libfdt/fdt.c | 2 | ||||
| -rw-r--r-- | lib/libfdt/fdt_ro.c | 2 | ||||
| -rw-r--r-- | lib/libfdt/fdt_rw.c | 4 | ||||
| -rw-r--r-- | lib/libfdt/fdt_sw.c | 4 | ||||
| -rw-r--r-- | lib/libfdt/fdt_wip.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/lib/libfdt/fdt.c b/lib/libfdt/fdt.c index 4157b21..387e354 100644 --- a/lib/libfdt/fdt.c +++ b/lib/libfdt/fdt.c @@ -96,7 +96,7 @@ const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int len) uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset) { - const uint32_t *tagp, *lenp; + const fdt32_t *tagp, *lenp; uint32_t tag; int offset = startoffset; const char *p; diff --git a/lib/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c index 1933010..1a461c3 100644 --- a/lib/libfdt/fdt_ro.c +++ b/lib/libfdt/fdt_ro.c @@ -326,7 +326,7 @@ const void *fdt_getprop(const void *fdt, int nodeoffset, uint32_t fdt_get_phandle(const void *fdt, int nodeoffset) { - const uint32_t *php; + const fdt32_t *php; int len; /* FIXME: This is a bit sub-optimal, since we potentially scan diff --git a/lib/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c index 5ed23d6..aba6094 100644 --- a/lib/libfdt/fdt_rw.c +++ b/lib/libfdt/fdt_rw.c @@ -343,7 +343,7 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset, int nodelen; int err; uint32_t tag; - uint32_t *endtag; + fdt32_t *endtag; FDT_RW_CHECK_HEADER(fdt); @@ -370,7 +370,7 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset, nh->tag = cpu_to_fdt32(FDT_BEGIN_NODE); memset(nh->name, 0, FDT_TAGALIGN(namelen+1)); memcpy(nh->name, name, namelen); - endtag = (uint32_t *)((char *)nh + nodelen - FDT_TAGSIZE); + endtag = (fdt32_t *)((char *)nh + nodelen - FDT_TAGSIZE); *endtag = cpu_to_fdt32(FDT_END_NODE); return offset; diff --git a/lib/libfdt/fdt_sw.c b/lib/libfdt/fdt_sw.c index 55ebebf..f422754 100644 --- a/lib/libfdt/fdt_sw.c +++ b/lib/libfdt/fdt_sw.c @@ -153,7 +153,7 @@ int fdt_begin_node(void *fdt, const char *name) int fdt_end_node(void *fdt) { - uint32_t *en; + fdt32_t *en; FDT_SW_CHECK_HEADER(fdt); @@ -213,7 +213,7 @@ int fdt_property(void *fdt, const char *name, const void *val, int len) int fdt_finish(void *fdt) { char *p = (char *)fdt; - uint32_t *end; + fdt32_t *end; int oldstroffset, newstroffset; uint32_t tag; int offset, nextoffset; diff --git a/lib/libfdt/fdt_wip.c b/lib/libfdt/fdt_wip.c index e373677..63e67b7 100644 --- a/lib/libfdt/fdt_wip.c +++ b/lib/libfdt/fdt_wip.c @@ -78,7 +78,7 @@ int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name, static void _fdt_nop_region(void *start, int len) { - uint32_t *p; + fdt32_t *p; for (p = start; (char *)p < ((char *)start + len); p++) *p = cpu_to_fdt32(FDT_NOP); |