[adm5120] load the mac address from flash where it is possible

[openwrt/svn-archive/archive.git] / target / linux / adm5120 / files-2.6.26 / arch / mips / adm5120 / compex / compex.c

diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c
index 10120d6226d4b7e41edc6ab3b59e45e377a5c6ce..81157812bbbe6875781a7b66693fac5324688d89 100644 (file)
--- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c
+++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c
@@ -9,21 +9,10 @@
  *
  */
 
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/gpio.h>
-
-#include <asm/bootinfo.h>
-
-#include <asm/mach-adm5120/adm5120_info.h>
-#include <asm/mach-adm5120/adm5120_board.h>
-#include <asm/mach-adm5120/adm5120_platform.h>
-#include <asm/mach-adm5120/adm5120_irq.h>
+#include "compex.h"
 
 #include <asm/mach-adm5120/prom/myloader.h>
 
-#include "compex.h"
-
 #define COMPEX_GPIO_DEV_MASK   (1 << ADM5120_GPIO_PIN5)
 
 static void switch_bank_gpio5(unsigned bank)
@@ -40,14 +29,22 @@ static void switch_bank_gpio5(unsigned bank)
 
 void __init compex_mac_setup(void)
 {
-       int i, j;
-
-       if (!myloader_present())
-               return;
-
-       for (i = 0; i < 6; i++)
-               for (j = 0; j < 6; j++)
-                       adm5120_eth_macs[i][j] = myloader_info.macs[i][j];
+       if (myloader_present()) {
+               int i;
+
+               for (i = 0; i < 6; i++) {
+                       if (is_valid_ether_addr(myloader_info.macs[i]))
+                               memcpy(myloader_info.macs[i],
+                                               adm5120_eth_macs[i], ETH_ALEN);
+                       else
+                               random_ether_addr(adm5120_eth_macs[i]);
+               }
+       } else {
+               u8 mac[ETH_ALEN];
+
+               random_ether_addr(mac);
+               adm5120_setup_eth_macs(mac);
+       }
 }
 
 void __init compex_generic_setup(void)