Commit 5af29f59 authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu
Browse files

[Blackfin] arch: finish removing remnants of old BF537_PORT_H option of Blackfin EMAC driver 



Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Acked-by: default avatarJeff Garzik <jeff@garzik.org>
parent 7b8aa36e

arch/blackfin/mach-bf537/head.S

+0 −12
Original line number Diff line number Diff line
@@ -180,18 +180,6 @@ ENTRY(__start) 
	SSYNC;

#endif



#ifdef CONFIG_BF537_PORT_H

	p0.h = hi(PORTH_FER);

	p0.l = lo(PORTH_FER);

	R0.L = W[P0]; /* Read */

	SSYNC;

	R0 = 0x0000;

	W[P0] = R0.L; /* Write */

	SSYNC;

	W[P0] = R0.L; /* Disable peripheral function of PORTH */

	SSYNC;

#endif



	/* Initialise UART - when booting from u-boot, the UART is not disabled

	 * so if we dont initalize here, our serial console gets hosed */

	p0.h = hi(UART_LCR);

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ config ULTRA32 


config BFIN_MAC

	tristate "Blackfin 527/536/537 on-chip mac support"

	depends on NET_ETHERNET && (BF527 || BF537 || BF536) && (!BF537_PORT_H)

	depends on NET_ETHERNET && (BF527 || BF537 || BF536)

	select CRC32

	select MII

	select PHYLIB