Commit 4a6dbb82 authored by Russell King's avatar Russell King

[ARM] Relocate ARM SCSI and Net drivers

Move Acorn and ARM SCSI and net drivers to drivers/{net,scsi}/arm.
This also allows us to find a reasonable home for other ARM specific
net drivers.
parent bdf1ad71
...@@ -221,14 +221,7 @@ config MII ...@@ -221,14 +221,7 @@ config MII
or internal device. It is safe to say Y or M here even if your or internal device. It is safe to say Y or M here even if your
ethernet card lack MII. ethernet card lack MII.
config ARM_AM79C961A source "drivers/net/arm/Kconfig"
bool "ARM EBSA110 AM79C961A support"
depends on NET_ETHERNET && ARM && ARCH_EBSA110
help
If you wish to compile a kernel for the EBSA-110, then you should
always answer Y to this.
source "drivers/acorn/net/Kconfig"
config MACE config MACE
tristate "MACE (Power Mac ethernet) support" tristate "MACE (Power Mac ethernet) support"
......
...@@ -77,7 +77,6 @@ obj-$(CONFIG_HP100) += hp100.o ...@@ -77,7 +77,6 @@ obj-$(CONFIG_HP100) += hp100.o
obj-$(CONFIG_SMC9194) += smc9194.o obj-$(CONFIG_SMC9194) += smc9194.o
obj-$(CONFIG_FEC) += fec.o obj-$(CONFIG_FEC) += fec.o
obj-$(CONFIG_68360_ENET) += 68360enet.o obj-$(CONFIG_68360_ENET) += 68360enet.o
obj-$(CONFIG_ARM_AM79C961A) += am79c961a.o
obj-$(CONFIG_ARM_ETHERH) += 8390.o obj-$(CONFIG_ARM_ETHERH) += 8390.o
obj-$(CONFIG_WD80x3) += wd.o 8390.o obj-$(CONFIG_WD80x3) += wd.o 8390.o
obj-$(CONFIG_EL2) += 3c503.o 8390.o obj-$(CONFIG_EL2) += 3c503.o 8390.o
...@@ -179,7 +178,7 @@ obj-$(CONFIG_AMD8111_ETH) += amd8111e.o ...@@ -179,7 +178,7 @@ obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
# non-drivers/net drivers who want mii lib # non-drivers/net drivers who want mii lib
obj-$(CONFIG_PCMCIA_SMC91C92) += mii.o obj-$(CONFIG_PCMCIA_SMC91C92) += mii.o
obj-$(CONFIG_ARCH_ACORN) += ../acorn/net/ obj-$(CONFIG_ARM) += arm/
obj-$(CONFIG_NET_FC) += fc/ obj-$(CONFIG_NET_FC) += fc/
obj-$(CONFIG_DEV_APPLETALK) += appletalk/ obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_TR) += tokenring/ obj-$(CONFIG_TR) += tokenring/
......
...@@ -2,6 +2,13 @@ ...@@ -2,6 +2,13 @@
# Acorn Network device configuration # Acorn Network device configuration
# These are for Acorn's Expansion card network interfaces # These are for Acorn's Expansion card network interfaces
# #
config ARM_AM79C961A
bool "ARM EBSA110 AM79C961A support"
depends on NET_ETHERNET && ARM && ARCH_EBSA110
help
If you wish to compile a kernel for the EBSA-110, then you should
always answer Y to this.
config ARM_ETHER1 config ARM_ETHER1
tristate "Acorn Ether1 support" tristate "Acorn Ether1 support"
depends on NET_ETHERNET && ARM && ARCH_ACORN depends on NET_ETHERNET && ARM && ARCH_ACORN
...@@ -23,3 +30,16 @@ config ARM_ETHERH ...@@ -23,3 +30,16 @@ config ARM_ETHERH
If you have an Acorn system with one of these network cards, you If you have an Acorn system with one of these network cards, you
should say Y to this option if you wish to use it with Linux. should say Y to this option if you wish to use it with Linux.
config ARM_ETHER00
tristate "Altera Ether00 support"
depends on NET_ETHERNET && ARM && ARCH_CAMELOT
help
This is the driver for Altera's ether00 ethernet mac IP core. Say
Y here if you want to build support for this into the kernel. It
is also available as a module (say M here) that can be inserted/
removed from the kernel at the same time as the PLD is configured.
If this driver is running on an epxa10 development board then it
will generate a suitable hw address based on the board serial
number (MTD support is required for this). Otherwise you will
need to set a suitable hw address using ifconfig.
# File: drivers/acorn/net/Makefile # File: drivers/net/arm/Makefile
# #
# Makefile for the Acorn ethercard network device drivers # Makefile for the ARM network device drivers
# #
obj-$(CONFIG_ARM_AM79C961A) += am79c961a.o
obj-$(CONFIG_ARM_ETHER00) += ether00.o
obj-$(CONFIG_ARM_ETHERH) += etherh.o obj-$(CONFIG_ARM_ETHERH) += etherh.o
obj-$(CONFIG_ARM_ETHER3) += ether3.o obj-$(CONFIG_ARM_ETHER3) += ether3.o
obj-$(CONFIG_ARM_ETHER1) += ether1.o obj-$(CONFIG_ARM_ETHER1) += ether1.o
This diff is collapsed.
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include "../../net/8390.h" #include "../8390.h"
#define NET_DEBUG 0 #define NET_DEBUG 0
#define DEBUG_INIT 2 #define DEBUG_INIT 2
......
...@@ -1602,7 +1602,7 @@ config SCSI_MAC53C94 ...@@ -1602,7 +1602,7 @@ config SCSI_MAC53C94
whenever you want). If you want to compile it as a module, say M whenever you want). If you want to compile it as a module, say M
here and read <file:Documentation/modules.txt>. here and read <file:Documentation/modules.txt>.
source "drivers/acorn/scsi/Kconfig" source "drivers/scsi/arm/Kconfig"
config JAZZ_ESP config JAZZ_ESP
bool "MIPS JAZZ FAS216 SCSI support" bool "MIPS JAZZ FAS216 SCSI support"
......
...@@ -114,7 +114,7 @@ obj-$(CONFIG_SCSI_CPQFCTS) += cpqfc.o ...@@ -114,7 +114,7 @@ obj-$(CONFIG_SCSI_CPQFCTS) += cpqfc.o
obj-$(CONFIG_SCSI_LASI700) += lasi700.o 53c700.o obj-$(CONFIG_SCSI_LASI700) += lasi700.o 53c700.o
obj-$(CONFIG_SCSI_NSP32) += nsp32.o obj-$(CONFIG_SCSI_NSP32) += nsp32.o
obj-$(CONFIG_ARCH_ACORN) += ../acorn/scsi/ obj-$(CONFIG_ARM) += arm/
obj-$(CONFIG_CHR_DEV_ST) += st.o obj-$(CONFIG_CHR_DEV_ST) += st.o
obj-$(CONFIG_CHR_DEV_OSST) += osst.o obj-$(CONFIG_CHR_DEV_OSST) += osst.o
......
# #
# Makefile for drivers/acorn/scsi # Makefile for drivers/scsi/arm
# #
acornscsi_mod-objs := acornscsi.o acornscsi-io.o acornscsi_mod-objs := acornscsi.o acornscsi-io.o
......
...@@ -149,8 +149,8 @@ ...@@ -149,8 +149,8 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/ecard.h> #include <asm/ecard.h>
#include "../../scsi/scsi.h" #include "../scsi.h"
#include "../../scsi/hosts.h" #include "../hosts.h"
#include "acornscsi.h" #include "acornscsi.h"
#include "msgqueue.h" #include "msgqueue.h"
#include "scsi.h" #include "scsi.h"
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/ecard.h> #include <asm/ecard.h>
#include "../../scsi/scsi.h" #include "../scsi.h"
#include "../../scsi/hosts.h" #include "../hosts.h"
#include "fas216.h" #include "fas216.h"
struct arxescsi_info { struct arxescsi_info {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/system.h> #include <asm/system.h>
#include "../../scsi/scsi.h" #include "../scsi.h"
#include "../../scsi/hosts.h" #include "../hosts.h"
#include <scsi/scsicam.h> #include <scsi/scsicam.h>
...@@ -41,7 +41,7 @@ int NCR5380_proc_info(char *buffer, char **start, off_t offset, ...@@ -41,7 +41,7 @@ int NCR5380_proc_info(char *buffer, char **start, off_t offset,
#define BOARD_NORMAL 0 #define BOARD_NORMAL 0
#define BOARD_NCR53C400 1 #define BOARD_NCR53C400 1
#include "../../scsi/NCR5380.h" #include "../NCR5380.h"
void cumanascsi_setup(char *str, int *ints) void cumanascsi_setup(char *str, int *ints)
{ {
...@@ -239,7 +239,7 @@ static void cumanascsi_write(struct Scsi_Host *instance, int reg, int value) ...@@ -239,7 +239,7 @@ static void cumanascsi_write(struct Scsi_Host *instance, int reg, int value)
#undef CTRL #undef CTRL
#include "../../scsi/NCR5380.c" #include "../NCR5380.c"
static Scsi_Host_Template cumanascsi_template = { static Scsi_Host_Template cumanascsi_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
......
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include "../../scsi/scsi.h" #include "../scsi.h"
#include "../../scsi/hosts.h" #include "../hosts.h"
#include "fas216.h" #include "fas216.h"
#include "scsi.h" #include "scsi.h"
......
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/system.h> #include <asm/system.h>
#include "../../scsi/scsi.h" #include "../scsi.h"
#include "../../scsi/hosts.h" #include "../hosts.h"
#define NCR5380_implementation_fields int port, ctrl #define NCR5380_implementation_fields int port, ctrl
#define NCR5380_local_declare() struct Scsi_Host *_instance #define NCR5380_local_declare() struct Scsi_Host *_instance
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
#define NCR5380_queue_command ecoscsi_queue_command #define NCR5380_queue_command ecoscsi_queue_command
#define NCR5380_proc_info ecoscsi_proc_info #define NCR5380_proc_info ecoscsi_proc_info
#include "../../scsi/NCR5380.h" #include "../NCR5380.h"
#define ECOSCSI_PUBLIC_RELEASE 1 #define ECOSCSI_PUBLIC_RELEASE 1
...@@ -239,7 +239,7 @@ int NCR5380_proc_info(char *buffer, char **start, off_t offset, ...@@ -239,7 +239,7 @@ int NCR5380_proc_info(char *buffer, char **start, off_t offset,
#define BOARD_NORMAL 0 #define BOARD_NORMAL 0
#define BOARD_NCR53C400 1 #define BOARD_NCR53C400 1
#include "../../scsi/NCR5380.c" #include "../NCR5380.c"
static Scsi_Host_Template ecoscsi_template = { static Scsi_Host_Template ecoscsi_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
#include <asm/ecard.h> #include <asm/ecard.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include "../../scsi/scsi.h" #include "../scsi.h"
#include "../../scsi/hosts.h" #include "../hosts.h"
#include "fas216.h" #include "fas216.h"
#include "scsi.h" #include "scsi.h"
......
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/ecard.h> #include <asm/ecard.h>
#include "../../scsi/scsi.h" #include "../scsi.h"
#include "../../scsi/hosts.h" #include "../hosts.h"
#include "fas216.h" #include "fas216.h"
#include "scsi.h" #include "scsi.h"
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/system.h> #include <asm/system.h>
#include "../../scsi/scsi.h" #include "../scsi.h"
#include "../../scsi/hosts.h" #include "../hosts.h"
#define AUTOSENSE #define AUTOSENSE
/*#define PSEUDO_DMA*/ /*#define PSEUDO_DMA*/
...@@ -40,7 +40,7 @@ int NCR5380_proc_info(char *buffer, char **start, off_t offset, ...@@ -40,7 +40,7 @@ int NCR5380_proc_info(char *buffer, char **start, off_t offset,
#define BOARD_NORMAL 0 #define BOARD_NORMAL 0
#define BOARD_NCR53C400 1 #define BOARD_NCR53C400 1
#include "../../scsi/NCR5380.h" #include "../NCR5380.h"
#undef START_DMA_INITIATOR_RECEIVE_REG #undef START_DMA_INITIATOR_RECEIVE_REG
#define START_DMA_INITIATOR_RECEIVE_REG (7 + 128) #define START_DMA_INITIATOR_RECEIVE_REG (7 + 128)
...@@ -112,7 +112,7 @@ printk("reading %p len %d\n", addr, len); ...@@ -112,7 +112,7 @@ printk("reading %p len %d\n", addr, len);
#undef STAT #undef STAT
#include "../../scsi/NCR5380.c" #include "../NCR5380.c"
static Scsi_Host_Template oakscsi_template = { static Scsi_Host_Template oakscsi_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include "../../scsi/scsi.h" #include "../scsi.h"
#include "../../scsi/hosts.h" #include "../hosts.h"
#include "fas216.h" #include "fas216.h"
#include "scsi.h" #include "scsi.h"
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/init.h> #include <linux/init.h>
#include "../../scsi/scsi.h" #include "../scsi.h"
#define DEBUG #define DEBUG
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment