Blackfin arch: sharing the board-specific MAC function does not make sense so move it into board-specific files
Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
This commit is contained in:
parent
b33d518777
commit
137b1529da
|
@ -2,5 +2,4 @@
|
||||||
# arch/blackfin/mach-bf527/boards/Makefile
|
# arch/blackfin/mach-bf527/boards/Makefile
|
||||||
#
|
#
|
||||||
|
|
||||||
obj-y += eth_mac.o
|
|
||||||
obj-$(CONFIG_BFIN527_EZKIT) += ezkit.o
|
obj-$(CONFIG_BFIN527_EZKIT) += ezkit.o
|
||||||
|
|
|
@ -1,50 +0,0 @@
|
||||||
/*
|
|
||||||
* arch/blackfin/mach-bf537/board/eth_mac.c
|
|
||||||
*
|
|
||||||
* Copyright (C) 2007 Analog Devices, Inc.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
*/
|
|
||||||
#include <linux/module.h>
|
|
||||||
#include <asm/blackfin.h>
|
|
||||||
|
|
||||||
#if defined(CONFIG_GENERIC_BOARD) || defined(CONFIG_BFIN537_STAMP)
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Currently the MAC address is saved in Flash by U-Boot
|
|
||||||
*/
|
|
||||||
#define FLASH_MAC 0x203f0000
|
|
||||||
|
|
||||||
void get_bf537_ether_addr(char *addr)
|
|
||||||
{
|
|
||||||
unsigned int flash_mac = (unsigned int) FLASH_MAC;
|
|
||||||
*(u32 *)(&(addr[0])) = bfin_read32(flash_mac);
|
|
||||||
flash_mac += 4;
|
|
||||||
*(u16 *)(&(addr[4])) = bfin_read16(flash_mac);
|
|
||||||
}
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Provide MAC address function for other specific board setting
|
|
||||||
*/
|
|
||||||
void get_bf537_ether_addr(char *addr)
|
|
||||||
{
|
|
||||||
printk(KERN_WARNING "%s: No valid Ethernet MAC address found\n", __FILE__);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
EXPORT_SYMBOL(get_bf537_ether_addr);
|
|
|
@ -808,3 +808,14 @@ void native_machine_restart(char *cmd)
|
||||||
if ((bfin_read_SYSCR() & 0x7) == 0x3)
|
if ((bfin_read_SYSCR() & 0x7) == 0x3)
|
||||||
bfin_gpio_reset_spi0_ssel1();
|
bfin_gpio_reset_spi0_ssel1();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Currently the MAC address is saved in Flash by U-Boot
|
||||||
|
*/
|
||||||
|
#define FLASH_MAC 0x203f0000
|
||||||
|
void get_bf537_ether_addr(char *addr)
|
||||||
|
{
|
||||||
|
*(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC);
|
||||||
|
*(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(get_bf537_ether_addr);
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
# arch/blackfin/mach-bf537/boards/Makefile
|
# arch/blackfin/mach-bf537/boards/Makefile
|
||||||
#
|
#
|
||||||
|
|
||||||
obj-y += eth_mac.o
|
|
||||||
obj-$(CONFIG_GENERIC_BF537_BOARD) += generic_board.o
|
obj-$(CONFIG_GENERIC_BF537_BOARD) += generic_board.o
|
||||||
obj-$(CONFIG_BFIN537_STAMP) += stamp.o led.o
|
obj-$(CONFIG_BFIN537_STAMP) += stamp.o led.o
|
||||||
obj-$(CONFIG_BFIN537_BLUETECHNIX_CM) += cm_bf537.o
|
obj-$(CONFIG_BFIN537_BLUETECHNIX_CM) += cm_bf537.o
|
||||||
|
|
|
@ -427,3 +427,10 @@ static int __init cm_bf537_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
arch_initcall(cm_bf537_init);
|
arch_initcall(cm_bf537_init);
|
||||||
|
|
||||||
|
void get_bf537_ether_addr(char *addr)
|
||||||
|
{
|
||||||
|
random_ether_addr(addr);
|
||||||
|
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(get_bf537_ether_addr);
|
||||||
|
|
|
@ -1,50 +0,0 @@
|
||||||
/*
|
|
||||||
* arch/blackfin/mach-bf537/board/eth_mac.c
|
|
||||||
*
|
|
||||||
* Copyright (C) 2007 Analog Devices, Inc.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
*/
|
|
||||||
#include <linux/module.h>
|
|
||||||
#include <asm/blackfin.h>
|
|
||||||
|
|
||||||
#if defined(CONFIG_GENERIC_BOARD) || defined(CONFIG_BFIN537_STAMP)
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Currently the MAC address is saved in Flash by U-Boot
|
|
||||||
*/
|
|
||||||
#define FLASH_MAC 0x203f0000
|
|
||||||
|
|
||||||
void get_bf537_ether_addr(char *addr)
|
|
||||||
{
|
|
||||||
unsigned int flash_mac = (unsigned int) FLASH_MAC;
|
|
||||||
*(u32 *)(&(addr[0])) = bfin_read32(flash_mac);
|
|
||||||
flash_mac += 4;
|
|
||||||
*(u16 *)(&(addr[4])) = bfin_read16(flash_mac);
|
|
||||||
}
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Provide MAC address function for other specific board setting
|
|
||||||
*/
|
|
||||||
void get_bf537_ether_addr(char *addr)
|
|
||||||
{
|
|
||||||
printk(KERN_WARNING "%s: No valid Ethernet MAC address found\n", __FILE__);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
EXPORT_SYMBOL(get_bf537_ether_addr);
|
|
|
@ -732,3 +732,10 @@ void native_machine_restart(char *cmd)
|
||||||
if ((bfin_read_SYSCR() & 0x7) == 0x3)
|
if ((bfin_read_SYSCR() & 0x7) == 0x3)
|
||||||
bfin_gpio_reset_spi0_ssel1();
|
bfin_gpio_reset_spi0_ssel1();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void get_bf537_ether_addr(char *addr)
|
||||||
|
{
|
||||||
|
random_ether_addr(addr);
|
||||||
|
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(get_bf537_ether_addr);
|
||||||
|
|
|
@ -510,3 +510,10 @@ static int __init stamp_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
arch_initcall(stamp_init);
|
arch_initcall(stamp_init);
|
||||||
|
|
||||||
|
void get_bf537_ether_addr(char *addr)
|
||||||
|
{
|
||||||
|
random_ether_addr(addr);
|
||||||
|
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(get_bf537_ether_addr);
|
||||||
|
|
|
@ -732,3 +732,14 @@ void native_machine_restart(char *cmd)
|
||||||
if ((bfin_read_SYSCR() & 0x7) == 0x3)
|
if ((bfin_read_SYSCR() & 0x7) == 0x3)
|
||||||
bfin_gpio_reset_spi0_ssel1();
|
bfin_gpio_reset_spi0_ssel1();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Currently the MAC address is saved in Flash by U-Boot
|
||||||
|
*/
|
||||||
|
#define FLASH_MAC 0x203f0000
|
||||||
|
void get_bf537_ether_addr(char *addr)
|
||||||
|
{
|
||||||
|
*(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC);
|
||||||
|
*(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(get_bf537_ether_addr);
|
||||||
|
|
Loading…
Reference in New Issue