Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 137b1529 authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu
Browse files

Blackfin arch: sharing the board-specific MAC function does not make sense so... 


Blackfin arch: sharing the board-specific MAC function does not make sense so move it into board-specific files

Signed-off-by: default avatarMike Frysinger <michael.frysinger@analog.com>
Signed-off-by: default avatarBryan Wu <bryan.wu@analog.com>
parent b33d5187

arch/blackfin/mach-bf527/boards/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2,5 +2,4 @@ 
# arch/blackfin/mach-bf527/boards/Makefile

#



obj-y                                  += eth_mac.o

obj-$(CONFIG_BFIN527_EZKIT)            += ezkit.o

arch/blackfin/mach-bf527/boards/eth_mac.c

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
/*

 *  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);

arch/blackfin/mach-bf527/boards/ezkit.c

+11 −0
Original line number Diff line number Diff line
@@ -808,3 +808,14 @@ void native_machine_restart(char *cmd) 
	if ((bfin_read_SYSCR() & 0x7) == 0x3)

		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);

arch/blackfin/mach-bf537/boards/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
# arch/blackfin/mach-bf537/boards/Makefile

#



obj-y                                  += eth_mac.o

obj-$(CONFIG_GENERIC_BF537_BOARD)      += generic_board.o

obj-$(CONFIG_BFIN537_STAMP)            += stamp.o led.o

obj-$(CONFIG_BFIN537_BLUETECHNIX_CM)   += cm_bf537.o

arch/blackfin/mach-bf537/boards/cm_bf537.c

+7 −0
Original line number Diff line number Diff line
@@ -427,3 +427,10 @@ static int __init cm_bf537_init(void) 
}



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);