[POWERPC] bootwrapper: Factor out dt_set_mac_address()

This allows callers to set addresses one at a time when that would be more
convenient.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/boot/devtree.c b/arch/powerpc/boot/devtree.c
index 549463bf5eec2dc978fe56fe702965037b6b221e..e5dfe449731393cb7aec718b4fd169964309def0 100644 (file)
--- a/arch/powerpc/boot/devtree.c
+++ b/arch/powerpc/boot/devtree.c
@@ -88,29 +88,32 @@ void dt_fixup_clock(const char *path, u32 freq)
        }
 }
 
+void dt_fixup_mac_address(u32 index, const u8 *addr)
+{
+       void *devp = find_node_by_prop_value(NULL, "linux,network-index",
+                                            (void*)&index, sizeof(index));
+
+       if (devp) {
+               printf("ENET%d: local-mac-address <-"
+                      " %02x:%02x:%02x:%02x:%02x:%02x\n\r", index,
+                      addr[0], addr[1], addr[2],
+                      addr[3], addr[4], addr[5]);
+
+               setprop(devp, "local-mac-address", addr, 6);
+       }
+}
+
 void __dt_fixup_mac_addresses(u32 startindex, ...)
 {
        va_list ap;
        u32 index = startindex;
-       void *devp;
        const u8 *addr;
 
        va_start(ap, startindex);
-       while ((addr = va_arg(ap, const u8 *))) {
-               devp = find_node_by_prop_value(NULL, "linux,network-index",
-                                              (void*)&index, sizeof(index));
 
-               if (devp) {
-                       printf("ENET%d: local-mac-address <-"
-                              " %02x:%02x:%02x:%02x:%02x:%02x\n\r", index,
-                              addr[0], addr[1], addr[2],
-                              addr[3], addr[4], addr[5]);
+       while ((addr = va_arg(ap, const u8 *)))
+               dt_fixup_mac_address(index++, addr);
 
-                       setprop(devp, "local-mac-address", addr, 6);
-               }
-
-               index++;
-       }
        va_end(ap);
 }
 

diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h
index f639fcab2c4453e95df7f050ae629d4717c1004e..e948e57abef8142dcbe9c58e2b4a953a24d2c353 100644 (file)
--- a/arch/powerpc/boot/ops.h
+++ b/arch/powerpc/boot/ops.h
@@ -161,6 +161,7 @@ static inline void *find_node_by_devtype(const void *prev,
 void dt_fixup_memory(u64 start, u64 size);
 void dt_fixup_cpu_clocks(u32 cpufreq, u32 tbfreq, u32 busfreq);
 void dt_fixup_clock(const char *path, u32 freq);
+void dt_fixup_mac_address(u32 index, const u8 *addr);
 void __dt_fixup_mac_addresses(u32 startindex, ...);
 #define dt_fixup_mac_addresses(...) \
        __dt_fixup_mac_addresses(0, __VA_ARGS__, NULL)