diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-01 11:46:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-01 11:46:40 +0000 |
| commit | 6b8549ba91b651e45d9e972d0e30263d625fd184 (patch) | |
| tree | e7721bbe6d814ee71797618a4b0c75ab1e1af834 /arch | |
| parent | e11f564413d1d8feac7a60fb3aa440bf66a4e25a (diff) | |
More R3912 cleanup.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/Makefile | 3 | ||||
| -rw-r--r-- | arch/mips/philips/nino/Makefile | 2 | ||||
| -rw-r--r-- | arch/mips/philips/nino/setup.c | 2 | ||||
| -rw-r--r-- | arch/mips/philips/nino/wbflush.c | 36 |
4 files changed, 1 insertions, 42 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 0038b0588..a9fc965ee 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -51,9 +51,6 @@ endif ifdef CONFIG_CPU_R3000 GCCFLAGS += -mcpu=r3000 -mips1 endif -ifdef CONFIG_CPU_R3912 -GCCFLAGS += -mcpu=r3000 -mips1 -endif ifdef CONFIG_CPU_R6000 GCCFLAGS += -mcpu=r6000 -mips2 -Wa,--trap endif diff --git a/arch/mips/philips/nino/Makefile b/arch/mips/philips/nino/Makefile index bcdd9b2e3..29ab017c8 100644 --- a/arch/mips/philips/nino/Makefile +++ b/arch/mips/philips/nino/Makefile @@ -15,7 +15,7 @@ O_TARGET := nino.o all: nino.o -obj-y := int-handler.o setup.o irq.o time.o reset.o rtc.o prom.o power.o wbflush.o +obj-y := int-handler.o setup.o irq.o time.o reset.o rtc.o prom.o power.o int-handler.o: int-handler.S diff --git a/arch/mips/philips/nino/setup.c b/arch/mips/philips/nino/setup.c index 85e247cb4..a3e62e280 100644 --- a/arch/mips/philips/nino/setup.c +++ b/arch/mips/philips/nino/setup.c @@ -117,6 +117,4 @@ void __init nino_setup(void) #endif rtc_ops = &nino_rtc_ops; - - wbflush_setup(); } diff --git a/arch/mips/philips/nino/wbflush.c b/arch/mips/philips/nino/wbflush.c deleted file mode 100644 index f70b5ef69..000000000 --- a/arch/mips/philips/nino/wbflush.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * linux/arch/mips/philips/nino/wbflush.c - * - * Copyright (C) 2001 Steven J. Hill (sjhill@realitydiluted.com) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * Function to flush the write buffer on the Philips Nino. - */ -#include <linux/init.h> - -void (*__wbflush) (void); - -void nino_wbflush(void) -{ - /* - * The status of the writeback buffer is available - * via the Coprocessor 0 condition - */ - __asm__ __volatile__( - ".set\tpush\n\t" - ".set\tnoreorder\n\t" - ".set\tmips3\n\t" - "sync\n\t" - "nop\n\t" - "1:\tbc0f\t1b\n\t" - "nop\n\t" - ".set\tpop"); -} - -void __init wbflush_setup(void) -{ - __wbflush = nino_wbflush; -} |