patch-2.1.17 linux/arch/sparc/prom/init.c

• Lines: 37
• Date: Thu Dec 19 11:03:33 1996
• Orig file: v2.1.16/linux/arch/sparc/prom/init.c
• Orig date: Wed Dec 18 15:58:46 1996

diff -u --recursive --new-file v2.1.16/linux/arch/sparc/prom/init.c linux/arch/sparc/prom/init.c
@@ -1,4 +1,4 @@
-/* $Id: init.c,v 1.8 1996/11/13 05:10:06 davem Exp $
+/* $Id: init.c,v 1.9 1996/12/18 06:46:55 tridge Exp $
  * init.c:  Initialize internal variables used by the PROM
  *          library functions.
  *
@@ -32,14 +32,13 @@
 
 __initfunc(void prom_init(struct linux_romvec *rp))
 {
-	romvec = rp;
-
 #if CONFIG_AP1000
-        prom_vers = PROM_AP1000;
-        prom_meminit();
-        prom_ranges_init();
-	return;
+	extern struct linux_romvec *ap_prom_init(void);
+	rp = ap_prom_init();
 #endif
+
+	romvec = rp;
+
 	switch(romvec->pv_romvers) {
 	case 0:
 		prom_vers = PROM_V0;
@@ -55,6 +54,10 @@
 		prom_printf("PROMLIB: Sun IEEE Prom not supported yet\n");
 		prom_halt();
 		break;
+	case 42: /* why not :-) */
+		prom_vers = PROM_AP1000;
+		break;
+
 	default:
 		prom_printf("PROMLIB: Bad PROM version %d\n",
 			    romvec->pv_romvers);