diff options
author | Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> | 2007-10-26 09:42:31 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-01-29 05:14:55 -0500 |
commit | 7f3f4900619743f4e3af21e9228748c3d692a2c2 (patch) | |
tree | 71b1924fc4abeedd95fa0b97da8abbf5e631a61c /arch/mips | |
parent | 417345d8f5bacc291138c99a292a8ca69947530e (diff) |
[MIPS] remove unused mips_machtype
Removed unused mips_machtype. These are only set but not used.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/au1000/db1x00/init.c | 11 | ||||
-rw-r--r-- | arch/mips/au1000/mtx-1/init.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1000/init.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1100/init.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1200/init.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1500/init.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1550/init.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/xxs1500/init.c | 2 | ||||
-rw-r--r-- | arch/mips/basler/excite/excite_prom.c | 2 | ||||
-rw-r--r-- | arch/mips/gt64120/wrppmc/setup.c | 2 | ||||
-rw-r--r-- | arch/mips/jmr3927/rbhma3100/init.c | 4 | ||||
-rw-r--r-- | arch/mips/lemote/lm2e/prom.c | 2 | ||||
-rw-r--r-- | arch/mips/philips/pnx8550/jbs/init.c | 3 | ||||
-rw-r--r-- | arch/mips/philips/pnx8550/stb810/prom_init.c | 2 | ||||
-rw-r--r-- | arch/mips/pmc-sierra/yosemite/prom.c | 2 | ||||
-rw-r--r-- | arch/mips/tx4938/toshiba_rbtx4938/prom.c | 1 | ||||
-rw-r--r-- | arch/mips/vr41xx/nec-cmbvr4133/setup.c | 2 |
17 files changed, 0 insertions, 45 deletions
diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c index 43298fd9459c..e822c123eab8 100644 --- a/arch/mips/au1000/db1x00/init.c +++ b/arch/mips/au1000/db1x00/init.c | |||
@@ -57,17 +57,6 @@ void __init prom_init(void) | |||
57 | prom_argv = (char **) fw_arg1; | 57 | prom_argv = (char **) fw_arg1; |
58 | prom_envp = (char **) fw_arg2; | 58 | prom_envp = (char **) fw_arg2; |
59 | 59 | ||
60 | /* Set the platform # */ | ||
61 | #if defined(CONFIG_MIPS_DB1550) | ||
62 | mips_machtype = MACH_DB1550; | ||
63 | #elif defined(CONFIG_MIPS_DB1500) | ||
64 | mips_machtype = MACH_DB1500; | ||
65 | #elif defined(CONFIG_MIPS_DB1100) | ||
66 | mips_machtype = MACH_DB1100; | ||
67 | #else | ||
68 | mips_machtype = MACH_DB1000; | ||
69 | #endif | ||
70 | |||
71 | prom_init_cmdline(); | 60 | prom_init_cmdline(); |
72 | 61 | ||
73 | memsize_str = prom_getenv("memsize"); | 62 | memsize_str = prom_getenv("memsize"); |
diff --git a/arch/mips/au1000/mtx-1/init.c b/arch/mips/au1000/mtx-1/init.c index cdeae3212a2d..e700fd312a24 100644 --- a/arch/mips/au1000/mtx-1/init.c +++ b/arch/mips/au1000/mtx-1/init.c | |||
@@ -54,8 +54,6 @@ void __init prom_init(void) | |||
54 | prom_argv = (char **) fw_arg1; | 54 | prom_argv = (char **) fw_arg1; |
55 | prom_envp = (char **) fw_arg2; | 55 | prom_envp = (char **) fw_arg2; |
56 | 56 | ||
57 | mips_machtype = MACH_MTX1; /* set the platform # */ | ||
58 | |||
59 | prom_init_cmdline(); | 57 | prom_init_cmdline(); |
60 | 58 | ||
61 | memsize_str = prom_getenv("memsize"); | 59 | memsize_str = prom_getenv("memsize"); |
diff --git a/arch/mips/au1000/pb1000/init.c b/arch/mips/au1000/pb1000/init.c index ddccaf6997d0..2515b9fb24af 100644 --- a/arch/mips/au1000/pb1000/init.c +++ b/arch/mips/au1000/pb1000/init.c | |||
@@ -52,8 +52,6 @@ void __init prom_init(void) | |||
52 | prom_argv = (char **) fw_arg1; | 52 | prom_argv = (char **) fw_arg1; |
53 | prom_envp = (char **) fw_arg2; | 53 | prom_envp = (char **) fw_arg2; |
54 | 54 | ||
55 | mips_machtype = MACH_PB1000; | ||
56 | |||
57 | prom_init_cmdline(); | 55 | prom_init_cmdline(); |
58 | memsize_str = prom_getenv("memsize"); | 56 | memsize_str = prom_getenv("memsize"); |
59 | if (!memsize_str) { | 57 | if (!memsize_str) { |
diff --git a/arch/mips/au1000/pb1100/init.c b/arch/mips/au1000/pb1100/init.c index c93fd39b4aba..490c3801c275 100644 --- a/arch/mips/au1000/pb1100/init.c +++ b/arch/mips/au1000/pb1100/init.c | |||
@@ -53,8 +53,6 @@ void __init prom_init(void) | |||
53 | prom_argv = (char **) fw_arg1; | 53 | prom_argv = (char **) fw_arg1; |
54 | prom_envp = (char **) fw_arg3; | 54 | prom_envp = (char **) fw_arg3; |
55 | 55 | ||
56 | mips_machtype = MACH_PB1100; | ||
57 | |||
58 | prom_init_cmdline(); | 56 | prom_init_cmdline(); |
59 | 57 | ||
60 | memsize_str = prom_getenv("memsize"); | 58 | memsize_str = prom_getenv("memsize"); |
diff --git a/arch/mips/au1000/pb1200/init.c b/arch/mips/au1000/pb1200/init.c index c251570749ee..069ed45f04f2 100644 --- a/arch/mips/au1000/pb1200/init.c +++ b/arch/mips/au1000/pb1200/init.c | |||
@@ -53,8 +53,6 @@ void __init prom_init(void) | |||
53 | prom_argv = (char **) fw_arg1; | 53 | prom_argv = (char **) fw_arg1; |
54 | prom_envp = (char **) fw_arg2; | 54 | prom_envp = (char **) fw_arg2; |
55 | 55 | ||
56 | mips_machtype = MACH_PB1200; | ||
57 | |||
58 | prom_init_cmdline(); | 56 | prom_init_cmdline(); |
59 | memsize_str = prom_getenv("memsize"); | 57 | memsize_str = prom_getenv("memsize"); |
60 | if (!memsize_str) { | 58 | if (!memsize_str) { |
diff --git a/arch/mips/au1000/pb1500/init.c b/arch/mips/au1000/pb1500/init.c index 507d4b204161..db558c967048 100644 --- a/arch/mips/au1000/pb1500/init.c +++ b/arch/mips/au1000/pb1500/init.c | |||
@@ -53,8 +53,6 @@ void __init prom_init(void) | |||
53 | prom_argv = (char **) fw_arg1; | 53 | prom_argv = (char **) fw_arg1; |
54 | prom_envp = (char **) fw_arg2; | 54 | prom_envp = (char **) fw_arg2; |
55 | 55 | ||
56 | mips_machtype = MACH_PB1500; | ||
57 | |||
58 | prom_init_cmdline(); | 56 | prom_init_cmdline(); |
59 | memsize_str = prom_getenv("memsize"); | 57 | memsize_str = prom_getenv("memsize"); |
60 | if (!memsize_str) { | 58 | if (!memsize_str) { |
diff --git a/arch/mips/au1000/pb1550/init.c b/arch/mips/au1000/pb1550/init.c index b03eee601e36..b716363ea564 100644 --- a/arch/mips/au1000/pb1550/init.c +++ b/arch/mips/au1000/pb1550/init.c | |||
@@ -53,8 +53,6 @@ void __init prom_init(void) | |||
53 | prom_argv = (char **) fw_arg1; | 53 | prom_argv = (char **) fw_arg1; |
54 | prom_envp = (char **) fw_arg2; | 54 | prom_envp = (char **) fw_arg2; |
55 | 55 | ||
56 | mips_machtype = MACH_PB1550; | ||
57 | |||
58 | prom_init_cmdline(); | 56 | prom_init_cmdline(); |
59 | memsize_str = prom_getenv("memsize"); | 57 | memsize_str = prom_getenv("memsize"); |
60 | if (!memsize_str) { | 58 | if (!memsize_str) { |
diff --git a/arch/mips/au1000/xxs1500/init.c b/arch/mips/au1000/xxs1500/init.c index 6532939f377a..7e6878c1b0a5 100644 --- a/arch/mips/au1000/xxs1500/init.c +++ b/arch/mips/au1000/xxs1500/init.c | |||
@@ -52,8 +52,6 @@ void __init prom_init(void) | |||
52 | prom_argv = (char **) fw_arg1; | 52 | prom_argv = (char **) fw_arg1; |
53 | prom_envp = (char **) fw_arg2; | 53 | prom_envp = (char **) fw_arg2; |
54 | 54 | ||
55 | mips_machtype = MACH_XXS1500; /* set the platform # */ | ||
56 | |||
57 | prom_init_cmdline(); | 55 | prom_init_cmdline(); |
58 | 56 | ||
59 | memsize_str = prom_getenv("memsize"); | 57 | memsize_str = prom_getenv("memsize"); |
diff --git a/arch/mips/basler/excite/excite_prom.c b/arch/mips/basler/excite/excite_prom.c index 2d752c2f6e59..68d8bc597e34 100644 --- a/arch/mips/basler/excite/excite_prom.c +++ b/arch/mips/basler/excite/excite_prom.c | |||
@@ -135,8 +135,6 @@ void __init prom_init(void) | |||
135 | #ifdef CONFIG_64BIT | 135 | #ifdef CONFIG_64BIT |
136 | # error 64 bit support not implemented | 136 | # error 64 bit support not implemented |
137 | #endif /* CONFIG_64BIT */ | 137 | #endif /* CONFIG_64BIT */ |
138 | |||
139 | mips_machtype = MACH_TITAN_EXCITE; | ||
140 | } | 138 | } |
141 | 139 | ||
142 | /* This is called from free_initmem(), so we need to provide it */ | 140 | /* This is called from free_initmem(), so we need to provide it */ |
diff --git a/arch/mips/gt64120/wrppmc/setup.c b/arch/mips/gt64120/wrppmc/setup.c index 51f6b7862460..728ef6a80edd 100644 --- a/arch/mips/gt64120/wrppmc/setup.c +++ b/arch/mips/gt64120/wrppmc/setup.c | |||
@@ -121,8 +121,6 @@ const char *get_system_type(void) | |||
121 | */ | 121 | */ |
122 | void __init prom_init(void) | 122 | void __init prom_init(void) |
123 | { | 123 | { |
124 | mips_machtype = MACH_WRPPMC; | ||
125 | |||
126 | add_memory_region(WRPPMC_SDRAM_SCS0_BASE, WRPPMC_SDRAM_SCS0_SIZE, BOOT_MEM_RAM); | 124 | add_memory_region(WRPPMC_SDRAM_SCS0_BASE, WRPPMC_SDRAM_SCS0_SIZE, BOOT_MEM_RAM); |
127 | add_memory_region(WRPPMC_BOOTROM_BASE, WRPPMC_BOOTROM_SIZE, BOOT_MEM_ROM_DATA); | 125 | add_memory_region(WRPPMC_BOOTROM_BASE, WRPPMC_BOOTROM_SIZE, BOOT_MEM_ROM_DATA); |
128 | 126 | ||
diff --git a/arch/mips/jmr3927/rbhma3100/init.c b/arch/mips/jmr3927/rbhma3100/init.c index b643f75ec9a5..700b9cf8eb9d 100644 --- a/arch/mips/jmr3927/rbhma3100/init.c +++ b/arch/mips/jmr3927/rbhma3100/init.c | |||
@@ -52,10 +52,6 @@ void __init prom_init(void) | |||
52 | puts("Warning: TX3927 TLB off\n"); | 52 | puts("Warning: TX3927 TLB off\n"); |
53 | #endif | 53 | #endif |
54 | 54 | ||
55 | #ifdef CONFIG_TOSHIBA_JMR3927 | ||
56 | mips_machtype = MACH_TOSHIBA_JMR3927; | ||
57 | #endif | ||
58 | |||
59 | prom_init_cmdline(); | 55 | prom_init_cmdline(); |
60 | add_memory_region(0, JMR3927_SDRAM_SIZE, BOOT_MEM_RAM); | 56 | add_memory_region(0, JMR3927_SDRAM_SIZE, BOOT_MEM_RAM); |
61 | } | 57 | } |
diff --git a/arch/mips/lemote/lm2e/prom.c b/arch/mips/lemote/lm2e/prom.c index 824336812198..7edc15dfed6c 100644 --- a/arch/mips/lemote/lm2e/prom.c +++ b/arch/mips/lemote/lm2e/prom.c | |||
@@ -57,8 +57,6 @@ void __init prom_init(void) | |||
57 | arg = (int *)fw_arg1; | 57 | arg = (int *)fw_arg1; |
58 | env = (int *)fw_arg2; | 58 | env = (int *)fw_arg2; |
59 | 59 | ||
60 | mips_machtype = MACH_LEMOTE_FULONG; | ||
61 | |||
62 | prom_init_cmdline(); | 60 | prom_init_cmdline(); |
63 | 61 | ||
64 | if ((strstr(arcs_cmdline, "console=")) == NULL) | 62 | if ((strstr(arcs_cmdline, "console=")) == NULL) |
diff --git a/arch/mips/philips/pnx8550/jbs/init.c b/arch/mips/philips/pnx8550/jbs/init.c index cfd90fa3d799..90b4d35f3ece 100644 --- a/arch/mips/philips/pnx8550/jbs/init.c +++ b/arch/mips/philips/pnx8550/jbs/init.c | |||
@@ -45,11 +45,8 @@ const char *get_system_type(void) | |||
45 | 45 | ||
46 | void __init prom_init(void) | 46 | void __init prom_init(void) |
47 | { | 47 | { |
48 | |||
49 | unsigned long memsize; | 48 | unsigned long memsize; |
50 | 49 | ||
51 | mips_machtype = MACH_PHILIPS_JBS; | ||
52 | |||
53 | //memsize = 0x02800000; /* Trimedia uses memory above */ | 50 | //memsize = 0x02800000; /* Trimedia uses memory above */ |
54 | memsize = 0x08000000; /* Trimedia uses memory above */ | 51 | memsize = 0x08000000; /* Trimedia uses memory above */ |
55 | add_memory_region(0, memsize, BOOT_MEM_RAM); | 52 | add_memory_region(0, memsize, BOOT_MEM_RAM); |
diff --git a/arch/mips/philips/pnx8550/stb810/prom_init.c b/arch/mips/philips/pnx8550/stb810/prom_init.c index fdb33ed089b9..832dd60b0a7a 100644 --- a/arch/mips/philips/pnx8550/stb810/prom_init.c +++ b/arch/mips/philips/pnx8550/stb810/prom_init.c | |||
@@ -41,8 +41,6 @@ void __init prom_init(void) | |||
41 | 41 | ||
42 | prom_init_cmdline(); | 42 | prom_init_cmdline(); |
43 | 43 | ||
44 | mips_machtype = MACH_PHILIPS_STB810; | ||
45 | |||
46 | memsize = 0x08000000; /* Trimedia uses memory above */ | 44 | memsize = 0x08000000; /* Trimedia uses memory above */ |
47 | add_memory_region(0, memsize, BOOT_MEM_RAM); | 45 | add_memory_region(0, memsize, BOOT_MEM_RAM); |
48 | } | 46 | } |
diff --git a/arch/mips/pmc-sierra/yosemite/prom.c b/arch/mips/pmc-sierra/yosemite/prom.c index 9b9936de6589..96d3ff051d3d 100644 --- a/arch/mips/pmc-sierra/yosemite/prom.c +++ b/arch/mips/pmc-sierra/yosemite/prom.c | |||
@@ -126,8 +126,6 @@ void __init prom_init(void) | |||
126 | env++; | 126 | env++; |
127 | } | 127 | } |
128 | 128 | ||
129 | mips_machtype = MACH_TITAN_YOSEMITE; | ||
130 | |||
131 | prom_grab_secondary(); | 129 | prom_grab_secondary(); |
132 | } | 130 | } |
133 | 131 | ||
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/prom.c b/arch/mips/tx4938/toshiba_rbtx4938/prom.c index 69f21c1b7942..1644bffa501a 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/prom.c +++ b/arch/mips/tx4938/toshiba_rbtx4938/prom.c | |||
@@ -47,7 +47,6 @@ void __init prom_init(void) | |||
47 | #ifndef CONFIG_TX4938_NAND_BOOT | 47 | #ifndef CONFIG_TX4938_NAND_BOOT |
48 | prom_init_cmdline(); | 48 | prom_init_cmdline(); |
49 | #endif | 49 | #endif |
50 | mips_machtype = MACH_TOSHIBA_RBTX4938; | ||
51 | 50 | ||
52 | msize = tx4938_get_mem_size(); | 51 | msize = tx4938_get_mem_size(); |
53 | add_memory_region(0, msize << 20, BOOT_MEM_RAM); | 52 | add_memory_region(0, msize << 20, BOOT_MEM_RAM); |
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/setup.c b/arch/mips/vr41xx/nec-cmbvr4133/setup.c index f14bea8daf90..7723d2011b08 100644 --- a/arch/mips/vr41xx/nec-cmbvr4133/setup.c +++ b/arch/mips/vr41xx/nec-cmbvr4133/setup.c | |||
@@ -64,8 +64,6 @@ static void __init nec_cmbvr4133_setup(void) | |||
64 | #endif | 64 | #endif |
65 | set_io_port_base(KSEG1ADDR(0x16000000)); | 65 | set_io_port_base(KSEG1ADDR(0x16000000)); |
66 | 66 | ||
67 | mips_machtype = MACH_NEC_CMBVR4133; | ||
68 | |||
69 | #ifdef CONFIG_PCI | 67 | #ifdef CONFIG_PCI |
70 | #ifdef CONFIG_ROCKHOPPER | 68 | #ifdef CONFIG_ROCKHOPPER |
71 | ali_m5229_preinit(); | 69 | ali_m5229_preinit(); |