aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2008-07-15 13:44:34 -0400
committerRalf Baechle <ralf@linux-mips.org>2008-07-15 13:44:34 -0400
commiteda49eeebf263f3a34f6968959fc2e4825b42beb (patch)
treed96fdbe15fdb965f244a3a251b905f85fb0494ca
parentd5deda6fa1ca434d36c2daffb63127e92c6470f5 (diff)
[MIPS] Remove always true ifdef conditions.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/Makefile8
-rw-r--r--arch/mips/configs/malta_defconfig1
-rw-r--r--arch/mips/mips-boards/generic/memory.c6
-rw-r--r--arch/mips/mips-boards/generic/reset.c2
-rw-r--r--arch/mips/mips-boards/generic/time.c4
5 files changed, 2 insertions, 19 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 800a73db822a..ed8821ac8a8e 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -305,14 +305,10 @@ load-$(CONFIG_LEMOTE_FULONG) +=0xffffffff80100000
305cflags-$(CONFIG_LEMOTE_FULONG) += -Iinclude/asm-mips/mach-lemote 305cflags-$(CONFIG_LEMOTE_FULONG) += -Iinclude/asm-mips/mach-lemote
306 306
307# 307#
308# For all MIPS, Inc. eval boards
309#
310core-$(CONFIG_MIPS_BOARDS_GEN) += arch/mips/mips-boards/generic/
311
312#
313# MIPS Malta board 308# MIPS Malta board
314# 309#
315core-$(CONFIG_MIPS_MALTA) += arch/mips/mips-boards/malta/ 310core-$(CONFIG_MIPS_MALTA) += arch/mips/mips-boards/generic/ \
311 arch/mips/mips-boards/malta/
316cflags-$(CONFIG_MIPS_MALTA) += -Iinclude/asm-mips/mach-mips 312cflags-$(CONFIG_MIPS_MALTA) += -Iinclude/asm-mips/mach-mips
317load-$(CONFIG_MIPS_MALTA) += 0xffffffff80100000 313load-$(CONFIG_MIPS_MALTA) += 0xffffffff80100000
318all-$(CONFIG_MIPS_MALTA) := vmlinux.bin 314all-$(CONFIG_MIPS_MALTA) := vmlinux.bin
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index 55288cf50b72..74daa0cf87e6 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -66,7 +66,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y
66CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 66CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
67CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 67CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
68CONFIG_IRQ_CPU=y 68CONFIG_IRQ_CPU=y
69CONFIG_MIPS_BOARDS_GEN=y
70CONFIG_PCI_GT64XXX_PCI0=y 69CONFIG_PCI_GT64XXX_PCI0=y
71CONFIG_SWAP_IO_SPACE=y 70CONFIG_SWAP_IO_SPACE=y
72CONFIG_BOOT_ELF32=y 71CONFIG_BOOT_ELF32=y
diff --git a/arch/mips/mips-boards/generic/memory.c b/arch/mips/mips-boards/generic/memory.c
index 5e443bba5662..61888ff72c87 100644
--- a/arch/mips/mips-boards/generic/memory.c
+++ b/arch/mips/mips-boards/generic/memory.c
@@ -97,7 +97,6 @@ static struct prom_pmemblock * __init prom_getmdesc(void)
97 mdesc[1].base = 0x00001000; 97 mdesc[1].base = 0x00001000;
98 mdesc[1].size = 0x000ef000; 98 mdesc[1].size = 0x000ef000;
99 99
100#ifdef CONFIG_MIPS_MALTA
101 /* 100 /*
102 * The area 0x000f0000-0x000fffff is allocated for BIOS memory by the 101 * The area 0x000f0000-0x000fffff is allocated for BIOS memory by the
103 * south bridge and PCI access always forwarded to the ISA Bus and 102 * south bridge and PCI access always forwarded to the ISA Bus and
@@ -108,11 +107,6 @@ static struct prom_pmemblock * __init prom_getmdesc(void)
108 mdesc[2].type = yamon_dontuse; 107 mdesc[2].type = yamon_dontuse;
109 mdesc[2].base = 0x000f0000; 108 mdesc[2].base = 0x000f0000;
110 mdesc[2].size = 0x00010000; 109 mdesc[2].size = 0x00010000;
111#else
112 mdesc[2].type = yamon_prom;
113 mdesc[2].base = 0x000f0000;
114 mdesc[2].size = 0x00010000;
115#endif
116 110
117 mdesc[3].type = yamon_dontuse; 111 mdesc[3].type = yamon_dontuse;
118 mdesc[3].base = 0x00100000; 112 mdesc[3].base = 0x00100000;
diff --git a/arch/mips/mips-boards/generic/reset.c b/arch/mips/mips-boards/generic/reset.c
index ea932b843962..42dee4da37ba 100644
--- a/arch/mips/mips-boards/generic/reset.c
+++ b/arch/mips/mips-boards/generic/reset.c
@@ -52,7 +52,5 @@ void mips_reboot_setup(void)
52{ 52{
53 _machine_restart = mips_machine_restart; 53 _machine_restart = mips_machine_restart;
54 _machine_halt = mips_machine_halt; 54 _machine_halt = mips_machine_halt;
55#ifdef CONFIG_MIPS_MALTA
56 pm_power_off = mips_machine_halt; 55 pm_power_off = mips_machine_halt;
57#endif
58} 56}
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c
index 744dbfc6e484..0b97d47691fc 100644
--- a/arch/mips/mips-boards/generic/time.c
+++ b/arch/mips/mips-boards/generic/time.c
@@ -42,9 +42,7 @@
42#include <asm/mips-boards/generic.h> 42#include <asm/mips-boards/generic.h>
43#include <asm/mips-boards/prom.h> 43#include <asm/mips-boards/prom.h>
44 44
45#ifdef CONFIG_MIPS_MALTA
46#include <asm/mips-boards/maltaint.h> 45#include <asm/mips-boards/maltaint.h>
47#endif
48 46
49unsigned long cpu_khz; 47unsigned long cpu_khz;
50 48
@@ -70,7 +68,6 @@ static unsigned int __init estimate_cpu_frequency(void)
70 unsigned int prid = read_c0_prid() & 0xffff00; 68 unsigned int prid = read_c0_prid() & 0xffff00;
71 unsigned int count; 69 unsigned int count;
72 70
73#ifdef CONFIG_MIPS_MALTA
74 unsigned long flags; 71 unsigned long flags;
75 unsigned int start; 72 unsigned int start;
76 73
@@ -91,7 +88,6 @@ static unsigned int __init estimate_cpu_frequency(void)
91 88
92 /* restore interrupts */ 89 /* restore interrupts */
93 local_irq_restore(flags); 90 local_irq_restore(flags);
94#endif
95 91
96 mips_hpt_frequency = count; 92 mips_hpt_frequency = count;
97 if ((prid != (PRID_COMP_MIPS | PRID_IMP_20KC)) && 93 if ((prid != (PRID_COMP_MIPS | PRID_IMP_20KC)) &&