Merge with Linux 2.3.43.

7 files changed, 7 insertions, 57 deletions

diff --git a/arch/sparc/prom/bootstr.c b/arch/sparc/prom/bootstr.c
index 5edcad9d2..a4a040ca2 100644
--- a/arch/sparc/prom/bootstr.c
+++ b/arch/sparc/prom/bootstr.c
@@ -1,4 +1,4 @@
-/* $Id: bootstr.c,v 1.18 1999/08/31 06:54:45 davem Exp $
+/* $Id: bootstr.c,v 1.19 2000/01/29 01:09:11 anton Exp $
  * bootstr.c:  Boot string/argument acquisition from the PROM.
  *
  * Copyright(C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -55,11 +55,6 @@ prom_getbootargs(void)
 		 */
 		strncpy(barg_buf, *romvec->pv_v2bootargs.bootargs, BARG_LEN-1);
 		break;
-        case PROM_AP1000:
-#if CONFIG_AP1000
-                ap_getbootargs(barg_buf, BARG_LEN);
-                break;
-#endif
 	default:
 		break;
 	}
diff --git a/arch/sparc/prom/console.c b/arch/sparc/prom/console.c
index 4a1a42309..2305dc858 100644
--- a/arch/sparc/prom/console.c
+++ b/arch/sparc/prom/console.c
@@ -1,4 +1,4 @@
-/* $Id: console.c,v 1.20 1998/09/21 05:05:50 jj Exp $
+/* $Id: console.c,v 1.21 2000/01/29 01:09:12 anton Exp $
  * console.c: Routines that deal with sending and receiving IO
  *            to/from the current console device using the PROM.
  *
@@ -45,7 +45,6 @@ prom_nbgetchar(void)
 			i = -1;
 		}
 		break;
-	case PROM_AP1000:
 	default:
 		i = -1;
 		break;
@@ -79,15 +78,6 @@ prom_nbputchar(char c)
 		else
 			i = -1;
 		break;
-	case PROM_AP1000:
-#if CONFIG_AP1000
-		{
-		  extern void ap_putchar(char );
-		  ap_putchar(c);
-		  i = 0;
-		}
-#endif
-		break;
 	default:
 		i = -1;
 		break;
@@ -160,8 +150,6 @@ prom_query_input_device()
 				return PROMDEV_ITTYB;
 		}
 		return PROMDEV_I_UNK;
-	case PROM_AP1000:
-		return PROMDEV_I_UNK;
 	}
 }
 
@@ -219,7 +207,6 @@ prom_query_output_device()
 			};
 		}
 		break;
-	case PROM_AP1000:
 	default:
 	}
 	return PROMDEV_O_UNK;
diff --git a/arch/sparc/prom/devops.c b/arch/sparc/prom/devops.c
index c273b9922..5a58efa0b 100644
--- a/arch/sparc/prom/devops.c
+++ b/arch/sparc/prom/devops.c
@@ -1,4 +1,4 @@
-/* $Id: devops.c,v 1.11 1998/03/09 14:04:24 jj Exp $
+/* $Id: devops.c,v 1.12 2000/01/29 01:09:12 anton Exp $
  * devops.c:  Device operations using the PROM.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -31,7 +31,6 @@ prom_devopen(char *dstr)
 	case PROM_V3:
 		handle = (*(romvec->pv_v2devops.v2_dev_open))(dstr);
 		break;
-        case PROM_AP1000:
 	default:
 		handle = -1;
 		break;
@@ -56,7 +55,6 @@ prom_devclose(int dhandle)
 	case PROM_V3:
 		(*(romvec->pv_v2devops.v2_dev_close))(dhandle);
 		break;
-        case PROM_AP1000:
 	default:
 		break;
 	};
@@ -81,7 +79,6 @@ prom_seek(int dhandle, unsigned int seekhi, unsigned int seeklo)
 	case PROM_V3:
 		(*(romvec->pv_v2devops.v2_dev_seek))(dhandle, seekhi, seeklo);
 		break;
-        case PROM_AP1000:
 	default:
 		break;
 	};
diff --git a/arch/sparc/prom/init.c b/arch/sparc/prom/init.c
index 0802a97e5..b83409c81 100644
--- a/arch/sparc/prom/init.c
+++ b/arch/sparc/prom/init.c
@@ -1,4 +1,4 @@
-/* $Id: init.c,v 1.13 1999/08/31 06:54:45 davem Exp $
+/* $Id: init.c,v 1.14 2000/01/29 01:09:12 anton Exp $
  * init.c:  Initialize internal variables used by the PROM
  *          library functions.
  *
@@ -41,10 +41,6 @@ void __init prom_init(struct linux_romvec *rp)
 	extern struct linux_romvec *sun4_prom_init(void);
 	rp = sun4_prom_init();
 #endif
-#if CONFIG_AP1000
-	extern struct linux_romvec *ap_prom_init(void);
-	rp = ap_prom_init();
-#endif
 	romvec = rp;
 
 	switch(romvec->pv_romvers) {
@@ -60,10 +56,6 @@ void __init prom_init(struct linux_romvec *rp)
 	case 40:
 		prom_vers = PROM_SUN4;
 		break;
-	case 42: /* why not :-) */
-		prom_vers = PROM_AP1000;
-		break;
-
 	default:
 		prom_printf("PROMLIB: Bad PROM version %d\n",
 			    romvec->pv_romvers);
diff --git a/arch/sparc/prom/memory.c b/arch/sparc/prom/memory.c
index c2f311df6..5480edb9c 100644
--- a/arch/sparc/prom/memory.c
+++ b/arch/sparc/prom/memory.c
@@ -1,4 +1,4 @@
-/* $Id: memory.c,v 1.14 1999/08/31 06:54:46 davem Exp $
+/* $Id: memory.c,v 1.15 2000/01/29 01:09:12 anton Exp $
  * memory.c: Prom routine for acquiring various bits of information
  *           about RAM on the machine, both virtual and physical.
  *
@@ -194,19 +194,6 @@ void __init prom_meminit(void)
 #endif
 		break;
 
-        case PROM_AP1000:
-#if CONFIG_AP1000
-		/* really simple memory map */
-		prom_phys_total[0].start_adr = 0x00000000;
-		prom_phys_total[0].num_bytes = ap_memory_size();
-		prom_phys_total[0].theres_more = 0x0;
-		prom_prom_taken[0].start_adr = 0x00000000; 
-		prom_prom_taken[0].num_bytes = 0x00000000;
-		prom_prom_taken[0].theres_more = 0x0;
-		prom_phys_avail[0].start_adr = 0x00000000;
-		prom_phys_avail[0].num_bytes = prom_phys_total[0].num_bytes;
-		prom_phys_avail[0].theres_more = 0x0;
-#endif
 	default:
 		break;
 	};
diff --git a/arch/sparc/prom/mp.c b/arch/sparc/prom/mp.c
index 2346e3564..ba624673f 100644
--- a/arch/sparc/prom/mp.c
+++ b/arch/sparc/prom/mp.c
@@ -1,4 +1,4 @@
-/* $Id: mp.c,v 1.10 1998/03/09 14:04:26 jj Exp $
+/* $Id: mp.c,v 1.11 2000/01/29 01:09:12 anton Exp $
  * mp.c:  OpenBoot Prom Multiprocessor support routines.  Don't call
  *        these on a UP or else you will halt and catch fire. ;)
  *
@@ -29,7 +29,6 @@ prom_startcpu(int cpunode, struct linux_prom_registers *ctable_reg, int ctx, cha
 	switch(prom_vers) {
 	case PROM_V0:
 	case PROM_V2:
-	case PROM_AP1000:
 	default:
 		ret = -1;
 		break;
@@ -56,7 +55,6 @@ prom_stopcpu(int cpunode)
 	switch(prom_vers) {
 	case PROM_V0:
 	case PROM_V2:
-	case PROM_AP1000:
 	default:
 		ret = -1;
 		break;
@@ -83,7 +81,6 @@ prom_idlecpu(int cpunode)
 	switch(prom_vers) {
 	case PROM_V0:
 	case PROM_V2:
-	case PROM_AP1000:
 	default:
 		ret = -1;
 		break;
@@ -110,7 +107,6 @@ prom_restartcpu(int cpunode)
 	switch(prom_vers) {
 	case PROM_V0:
 	case PROM_V2:
-	case PROM_AP1000:
 	default:
 		ret = -1;
 		break;
diff --git a/arch/sparc/prom/printf.c b/arch/sparc/prom/printf.c
index 72a6cd6cc..24ac381a8 100644
--- a/arch/sparc/prom/printf.c
+++ b/arch/sparc/prom/printf.c
@@ -1,4 +1,4 @@
-/* $Id: printf.c,v 1.5 1996/04/04 16:31:07 tridge Exp $
+/* $Id: printf.c,v 1.6 2000/01/29 01:09:12 anton Exp $
  * printf.c:  Internal prom library printf facility.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -28,16 +28,12 @@ prom_printf(char *fmt, ...)
 
 	bptr = ppbuf;
 
-#if CONFIG_AP1000
-        ap_write(1,bptr,strlen(bptr));
-#else
 	while((ch = *(bptr++)) != 0) {
 		if(ch == '\n')
 			prom_putchar('\r');
 
 		prom_putchar(ch);
 	}
-#endif
 	va_end(args);
 	return;
 }