From 929e0befd2cc9e36339bd8da47ad552192e61545 Mon Sep 17 00:00:00 2001 From: Harald Koerfgen Date: Sun, 17 Oct 1999 19:55:22 +0000 Subject: Some minor bugfixes: o Fix braino in lib/Makefile o Export __wbflush() and release_tc_card() for modules o DMA isn't limited on DECstations o remove elf2ecoff and addinitrd while "make clean" --- arch/mips/boot/Makefile | 4 +++- arch/mips/dec/Makefile | 8 +++++++- arch/mips/dec/wbflush.c | 6 ++++++ arch/mips/lib/Makefile | 8 ++++---- drivers/tc/tcsyms.c | 9 +++++---- include/asm-mips/dma.h | 4 ++-- 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile index 63af5fc70..1ae3a3fd6 100644 --- a/arch/mips/boot/Makefile +++ b/arch/mips/boot/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.8 1999/03/13 12:36:50 tsbogend Exp $ +# $Id: Makefile,v 1.9 1999/04/07 18:45:23 harald Exp $ # # This file is subject to the terms and conditions of the GNU General Public # License. See the file "COPYING" in the main directory of this archive @@ -46,6 +46,8 @@ dep: clean: rm -f vmlinux.ecoff + rm -f addinitrd + rm -f elf2ecoff dummy: diff --git a/arch/mips/dec/Makefile b/arch/mips/dec/Makefile index 0d23b8fbd..d3f65947a 100644 --- a/arch/mips/dec/Makefile +++ b/arch/mips/dec/Makefile @@ -13,7 +13,7 @@ all: dec.o O_TARGET := dec.o -O_OBJS := int-handler.o setup.o irq.o time.o reset.o rtc-dec.o wbflush.o +O_OBJS := int-handler.o setup.o irq.o time.o reset.o rtc-dec.o ifdef CONFIG_PROM_CONSOLE O_OBJS += promcon.o @@ -23,6 +23,12 @@ ifdef CONFIG_SERIAL O_OBJS += serial.o endif +ifeq ($(CONFIG_MODULES),y) + OX_OBJS = wbflush.o +else + O_OBJS += wbflush.o +endif + int-handler.o: int-handler.S clean: diff --git a/arch/mips/dec/wbflush.c b/arch/mips/dec/wbflush.c index 516a4ad2b..b1f9d3286 100644 --- a/arch/mips/dec/wbflush.c +++ b/arch/mips/dec/wbflush.c @@ -102,3 +102,9 @@ static void wbflush_kn02ba(void) static void wbflush_kn03(void) { } + +#ifdef EXPORT_SYMTAB +#include + +EXPORT_SYMBOL(__wbflush); +#endif diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index 9e2128b49..59c711647 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.9 1999/01/04 16:03:50 ralf Exp $ +# $Id: Makefile,v 1.10 1999/10/12 17:33:49 harald Exp $ # # Makefile for MIPS-specific library files.. # @@ -13,10 +13,10 @@ L_OBJS = csum_partial.o csum_partial_copy.o floppy-std.o \ floppy-no.o ide-std.o ide-no.o kbd-std.o kbd-no.o rtc-std.o \ rtc-no.o memset.o memcpy.o strlen_user.o strncpy_user.o watch.o -#ifdef CONFIG_CPU_R3000 +ifdef CONFIG_CPU_R3000 L_OBJS += r3k_dump_tlb.o -#else +else L_OBJS += dump_tlb.o -#endif +endif include $(TOPDIR)/Rules.make diff --git a/drivers/tc/tcsyms.c b/drivers/tc/tcsyms.c index 88af39ec5..9e3a24dca 100644 --- a/drivers/tc/tcsyms.c +++ b/drivers/tc/tcsyms.c @@ -1,13 +1,14 @@ /* - * Turbo Channel Services -- Exported Symbols + * TURBOchannel Services -- Exported Symbols * */ #include #include -EXPORT_SYMBOL(get_tc_irq_nr); -EXPORT_SYMBOL(claim_tc_card); EXPORT_SYMBOL(search_tc_card); -EXPORT_SYMBOL(get_tc_speed); +EXPORT_SYMBOL(claim_tc_card); +EXPORT_SYMBOL(release_tc_card); EXPORT_SYMBOL(get_tc_base_addr); +EXPORT_SYMBOL(get_tc_irq_nr); +EXPORT_SYMBOL(get_tc_speed); diff --git a/include/asm-mips/dma.h b/include/asm-mips/dma.h index 493e0ec3d..14f1248f8 100644 --- a/include/asm-mips/dma.h +++ b/include/asm-mips/dma.h @@ -1,4 +1,4 @@ -/* $Id: dma.h,v 1.3 1999/08/20 21:59:08 ralf Exp $ +/* $Id: dma.h,v 1.4 1999/10/09 00:01:42 ralf Exp $ * linux/include/asm/dma.h: Defines for using and allocating dma channels. * Written by Hennus Bergman, 1992. * High DMA channel support & info by Hannu Savolainen @@ -83,7 +83,7 @@ * Deskstations or Acer PICA but not the much more versatile DMA logic used * for the local devices on Acer PICA or Magnums. */ -#ifndef CONFIG_SGI_IP22 +#if !defined(CONFIG_SGI_IP22) && !defined(CONFIG_DECSTATION) #define MAX_DMA_ADDRESS (PAGE_OFFSET + 0x01000000) #else #define MAX_DMA_ADDRESS (~0UL) -- cgit v1.2.3