patch-2.4.20 linux-2.4.20/arch/mips/arc/init.c
Next file: linux-2.4.20/arch/mips/arc/memory.c
Previous file: linux-2.4.20/arch/mips/arc/identify.c
Back to the patch index
Back to the overall index
- Lines: 57
- Date:
Thu Nov 28 15:53:09 2002
- Orig file:
linux-2.4.19/arch/mips/arc/init.c
- Orig date:
Fri Aug 2 17:39:43 2002
diff -urN linux-2.4.19/arch/mips/arc/init.c linux-2.4.20/arch/mips/arc/init.c
@@ -1,5 +1,5 @@
/*
- * This file is subject to the terms and conditions of the GNU General Public+
+ * This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
@@ -17,20 +17,15 @@
/* Master romvec interface. */
struct linux_romvec *romvec;
int prom_argc;
-char **prom_argv, **prom_envp;
-
-extern void prom_testtree(void);
+LONG *_prom_argv, *_prom_envp;
void __init prom_init(int argc, char **argv, char **envp, int *prom_vec)
{
- PSYSTEM_PARAMETER_BLOCK pb;
- unsigned short prom_vers, prom_rev;
-
+ PSYSTEM_PARAMETER_BLOCK pb = PROMBLOCK;
romvec = ROMVECTOR;
- pb = PROMBLOCK;
prom_argc = argc;
- prom_argv = argv;
- prom_envp = envp;
+ _prom_argv = (LONG *) argv;
+ _prom_envp = (LONG *) envp;
if (pb->magic != 0x53435241) {
prom_printf("Aieee, bad prom vector magic %08lx\n", pb->magic);
@@ -39,19 +34,14 @@
}
prom_init_cmdline();
-
- prom_vers = pb->ver;
- prom_rev = pb->rev;
prom_identify_arch();
- printk("PROMLIB: ARC firmware Version %d Revision %d\n",
- prom_vers, prom_rev);
+ printk(KERN_INFO "PROMLIB: ARC firmware Version %d Revision %d\n",
+ pb->ver, pb->rev);
prom_meminit();
#ifdef DEBUG_PROM_INIT
- {
- prom_printf("Press a key to reboot\n");
- (void) prom_getchar();
- romvec->imode();
- }
+ prom_printf("Press a key to reboot\n");
+ prom_getchar();
+ ArcEnterInteractiveMode();
#endif
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)