ar71xx: fix mac addresses on the DIR-600 rev. A1 board

SVN-Revision: 19752

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig b/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
index 5a6e4a3bca7744aac00b7eaf7c41a40ae9ddcdc3..c8e192671768442763eef17c2b94d3275f2e58ee 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
@@ -26,6 +26,7 @@ config AR71XX_MACH_DIR_600_A1
        select AR71XX_DEV_M25P80
        select AR71XX_DEV_GPIO_BUTTONS
        select AR71XX_DEV_LEDS_GPIO
+       select AR71XX_NVRAM
        default n
 
 config AR71XX_MACH_DIR_615_C1

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c
index f3fbadab1d2476bea060e61954fc064585886952..42146f55c8222f0adfe0df2fb541e46538e6208c 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c
@@ -20,6 +20,7 @@
 #include "dev-ap91-pci.h"
 #include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
+#include "nvram.h"
 
 #define DIR_600_A1_GPIO_LED_WPS                        0
 #define DIR_600_A1_GPIO_LED_POWER_AMBER                1
@@ -30,6 +31,9 @@
 
 #define DIR_600_A1_BUTTONS_POLL_INTERVAL       20
 
+#define DIR_600_A1_NVRAM_ADDR  0x1f030000
+#define DIR_600_A1_NVRAM_SIZE  0x10000
+
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition dir_600_a1_partitions[] = {
        {
@@ -108,8 +112,14 @@ static struct gpio_button dir_600_a1_gpio_buttons[] __initdata = {
 
 static void __init dir_600_a1_setup(void)
 {
-       u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
+       const char *nvram = (char *) KSEG1ADDR(DIR_600_A1_NVRAM_ADDR);
        u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+       u8 mac_buff[6];
+       u8 *mac = NULL;
+
+       if (nvram_parse_mac_addr(nvram, DIR_600_A1_NVRAM_SIZE,
+                                "lan_mac=", mac_buff) == 0)
+               mac = mac_buff;
 
        ar71xx_add_device_m25p80(&dir_600_a1_flash_data);
 
@@ -121,7 +131,7 @@ static void __init dir_600_a1_setup(void)
                                        dir_600_a1_gpio_buttons);
 
        ap91_eth_init(mac);
-       ap91_pci_init(ee, NULL);
+       ap91_pci_init(ee, mac);
 }
 
 MIPS_MACHINE(AR71XX_MACH_DIR_600_A1, "DIR-600-A1", "D-Link DIR-600 rev. A1",