Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

m68k: remove AP1000 code

Unless I miss something that's code for a sparc machine even the sparc
code no longer supports that got copied to m68k when these files were
copied.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Adrian Bunk and committed by
Linus Torvalds
d33b4432 b739912e

-19
-4
arch/m68k/sun3/prom/console.c
··· 104 104 return PROMDEV_ITTYB; 105 105 } 106 106 return PROMDEV_I_UNK; 107 - case PROM_AP1000: 108 - return PROMDEV_I_UNK; 109 107 }; 110 108 } 111 109 #endif ··· 164 166 }; 165 167 } 166 168 break; 167 - case PROM_AP1000: 168 - return PROMDEV_I_UNK; 169 169 }; 170 170 return PROMDEV_O_UNK; 171 171 }
-9
arch/m68k/sun3/prom/init.c
··· 31 31 32 32 void __init prom_init(struct linux_romvec *rp) 33 33 { 34 - #ifdef CONFIG_AP1000 35 - extern struct linux_romvec *ap_prom_init(void); 36 - rp = ap_prom_init(); 37 - #endif 38 - 39 34 romvec = rp; 40 35 #ifndef CONFIG_SUN3 41 36 switch(romvec->pv_romvers) { ··· 48 53 prom_printf("PROMLIB: Sun IEEE Prom not supported yet\n"); 49 54 prom_halt(); 50 55 break; 51 - case 42: /* why not :-) */ 52 - prom_vers = PROM_AP1000; 53 - break; 54 - 55 56 default: 56 57 prom_printf("PROMLIB: Bad PROM version %d\n", 57 58 romvec->pv_romvers);
-5
arch/m68k/sun3/prom/printf.c
··· 37 37 38 38 bptr = ppbuf; 39 39 40 - #ifdef CONFIG_AP1000 41 - ap_write(1,bptr,strlen(bptr)); 42 - #else 43 - 44 40 #ifdef CONFIG_KGDB 45 41 if (kgdb_initialized) { 46 42 printk("kgdb_initialized = %d\n", kgdb_initialized); ··· 49 53 50 54 prom_putchar(ch); 51 55 } 52 - #endif 53 56 #endif 54 57 va_end(args); 55 58 return;
-1
include/asm-m68k/oplib.h
··· 19 19 PROM_V2, /* sun4c and early sun4m V2 prom */ 20 20 PROM_V3, /* sun4m and later, up to sun4d/sun4e machines V3 */ 21 21 PROM_P1275, /* IEEE compliant ISA based Sun PROM, only sun4u */ 22 - PROM_AP1000, /* actually no prom at all */ 23 22 }; 24 23 25 24 extern enum prom_major_version prom_vers;