EmbeddedPkg/FdtLib: Updated libfdt to 1.4.0

Last commit from git://git.jdl.com/software/dtc.git:

commit 65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf
Author: Jon Loeliger <jdl@jdl.com>
Date:   Sat Jun 22 12:54:28 2013 -0500

    Tag Version 1.4.0

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15237 6f19259b-4bc3-4df7-8a09-765794883524

6 files changed, 43 insertions, 10 deletions

diff --git a/EmbeddedPkg/Library/FdtLib/fdt.c b/EmbeddedPkg/Library/FdtLib/fdt.c
index 151fcb2ab0..963952820b 100644
--- a/EmbeddedPkg/Library/FdtLib/fdt.c
+++ b/EmbeddedPkg/Library/FdtLib/fdt.c
@@ -92,7 +92,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;

@@ -198,6 +198,34 @@ int fdt_next_node(const void *fdt, int offset, int *depth)
 	return offset;

 }

 

+int fdt_first_subnode(const void *fdt, int offset)

+{

+	int depth = 0;

+

+	offset = fdt_next_node(fdt, offset, &depth);

+	if (offset < 0 || depth != 1)

+		return -FDT_ERR_NOTFOUND;

+

+	return offset;

+}

+

+int fdt_next_subnode(const void *fdt, int offset)

+{

+	int depth = 1;

+

+	/*

+	 * With respect to the parent, the depth of the next subnode will be

+	 * the same as the last.

+	 */

+	do {

+		offset = fdt_next_node(fdt, offset, &depth);

+		if (offset < 0 || depth < 1)

+			return -FDT_ERR_NOTFOUND;

+	} while (depth > 1);

+

+	return offset;

+}

+

 const char *_fdt_find_string(const char *strtab, int tabsize, const char *s)

 {

 	int len = strlen(s) + 1;

diff --git a/EmbeddedPkg/Library/FdtLib/fdt_ro.c b/EmbeddedPkg/Library/FdtLib/fdt_ro.c
index 9ae6b5ecc5..2055891e71 100644
--- a/EmbeddedPkg/Library/FdtLib/fdt_ro.c
+++ b/EmbeddedPkg/Library/FdtLib/fdt_ro.c
@@ -323,7 +323,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

@@ -516,8 +516,7 @@ int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle)
 	return offset; /* error from fdt_next_node() */

 }

 

-static int _fdt_stringlist_contains(const char *strlist, int listlen,

-				    const char *str)

+int fdt_stringlist_contains(const char *strlist, int listlen, const char *str)

 {

 	int len = strlen(str);

 	const char *p;

@@ -543,7 +542,7 @@ int fdt_node_check_compatible(const void *fdt, int nodeoffset,
 	prop = fdt_getprop(fdt, nodeoffset, "compatible", &len);

 	if (!prop)

 		return len;

-	if (_fdt_stringlist_contains(prop, len, compatible))

+	if (fdt_stringlist_contains(prop, len, compatible))

 		return 0;

 	else

 		return 1;

diff --git a/EmbeddedPkg/Library/FdtLib/fdt_rw.c b/EmbeddedPkg/Library/FdtLib/fdt_rw.c
index 1d95a73ec1..7a2bcf3d07 100644
--- a/EmbeddedPkg/Library/FdtLib/fdt_rw.c
+++ b/EmbeddedPkg/Library/FdtLib/fdt_rw.c
@@ -342,7 +342,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);

 

@@ -369,7 +369,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/EmbeddedPkg/Library/FdtLib/fdt_sw.c b/EmbeddedPkg/Library/FdtLib/fdt_sw.c
index 240fabc554..991919b436 100644
--- a/EmbeddedPkg/Library/FdtLib/fdt_sw.c
+++ b/EmbeddedPkg/Library/FdtLib/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/EmbeddedPkg/Library/FdtLib/fdt_wip.c b/EmbeddedPkg/Library/FdtLib/fdt_wip.c
index e009a88f51..3f2b58172b 100644
--- a/EmbeddedPkg/Library/FdtLib/fdt_wip.c
+++ b/EmbeddedPkg/Library/FdtLib/fdt_wip.c
@@ -74,7 +74,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);

diff --git a/EmbeddedPkg/Library/FdtLib/version.lds b/EmbeddedPkg/Library/FdtLib/version.lds
index 3c3994e27f..80b322bed6 100644
--- a/EmbeddedPkg/Library/FdtLib/version.lds
+++ b/EmbeddedPkg/Library/FdtLib/version.lds
@@ -48,6 +48,12 @@ LIBFDT_1.2 {
 		fdt_strerror;
 		fdt_offset_ptr;
 		fdt_next_tag;
+		fdt_appendprop;
+		fdt_create_empty_tree;
+		fdt_first_property_offset;
+		fdt_get_property_by_offset;
+		fdt_getprop_by_offset;
+		fdt_next_property_offset;
 
 	local:
 		*;