use tree passed to us in local blob, not global fdt.

Also use fdt_path_offset to convert to relative offset, since absolute
reference is needed to check for rgmii-id mode string value.

Signed-off-by: Kim Phillips <[EMAIL PROTECTED]>
---
 board/freescale/mpc8360emds/mpc8360emds.c |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/board/freescale/mpc8360emds/mpc8360emds.c 
b/board/freescale/mpc8360emds/mpc8360emds.c
index 2fcef8b..c1691ae 100644
--- a/board/freescale/mpc8360emds/mpc8360emds.c
+++ b/board/freescale/mpc8360emds/mpc8360emds.c
@@ -318,28 +318,34 @@ void ft_board_setup(void *blob, bd_t *bd)
                const char *prop;
                const char *path;
 
-               nodeoffset = fdt_path_offset(fdt, "/aliases");
+               nodeoffset = fdt_path_offset(blob, "/aliases");
                if (nodeoffset >= 0) {
 #if defined(CONFIG_HAS_ETH0)
                        /* fixup UCC 1 if using rgmii-id mode */
                        path = fdt_getprop(blob, nodeoffset, "ethernet0", NULL);
                        if (path) {
-                               prop = fdt_getprop(blob, nodeoffset,
-                                                       "phy-connection-type", 
0);
+                               path = fdt_path_offset(blob, path);
+                               prop = fdt_getprop(blob, path,
+                                                  "phy-connection-type", 0);
                                if (prop && (strcmp(prop, "rgmii-id") == 0))
-                                       fdt_setprop(blob, nodeoffset, 
"phy-connection-type",
-                                                   "rgmii-rxid", 
sizeof("rgmii-rxid"));
+                                       fdt_setprop(blob, path,
+                                                   "phy-connection-type",
+                                                   "rgmii-rxid",
+                                                   sizeof("rgmii-rxid"));
                        }
 #endif
 #if defined(CONFIG_HAS_ETH1)
                        /* fixup UCC 2 if using rgmii-id mode */
                        path = fdt_getprop(blob, nodeoffset, "ethernet1", NULL);
                        if (path) {
-                               prop = fdt_getprop(blob, nodeoffset,
-                                                       "phy-connection-type", 
0);
+                               path = fdt_path_offset(blob, path);
+                               prop = fdt_getprop(blob, path,
+                                                  "phy-connection-type", 0);
                                if (prop && (strcmp(prop, "rgmii-id") == 0))
-                                       fdt_setprop(blob, nodeoffset, 
"phy-connection-type",
-                                                   "rgmii-rxid", 
sizeof("rgmii-rxid"));
+                                       fdt_setprop(blob, path,
+                                                   "phy-connection-type",
+                                                   "rgmii-rxid",
+                                                   sizeof("rgmii-rxid"));
                        }
 #endif
                }
-- 
1.5.3


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users

Reply via email to