[U-Boot] [PATCH 7/7] libfdt: Add support for using aliases in fdt_path_offset()

gvb.uboot at gmail.com gvb.uboot at gmail.com
Wed Aug 20 04:30:38 CEST 2008


From: Kumar Gala <galak at kernel.crashing.org>

If the path doesn't start with '/' check to see if it matches some alias
under "/aliases" and substitute the matching alias value in the path
and retry the lookup.

Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
Acked-by: David Gibson <david at gibson.dropbear.id.au>
Acked-by: Gerald Van Baren <vanbaren at cideas.com>
---
 libfdt/fdt_ro.c |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c
index d566eba..b09a6e9 100644
--- a/libfdt/fdt_ro.c
+++ b/libfdt/fdt_ro.c
@@ -143,8 +143,25 @@ int fdt_path_offset(const void *fdt, const char *path)
 
 	FDT_CHECK_HEADER(fdt);
 
-	if (*path != '/')
-		return -FDT_ERR_BADPATH;
+	/* see if we have an alias */
+	if (*path != '/') {
+		const char *q;
+		int aliasoffset = fdt_path_offset(fdt, "/aliases");
+
+		if (aliasoffset < 0)
+			return -FDT_ERR_BADPATH;
+
+		q = strchr(path, '/');
+		if (!q)
+			q = end;
+
+		p = fdt_getprop_namelen(fdt, aliasoffset, path, q - p, NULL);
+		if (!p)
+			return -FDT_ERR_BADPATH;
+		offset = fdt_path_offset(fdt, p);
+
+		p = q;
+	}
 
 	while (*p) {
 		const char *q;
-- 
1.5.6.3



More information about the U-Boot mailing list