diff options
| author | Leon M. George <leon@georgemail.eu> | 2017-06-08 16:01:19 +0200 |
|---|---|---|
| committer | Piotr Dymacz <pepe2k@gmail.com> | 2017-06-29 10:37:36 +0200 |
| commit | c777fd8a7effc22da12f5a1f0dbfca26b2b244b2 (patch) | |
| tree | 2b9e36d7ab930fafaafab92ad641628a7a8b3f8b | |
| parent | 1d45ec2784b0706d7c596825160a6e51b0830dbc (diff) | |
| download | upstream-c777fd8a7effc22da12f5a1f0dbfca26b2b244b2.tar.gz upstream-c777fd8a7effc22da12f5a1f0dbfca26b2b244b2.tar.bz2 upstream-c777fd8a7effc22da12f5a1f0dbfca26b2b244b2.zip | |
ar71xx: wpj344: read MAC addresses from u-boot mtd
This way, the assigned addresses match those on the barcode labels.
Otherwise, the addresses appear to vary on boot.
Signed-off-by: Leon M. George <leon@georgemail.eu>
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ath79/mach-wpj344.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj344.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj344.c index b3e2d06bba..81d9060c82 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj344.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj344.c @@ -48,8 +48,8 @@ #define WPJ344_KEYS_POLL_INTERVAL 20 /* msecs */ #define WPJ344_KEYS_DEBOUNCE_INTERVAL (3 * WPJ344_KEYS_POLL_INTERVAL) -#define WPJ344_MAC0_OFFSET 0 -#define WPJ344_MAC1_OFFSET 6 +#define WPJ344_MAC0_OFFSET 0x10 +#define WPJ344_MAC1_OFFSET 0x18 #define WPJ344_WMAC_CALDATA_OFFSET 0x1000 #define WPJ344_PCIE_CALDATA_OFFSET 0x5000 @@ -132,6 +132,7 @@ static struct mdio_board_info wpj344_mdio0_info[] = { static void __init wpj344_setup(void) { u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); + u8 *mac = (u8 *) KSEG1ADDR(0x1f02e000); ath79_register_m25p80(NULL); ath79_register_leds_gpio(-1, ARRAY_SIZE(wpj344_leds_gpio), @@ -152,8 +153,8 @@ static void __init wpj344_setup(void) ath79_register_mdio(1, 0x0); ath79_register_mdio(0, 0x0); - ath79_init_mac(ath79_eth0_data.mac_addr, art + WPJ344_MAC0_OFFSET, 0); - ath79_init_mac(ath79_eth1_data.mac_addr, art + WPJ344_MAC1_OFFSET, 0); + ath79_init_mac(ath79_eth0_data.mac_addr, mac + WPJ344_MAC0_OFFSET, 0); + ath79_init_mac(ath79_eth1_data.mac_addr, mac + WPJ344_MAC1_OFFSET, 0); ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0 | AR934X_ETH_CFG_SW_ONLY_MODE); |