aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/powertv
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2012-09-06 05:18:35 -0400
committerRalf Baechle <ralf@linux-mips.org>2012-12-13 12:15:28 -0500
commitae1242a546704dfd5c35f26cc1bf401b0aac9c70 (patch)
tree91f0a2db02270e56a3498f88d6f4a65d20072a99 /arch/mips/powertv
parent686957e71d34beffe2b29cf5fb2e05025972020b (diff)
MIPS: PowerTV: Fix build.
CC arch/mips/powertv/init.o /home/ralf/src/linux/linux-mips/arch/mips/powertv/init.c: In function ‘mips_nmi_setup’: /home/ralf/src/linux/linux-mips/arch/mips/powertv/init.c:80:8: error: variable ‘base’ set but not used [-Werror=unused-but-set-variable] /home/ralf/src/linux/linux-mips/arch/mips/powertv/init.c: In function ‘mips_ejtag_setup’: /home/ralf/src/linux/linux-mips/arch/mips/powertv/init.c:94:8: error: variable ‘base’ set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors As these two functions are, they don't serve any useful purpose so I've deleted them entirely. This warning exists in gcc 4.6.0 and newer. Kernels 2.6.40 and newer use -Wunused-but-set-variable to suppress it. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/powertv')
-rw-r--r--arch/mips/powertv/init.c37
1 files changed, 0 insertions, 37 deletions
diff --git a/arch/mips/powertv/init.c b/arch/mips/powertv/init.c
index 1cf5abbef715..c6979353980b 100644
--- a/arch/mips/powertv/init.c
+++ b/arch/mips/powertv/init.c
@@ -69,40 +69,6 @@ char *prom_getenv(char *envname)
69 return result; 69 return result;
70} 70}
71 71
72/* TODO: Verify on linux-mips mailing list that the following two */
73/* functions are correct */
74/* TODO: Copy NMI and EJTAG exception vectors to memory from the */
75/* BootROM exception vectors. Flush their cache entries. test it. */
76
77static void __init mips_nmi_setup(void)
78{
79 void *base;
80#if defined(CONFIG_CPU_MIPS32_R1)
81 base = cpu_has_veic ?
82 (void *)(CAC_BASE + 0xa80) :
83 (void *)(CAC_BASE + 0x380);
84#elif defined(CONFIG_CPU_MIPS32_R2)
85 base = (void *)0xbfc00000;
86#else
87#error NMI exception handler address not defined
88#endif
89}
90
91static void __init mips_ejtag_setup(void)
92{
93 void *base;
94
95#if defined(CONFIG_CPU_MIPS32_R1)
96 base = cpu_has_veic ?
97 (void *)(CAC_BASE + 0xa00) :
98 (void *)(CAC_BASE + 0x300);
99#elif defined(CONFIG_CPU_MIPS32_R2)
100 base = (void *)0xbfc00480;
101#else
102#error EJTAG exception handler address not defined
103#endif
104}
105
106void __init prom_init(void) 72void __init prom_init(void)
107{ 73{
108 int prom_argc; 74 int prom_argc;
@@ -113,9 +79,6 @@ void __init prom_init(void)
113 _prom_envp = (int *) fw_arg2; 79 _prom_envp = (int *) fw_arg2;
114 _prom_memsize = (unsigned long) fw_arg3; 80 _prom_memsize = (unsigned long) fw_arg3;
115 81
116 board_nmi_handler_setup = mips_nmi_setup;
117 board_ejtag_handler_setup = mips_ejtag_setup;
118
119 if (prom_argc == 1) { 82 if (prom_argc == 1) {
120 strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE); 83 strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE);
121 strlcat(arcs_cmdline, prom_argv, COMMAND_LINE_SIZE); 84 strlcat(arcs_cmdline, prom_argv, COMMAND_LINE_SIZE);