From 28e7d7faed355e451cc8b0c037035dfcf873a965 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 20 Aug 1998 22:04:22 +0000 Subject: Patches from Eric Norum --- c/src/lib/libbsp/m68k/gen68360/Makefile.in | 6 +----- c/src/lib/libbsp/m68k/gen68360/README | 2 +- c/src/lib/libbsp/m68k/gen68360/include/bsp.h | 8 ++++++++ c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in | 6 +----- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'c/src/lib/libbsp/m68k/gen68360') diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/Makefile.in index 98cf93acef..b06c1fc69c 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.in @@ -13,10 +13,6 @@ include $(RTEMS_ROOT)/make/directory.cfg SRCS=README -# We only build the ka9q device driver if HAS_KA9Q was defined -KA9Q_DRIVER_yes_V = ka9q_network -KA9Q_DRIVER = $(KA9Q_DRIVER_$(HAS_KA9Q)_V) - # We only build the networking device driver if HAS_NETWORKING was defined NETWORKING_DRIVER_yes_V = network NETWORKING_DRIVER = $(NETWORKING_DRIVER_$(HAS_NETWORKING)_V) @@ -26,4 +22,4 @@ all: $(SRCS) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories SUB_DIRS=include start360 startup clock console timer \ - $(KA9Q_DRIVER) $(NETWORKING_DRIVER) wrapup + $(NETWORKING_DRIVER) wrapup diff --git a/c/src/lib/libbsp/m68k/gen68360/README b/c/src/lib/libbsp/m68k/gen68360/README index 1a5ec2e667..8e14552641 100644 --- a/c/src/lib/libbsp/m68k/gen68360/README +++ b/c/src/lib/libbsp/m68k/gen68360/README @@ -33,7 +33,7 @@ # # Decisions to be made a link-edit time are: # - The size of the memory allocator heap. The default value is -# 64 kbytes. If the KA9Q network package is used the heap +# 64 kbytes. If the network package is used the heap # should be at least 256 kbytes. If your network is large, or # busy, the heap should be even larger. # To choose a heap size of 256 kbytes, diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h index a52dc1e69c..885fdd117d 100644 --- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h @@ -36,6 +36,14 @@ extern "C" { #include #include +/* + * Network driver configuration + */ +struct rtems_bsdnet_ifconfig; +extern int rtems_scc1_driver_attach (struct rtems_bsdnet_ifconfig *config); +#define RTEMS_BSP_NETWORK_DRIVER_NAME "scc1" +#define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_scc1_driver_attach + /* * Define the time limits for RTEMS Test Suite test durations. * Long test and short test duration limits are provided. These diff --git a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in index de02880710..c7523cd10f 100644 --- a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in @@ -8,15 +8,11 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -# We only build the ka9q device driver if HAS_KA9Q was defined -KA9Q_DRIVER_yes_V = ka9q_network -KA9Q_DRIVER = $(KA9Q_DRIVER_$(HAS_KA9Q)_V) - # We only build the networking device driver if HAS_NETWORKING was defined NETWORKING_DRIVER_yes_V = network NETWORKING_DRIVER = $(NETWORKING_DRIVER_$(HAS_NETWORKING)_V) -BSP_PIECES=startup clock console timer $(KA9Q_DRIVER) $(NETWORKING_DRIVER) +BSP_PIECES=startup clock console timer $(NETWORKING_DRIVER) CPU_PIECES= GENERIC_PIECES= -- cgit v1.2.3