diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-16 12:52:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-16 12:52:32 +0000 |
| commit | 851076b71233028f17a395f19821abdc46a34715 (patch) | |
| tree | bdb6e4510cef9a33c57749ca174c49e087e99150 /arch | |
| parent | dc2e1a589aa53a62f60136a4eb727fa770d2e02e (diff) | |
More loose bits (grrr) ...
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/Makefile | 17 | ||||
| -rw-r--r-- | arch/mips/kernel/Makefile | 6 | ||||
| -rw-r--r-- | arch/mips/kernel/setup.c | 5 | ||||
| -rw-r--r-- | arch/mips/lib/kbd-std.c | 2 |
4 files changed, 19 insertions, 11 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 2b58c6b00..470807c9a 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -228,11 +228,18 @@ endif # ITE 8172 eval board with QED 5231 CPU # ifdef CONFIG_MIPS_ITE8172 -LIBS += arch/mips/ite-boards/qed-4n-s01b/ite.o \ - arch/mips/ite-boards/generic/it8172.o -SUBDIRS += arch/mips/ite-boards/generic \ - arch/mips/ite-boards/qed-4n-s01b -LOADADDR += 0x80100000 +LIBS += arch/mips/ite-boards/qed-4n-s01b/ite.o arch/mips/ite-boards/generic/it8172.o +SUBDIRS += arch/mips/ite-boards/generic arch/mips/ite-boards/qed-4n-s01b +LOADADDR += 0x80100000 +endif + +# +# Globespan IVR eval board with QED 5231 CPU +# +ifdef CONFIG_MIPS_IVR +LIBS += arch/mips/ite-boards/ivr/ivr.o arch/mips/ite-boards/generic/it8172.o +SUBDIRS += arch/mips/ite-boards/generic arch/mips/ite-boards/ivr +LOADADDR += 0x80100000 endif # diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index b4c91f991..ec2eae67e 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -11,7 +11,7 @@ .S.o: $(CC) $(AFLAGS) -c $< -o $@ -EXTRA_ASFLAGS = -mips3 -mcpu=r4000 +EXTRA_AFLAGS = -mips3 -mcpu=r4000 all: kernel.o head.o init_task.o @@ -54,7 +54,9 @@ ifndef CONFIG_DECSTATION ifndef CONFIG_MIPS_EV96100 ifndef CONFIG_MIPS_ITE8172 ifndef CONFIG_NINO - obj-y += time.o + ifndef CONFIG_MIPS_IVR + obj-y += time.o + endif endif endif endif diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 8815cbb20..04f2ee113 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -548,11 +548,12 @@ void __init setup_arch(char **cmdline_p) ev64120_setup(); break; #endif -#ifdef CONFIG_MIPS_ITE8172 +#if defined(CONFIG_MIPS_IVR) || defined(CONFIG_MIPS_ITE8172) case MACH_GROUP_ITE: + case MACH_GROUP_GLOBESPAN: it8172_setup(); break; -#endif +#endif #ifdef CONFIG_NINO case MACH_GROUP_PHILIPS: nino_setup(); diff --git a/arch/mips/lib/kbd-std.c b/arch/mips/lib/kbd-std.c index ce75371d5..ecaa2a0d8 100644 --- a/arch/mips/lib/kbd-std.c +++ b/arch/mips/lib/kbd-std.c @@ -20,7 +20,6 @@ static void std_kbd_request_region(void) { #ifdef CONFIG_MIPS_ITE8172 - printk("std_kbd_request_region\n"); request_region(0x14000060, 16, "keyboard"); #else request_region(0x60, 16, "keyboard"); @@ -29,7 +28,6 @@ static void std_kbd_request_region(void) static int std_kbd_request_irq(void (*handler)(int, void *, struct pt_regs *)) { - printk("std_kbd_request_irq\n"); return request_irq(KEYBOARD_IRQ, handler, 0, "keyboard", NULL); } |