[PATCH] m68knommu: use board defines to distinguish boards

Use board name defines to distinguish boards, instead of combinations
of more generic defines.

Signed-off-by: Greg Ungerer <gerg@uclinux.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Greg Ungerer 2005-11-02 15:04:37 +10:00 committed by Linus Torvalds
parent 4f4ef2967e
commit 95dad9b351

View file

@ -35,7 +35,7 @@
* Define the basic hardware resources of NE2000 boards. * Define the basic hardware resources of NE2000 boards.
*/ */
#if defined(CONFIG_M5206) && defined(CONFIG_ARNEWSH) #if defined(CONFIG_ARN5206)
#define NE2000_ADDR 0x40000300 #define NE2000_ADDR 0x40000300
#define NE2000_ODDOFFSET 0x00010000 #define NE2000_ODDOFFSET 0x00010000
#define NE2000_IRQ_VECTOR 0xf0 #define NE2000_IRQ_VECTOR 0xf0
@ -44,7 +44,7 @@
#define NE2000_BYTE volatile unsigned short #define NE2000_BYTE volatile unsigned short
#endif #endif
#if defined(CONFIG_M5206e) && defined(CONFIG_MOTOROLA) #if defined(CONFIG_M5206eC3)
#define NE2000_ADDR 0x40000300 #define NE2000_ADDR 0x40000300
#define NE2000_ODDOFFSET 0x00010000 #define NE2000_ODDOFFSET 0x00010000
#define NE2000_IRQ_VECTOR 0x1c #define NE2000_IRQ_VECTOR 0x1c
@ -61,7 +61,7 @@
#define NE2000_BYTE volatile unsigned char #define NE2000_BYTE volatile unsigned char
#endif #endif
#if defined(CONFIG_M5206e) && defined(CONFIG_CFV240) #if defined(CONFIG_CFV240)
#define NE2000_ADDR 0x40010000 #define NE2000_ADDR 0x40010000
#define NE2000_ADDR1 0x40010001 #define NE2000_ADDR1 0x40010001
#define NE2000_ODDOFFSET 0x00000000 #define NE2000_ODDOFFSET 0x00000000
@ -72,7 +72,7 @@
#define NE2000_BYTE volatile unsigned char #define NE2000_BYTE volatile unsigned char
#endif #endif
#if defined(CONFIG_M5307) && defined(CONFIG_MOTOROLA) #if defined(CONFIG_M5307C3)
#define NE2000_ADDR 0x40000300 #define NE2000_ADDR 0x40000300
#define NE2000_ODDOFFSET 0x00010000 #define NE2000_ODDOFFSET 0x00010000
#define NE2000_IRQ_VECTOR 0x1b #define NE2000_IRQ_VECTOR 0x1b
@ -114,7 +114,7 @@
#define RSWAP(w) (((w) << 8) | ((w) >> 8)) #define RSWAP(w) (((w) << 8) | ((w) >> 8))
#endif #endif
#if defined(CONFIG_M5307) && defined(CONFIG_ARNEWSH) #if defined(CONFIG_ARN5307)
#define NE2000_ADDR 0xfe600300 #define NE2000_ADDR 0xfe600300
#define NE2000_ODDOFFSET 0x00010000 #define NE2000_ODDOFFSET 0x00010000
#define NE2000_IRQ_VECTOR 0x1b #define NE2000_IRQ_VECTOR 0x1b
@ -123,7 +123,7 @@
#define NE2000_BYTE volatile unsigned short #define NE2000_BYTE volatile unsigned short
#endif #endif
#if defined(CONFIG_M5407) #if defined(CONFIG_M5407C3)
#define NE2000_ADDR 0x40000300 #define NE2000_ADDR 0x40000300
#define NE2000_ODDOFFSET 0x00010000 #define NE2000_ODDOFFSET 0x00010000
#define NE2000_IRQ_VECTOR 0x1b #define NE2000_IRQ_VECTOR 0x1b
@ -264,7 +264,7 @@ void ne2000_outsw(unsigned int addr, const void *vbuf, unsigned long len)
* Minor differences between the different board types. * Minor differences between the different board types.
*/ */
#if defined(CONFIG_M5206) && defined(CONFIG_ARNEWSH) #if defined(CONFIG_ARN5206)
void ne2000_irqsetup(int irq) void ne2000_irqsetup(int irq)
{ {
volatile unsigned char *icrp; volatile unsigned char *icrp;
@ -275,7 +275,7 @@ void ne2000_irqsetup(int irq)
} }
#endif #endif
#if defined(CONFIG_M5206e) && defined(CONFIG_MOTOROLA) #if defined(CONFIG_M5206eC3)
void ne2000_irqsetup(int irq) void ne2000_irqsetup(int irq)
{ {
volatile unsigned char *icrp; volatile unsigned char *icrp;
@ -286,7 +286,7 @@ void ne2000_irqsetup(int irq)
} }
#endif #endif
#if defined(CONFIG_M5206e) && defined(CONFIG_CFV240) #if defined(CONFIG_CFV240)
void ne2000_irqsetup(int irq) void ne2000_irqsetup(int irq)
{ {
volatile unsigned char *icrp; volatile unsigned char *icrp;