Commit c155f3f9 authored by Jiri Olsa's avatar Jiri Olsa Committed by Linus Torvalds
Browse files

m68knomu: remove dead config symbols from m68knomu code 



remove dead config symbols from m68knommu code

Signed-off-by: default avatarJiri Olsa <olsajiri@gmail.com>
Acked-by: default avatarGreg Ungerer <gerg@snapgear.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 16791963

arch/m68knommu/kernel/setup.c

+0 −3
Original line number Diff line number Diff line
@@ -64,9 +64,6 @@ void (*mach_power_off)(void); 
#ifdef CONFIG_M68VZ328

	#define CPU "MC68VZ328"

#endif

#ifdef CONFIG_M68332

	#define CPU "MC68332"

#endif

#ifdef CONFIG_M68360

	#define CPU "MC68360"

#endif

include/asm-m68knommu/mcfne.h

+0 −27
Original line number Diff line number Diff line
@@ -60,17 +60,6 @@ 
#define	NE2000_BYTE		volatile unsigned char

#endif



#if defined(CONFIG_CFV240)

#define NE2000_ADDR             0x40010000

#define NE2000_ADDR1            0x40010001

#define NE2000_ODDOFFSET        0x00000000

#define NE2000_IRQ              1

#define NE2000_IRQ_VECTOR       0x19

#define NE2000_IRQ_PRIORITY     2

#define NE2000_IRQ_LEVEL        1

#define	NE2000_BYTE		volatile unsigned char

#endif



#if defined(CONFIG_M5307C3)

#define NE2000_ADDR		0x40000300

#define NE2000_ODDOFFSET	0x00010000
@@ -173,13 +162,8 @@ void ne2000_outsw(unsigned int addr, void *vbuf, unsigned long len); 
 *	On most NE2000 implementations on ColdFire boards the chip is

 *	mapped in kinda funny, due to its ISA heritage.

 */

#ifdef CONFIG_CFV240

#define NE2000_PTR(addr)	(NE2000_ADDR + ((addr & 0x3f) << 1) + 1)

#define NE2000_DATA_PTR(addr)	(NE2000_ADDR + ((addr & 0x3f) << 1))

#else

#define	NE2000_PTR(addr)	((addr&0x1)?(NE2000_ODDOFFSET+addr-1):(addr))

#define	NE2000_DATA_PTR(addr)	(addr)

#endif





void ne2000_outb(unsigned int val, unsigned int addr)
@@ -285,17 +269,6 @@ void ne2000_irqsetup(int irq) 
}

#endif



#if defined(CONFIG_CFV240)

void ne2000_irqsetup(int irq)

{

	volatile unsigned char  *icrp;



	icrp = (volatile unsigned char *) (MCF_MBAR + MCFSIM_ICR1);

	*icrp = MCFSIM_ICR_LEVEL1 | MCFSIM_ICR_PRI2 | MCFSIM_ICR_AUTOVEC;

	mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_EINT1);

}

#endif



#if defined(CONFIG_M5206e) && defined(CONFIG_NETtel)

void ne2000_irqsetup(int irq)

{

include/asm-m68knommu/mcfsim.h

+1 −3
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@ 
 *	Include 5204, 5206/e, 5235, 5249, 5270/5271, 5272, 5280/5282,

 *	5307 or 5407 specific addresses.

 */

#if defined(CONFIG_M5204)

#include <asm/m5204sim.h>

#elif defined(CONFIG_M5206) || defined(CONFIG_M5206e)

#if defined(CONFIG_M5206) || defined(CONFIG_M5206e)

#include <asm/m5206sim.h>

#elif defined(CONFIG_M520x)

#include <asm/m520xsim.h>

include/asm-m68knommu/mcftimer.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
/*

 *	Get address specific defines for this ColdFire member.

 */

#if defined(CONFIG_M5204) || defined(CONFIG_M5206) || defined(CONFIG_M5206e)

#if defined(CONFIG_M5206) || defined(CONFIG_M5206e)

#define	MCFTIMER_BASE1		0x100		/* Base address of TIMER1 */

#define	MCFTIMER_BASE2		0x120		/* Base address of TIMER2 */

#elif defined(CONFIG_M5272)

include/asm-m68knommu/mcfuart.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#if defined(CONFIG_M5272)

#define	MCFUART_BASE1		0x100		/* Base address of UART1 */

#define	MCFUART_BASE2		0x140		/* Base address of UART2 */

#elif defined(CONFIG_M5204) || defined(CONFIG_M5206) || defined(CONFIG_M5206e)

#elif defined(CONFIG_M5206) || defined(CONFIG_M5206e)

#if defined(CONFIG_NETtel)

#define	MCFUART_BASE1		0x180		/* Base address of UART1 */

#define	MCFUART_BASE2		0x140		/* Base address of UART2 */