From f5bd03cf5f28e66ffcaf0e57aed592ff48898f2d Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 23 May 1997 21:44:19 +0000 Subject: KA9Q stack removed prior to testing for 4.0.0 public release. --- Makefile.in | 2 -- README.configure | 4 --- c/ACKNOWLEDGEMENTS | 7 ++--- c/Makefile.in | 5 ---- c/src/lib/Makefile.in | 6 +--- c/src/lib/include/Makefile.in | 10 ------- c/src/lib/libbsp/m68k/gen68360/Makefile.in | 6 +--- c/src/lib/libbsp/m68k/gen68360/README | 5 +--- c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in | 6 +--- c/src/lib/wrapup/Makefile.in | 1 - c/src/wrapup/Makefile.in | 1 - configure | 36 ++++------------------- configure.in | 14 --------- 13 files changed, 13 insertions(+), 90 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1c7858261d..03c58b6a19 100644 --- a/Makefile.in +++ b/Makefile.in @@ -41,7 +41,6 @@ RTEMS_ROOT = @RTEMS_ROOT@ RTEMS_HOST = @RTEMS_HOST@ PROJECT_ROOT = @PROJECT_ROOT@ RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@ -RTEMS_HAS_KA9Q = @RTEMS_HAS_KA9Q@ RTEMS_USE_MACROS = @RTEMS_USE_MACROS@ RTEMS_USE_GCC272 = @RTEMS_USE_GCC272@ RTEMS_LIBC_DIR = @RTEMS_LIBC_DIR@ @@ -86,7 +85,6 @@ $(MTARGETS): mlink \"PROJECT_HOME=$(PROJECT_ROOT)/$$bsp\" \ \"PROJECT_ROOT=$(PROJECT_ROOT)\" \ \"RTEMS_HAS_POSIX_API=$(RTEMS_HAS_POSIX_API)\" \ - \"RTEMS_HAS_KA9Q=$(RTEMS_HAS_KA9Q)\" \ \"RTEMS_USE_MACROS=$(RTEMS_USE_MACROS)\" \ \"RTEMS_USE_GCC272=$(RTEMS_USE_GCC272)\" \ \"RTEMS_LIBC_DIR=$(RTEMS_LIBC_DIR)\" \ diff --git a/README.configure b/README.configure index 3501576dcd..574123ee70 100644 --- a/README.configure +++ b/README.configure @@ -18,7 +18,6 @@ RTEMS-specific option are supported: --disable-rtems-inlines --disable-posix - --disable-tcpip --disable-tests --enable-gcc28 --enable-libcdir= @@ -27,9 +26,6 @@ RTEMS-specific option are supported: By default, the RTEMS posix interface is built for targets that support it. It can be disabled with the --disable-posix option. -By default, the RTEMS port of the KA9Q TCP/IP stack is build for targets -that support it. It can be disabled with the --disable-tcpip option. - By default, the RTEMS test suites are configured. The --disable-tests will not configure the RTEMS test suite. This is used only to speed-up configuration in case building the tests are not necessary. diff --git a/c/ACKNOWLEDGEMENTS b/c/ACKNOWLEDGEMENTS index 74b28e370b..153cf1b1fe 100644 --- a/c/ACKNOWLEDGEMENTS +++ b/c/ACKNOWLEDGEMENTS @@ -93,10 +93,9 @@ The following persons/organizations have made contributions: autoconf. This effort is greatly appreciated. + Eric Norum (eric@skatter.usask.ca) of the Saskatchewan Accelerator - Laboratory submitted the port of the ka9q tcp/ip stack to rtems, - a network driver for the `gen68360' BSP, a BSP for the m68360 when - operating in companion mode with a m68040, and a port of the - Motorola MC68040 Floating Point Support Package (FPSP) to RTEMS. + Laboratory submitted a BSP for the m68360 when operating in companion + mode with a m68040 and a port of the Motorola MC68040 Floating Point + Support Package (FPSP) to RTEMS. Finally, the RTEMS project would like to thank those who have contributed to the other free software efforts which RTEMS utilizes. The primary RTEMS diff --git a/c/Makefile.in b/c/Makefile.in index 4d27199e5a..2892073027 100644 --- a/c/Makefile.in +++ b/c/Makefile.in @@ -27,15 +27,10 @@ export PROJECT_HOME SUB_DIRS=build-tools src -# We only make the ka9q install point if it is enabled. -LIBKA9Q_yes_V = include/ka9q -LIBKA9Q = $(LIBKA9Q_$(HAS_KA9Q)_V) - # directories to be created in install point CREATE_DIRS = include include/sys \ include/rtems include/rtems/score include/rtems/rtems include/rtems/posix \ include/netinet include/libc include/libc/sys \ - $(LIBKA9Q) \ lib bin samples \ tests tests/screens tests/screens/sptests \ tests/screens/psxtests tests/screens/mptests \ diff --git a/c/src/lib/Makefile.in b/c/src/lib/Makefile.in index 3a740a280b..55ca6e925e 100644 --- a/c/src/lib/Makefile.in +++ b/c/src/lib/Makefile.in @@ -10,12 +10,8 @@ VPATH=@srcdir@ include $(RTEMS_CUSTOM) include $(PROJECT_ROOT)/make/directory.cfg -# We only build the ka9q library if HAS_KA9Q was defined -LIBKA9Q_yes_V = libka9q -LIBKA9Q = $(LIBKA9Q_$(HAS_KA9Q)_V) - # General Hardware API library LIBHWAPI=$(wildcard libhwapi) SUB_DIRS=start include libmisc libc libcpu libbsp \ - $(LIBKA9Q) $(LIBHWAPI) wrapup + $(LIBHWAPI) wrapup diff --git a/c/src/lib/include/Makefile.in b/c/src/lib/include/Makefile.in index 092b7c9766..c15472cbc0 100644 --- a/c/src/lib/include/Makefile.in +++ b/c/src/lib/include/Makefile.in @@ -11,13 +11,6 @@ H_PIECES=console clockdrv iosupp ringbuf \ spurious timerdrv vmeintr z8036 z8530 z8536 H_FILES=$(H_PIECES:%=$(srcdir)/%.h) -KA9Q_H_PIECES= arp asy ax25 ax25mail bootp cmdparse commands config \ - daemon dialer domain enet ftp ftpcli global hardware icmp iface \ - internet ip kiss lapb lzw mailbox mbuf netuser nospc nr4 nr4mail \ - nrs ping pktdrvr ppp proc rip rtems_ka9q sb session slhc slip smtp \ - sockaddr socket tcp telnet tftp timer tipmail trace udp usock -KA9Q_H_FILES=$(KA9Q_H_PIECES:%=$(srcdir)/ka9q/%.h) - SYS_H_FILES= SRCS=$(H_FILES) $(SYS_H_FILES) @@ -31,6 +24,3 @@ CLOBBER_ADDITIONS += all: $(SRCS) $(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include $(INSTALL) -m 444 $(SYS_H_FILES) ${PROJECT_RELEASE}/include/sys -ifeq ($(HAS_KA9Q),yes) - $(INSTALL) -m 444 $(KA9Q_H_FILES) ${PROJECT_RELEASE}/include/ka9q -endif diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/Makefile.in index 02c21db8d8..9581a49c3b 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.in @@ -12,12 +12,8 @@ include $(PROJECT_ROOT)/make/directory.cfg SRCS=README -# We only build the ka9q device driver if HAS_KA9Q was defined -LIBKA9Q_yes_V = network -LIBKA9Q = $(LIBKA9Q_$(HAS_KA9Q)_V) - 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 $(LIBKA9Q) wrapup +SUB_DIRS=include start360 startup clock console timer wrapup diff --git a/c/src/lib/libbsp/m68k/gen68360/README b/c/src/lib/libbsp/m68k/gen68360/README index f85c62b918..f0dd2a1bf0 100644 --- a/c/src/lib/libbsp/m68k/gen68360/README +++ b/c/src/lib/libbsp/m68k/gen68360/README @@ -40,10 +40,7 @@ # --defsym RamSize=0x1000000 # # - The size of the memory allocator heap. The default value is -# 64 kbytes. If the KA9Q 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, +# 64 kbytes. To choose a heap size of 256 kbytes, # --defsym HeapSize=0x40000 # # - The Ethernet address for network boot proms. diff --git a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in index 8171dc8264..4893e89c5d 100644 --- a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in @@ -7,11 +7,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH=@srcdir@ -# We only build the ka9q device driver if HAS_KA9Q was defined -LIBKA9Q_yes_V = network -LIBKA9Q = $(LIBKA9Q_$(HAS_KA9Q)_V) - -BSP_PIECES=startup clock console $(LIBKA9Q) timer +BSP_PIECES=startup clock console timer CPU_PIECES= GENERIC_PIECES= diff --git a/c/src/lib/wrapup/Makefile.in b/c/src/lib/wrapup/Makefile.in index 2446f24015..0316d5c56b 100644 --- a/c/src/lib/wrapup/Makefile.in +++ b/c/src/lib/wrapup/Makefile.in @@ -17,7 +17,6 @@ LIB=$(PROJECT_HOME)/lib/librtemsall.a SRCS=$(wildcard $(PROJECT_HOME)/lib/libbsp$(LIB_VARIANT).a) \ $(PROJECT_HOME)/lib/librtems$(LIB_VARIANT).a \ $(wildcard $(PROJECT_HOME)/lib/libposix$(LIB_VARIANT).a) \ - $(wildcard $(PROJECT_HOME)/lib/libka9q$(LIB_VARIANT).a) \ $(PROJECT_HOME)/lib/libcsupport$(LIB_VARIANT).a \ $(wildcard $(PROJECT_HOME)/lib/rtems-ctor$(LIB_VARIANT).o) \ $(wildcard $(PROJECT_HOME)/lib/libno-ctor$(LIB_VARIANT).a) diff --git a/c/src/wrapup/Makefile.in b/c/src/wrapup/Makefile.in index 2446f24015..0316d5c56b 100644 --- a/c/src/wrapup/Makefile.in +++ b/c/src/wrapup/Makefile.in @@ -17,7 +17,6 @@ LIB=$(PROJECT_HOME)/lib/librtemsall.a SRCS=$(wildcard $(PROJECT_HOME)/lib/libbsp$(LIB_VARIANT).a) \ $(PROJECT_HOME)/lib/librtems$(LIB_VARIANT).a \ $(wildcard $(PROJECT_HOME)/lib/libposix$(LIB_VARIANT).a) \ - $(wildcard $(PROJECT_HOME)/lib/libka9q$(LIB_VARIANT).a) \ $(PROJECT_HOME)/lib/libcsupport$(LIB_VARIANT).a \ $(wildcard $(PROJECT_HOME)/lib/rtems-ctor$(LIB_VARIANT).o) \ $(wildcard $(PROJECT_HOME)/lib/libno-ctor$(LIB_VARIANT).a) diff --git a/configure b/configure index 9716d44d52..5518a08200 100644 --- a/configure +++ b/configure @@ -17,9 +17,6 @@ ac_help="$ac_help \ --disable-posix disable posix interface" ac_help="$ac_help -\ - --disable-tcpip disable KA9Q TCP/IP stack" -ac_help="$ac_help \ --disable-rtems-inlines disable RTEMS inline functions (use macros)" ac_help="$ac_help @@ -767,8 +764,6 @@ c/src/lib/libbsp/unix/posix/startup/Makefile \ c/src/lib/libbsp/unix/posix/timer/Makefile \ c/src/lib/libbsp/unix/posix/wrapup/Makefile" -tcpip_mk="c/src/lib/libka9q/Makefile" - hwapi_mk="\ c/src/lib/libhwapi/Makefile \ c/src/lib/libhwapi/eeprom/Makefile \ @@ -957,7 +952,7 @@ c/src/tests/tools/unix/Makefile \ c/src/tests/tools/unix/posix/Makefile" echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:961: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:956: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1030,7 +1025,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1034: checking host system type" >&5 +echo "configure:1029: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1051,7 +1046,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:1055: checking target system type" >&5 +echo "configure:1050: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -1069,7 +1064,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1073: checking build system type" >&5 +echo "configure:1068: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1113,20 +1108,6 @@ else fi -# Check whether --enable-tcpip or --disable-tcpip was given. -if test "${enable_tcpip+set}" = set; then - enableval="$enable_tcpip" - \ -case "${enableval}" in - yes) RTEMS_HAS_KA9Q=yes ;; - no) RTEMS_HAS_KA9Q=no ;; - *) { echo "configure: error: bad value ${enableval} for disable-tcpip option" 1>&2; exit 1; } ;; -esac -else - RTEMS_HAS_KA9Q=yes -fi - - # Check whether --enable-rtems-inlines or --disable-rtems-inlines was given. if test "${enable_rtems_inlines+set}" = set; then enableval="$enable_rtems_inlines" @@ -1234,9 +1215,6 @@ case "${target}" in ;; esac -# until the tcpip is made optional to build, just do this -makefiles="$makefiles $tcpip_mk" - case "${host}" in *-pc-linux*) host_os=Linux ;; sparc-sun-sunos*) host_os=SunOS ;; @@ -1263,7 +1241,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1267: checking for $ac_word" >&5 +echo "configure:1245: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1292,7 +1270,7 @@ test -n "$AWK" && break done echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1296: checking whether ln -s works" >&5 +echo "configure:1274: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1357,7 +1335,6 @@ fi - trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1582,7 +1559,6 @@ s%@RTEMS_HOST@%$RTEMS_HOST%g s%@RTEMS_LIBC_DIR@%$RTEMS_LIBC_DIR%g s%@RTEMS_ROOT@%$RTEMS_ROOT%g s%@RTEMS_HAS_POSIX_API@%$RTEMS_HAS_POSIX_API%g -s%@RTEMS_HAS_KA9Q@%$RTEMS_HAS_KA9Q%g s%@RTEMS_USE_MACROS@%$RTEMS_USE_MACROS%g s%@RTEMS_USE_GCC272@%$RTEMS_USE_GCC272%g s%@PROJECT_ROOT@%$PROJECT_ROOT%g diff --git a/configure.in b/configure.in index 9f364c81ca..807fd93712 100644 --- a/configure.in +++ b/configure.in @@ -224,8 +224,6 @@ c/src/lib/libbsp/unix/posix/startup/Makefile \ c/src/lib/libbsp/unix/posix/timer/Makefile \ c/src/lib/libbsp/unix/posix/wrapup/Makefile" -tcpip_mk="c/src/lib/libka9q/Makefile" - hwapi_mk="\ c/src/lib/libhwapi/Makefile \ c/src/lib/libhwapi/eeprom/Makefile \ @@ -427,14 +425,6 @@ AC_ARG_ENABLE(posix, \ *) AC_MSG_ERROR(bad value ${enableval} for disable-posix option) ;; esac],[RTEMS_HAS_POSIX_API=yes]) -AC_ARG_ENABLE(tcpip, \ -[ --disable-tcpip disable KA9Q TCP/IP stack], \ -[case "${enableval}" in - yes) RTEMS_HAS_KA9Q=yes ;; - no) RTEMS_HAS_KA9Q=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for disable-tcpip option) ;; -esac],[RTEMS_HAS_KA9Q=yes]) - AC_ARG_ENABLE(rtems-inlines, \ [ --disable-rtems-inlines disable RTEMS inline functions (use macros)], \ [case "${enableval}" in @@ -526,9 +516,6 @@ case "${target}" in ;; esac -# until the tcpip is made optional to build, just do this -makefiles="$makefiles $tcpip_mk" - case "${host}" in *-pc-linux*) host_os=Linux ;; sparc-sun-sunos*) host_os=SunOS ;; @@ -577,7 +564,6 @@ AC_SUBST(RTEMS_HOST) AC_SUBST(RTEMS_LIBC_DIR) AC_SUBST(RTEMS_ROOT) AC_SUBST(RTEMS_HAS_POSIX_API) -AC_SUBST(RTEMS_HAS_KA9Q) AC_SUBST(RTEMS_USE_MACROS) AC_SUBST(RTEMS_USE_GCC272) AC_SUBST(RTEMS_LIBC_DIR) -- cgit v1.2.3