Commit d33b4432e634246eef00ef4d425939c253f70dd6
Committed by
Linus Torvalds
Linus Torvalds
1 parent
b739912efc
Exists in
master
and in
7 other branches
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>
Showing 4 changed files with 0 additions and 19 deletions Side-by-side Diff
arch/m68k/sun3/prom/console.c
| ... | ... | @@ -104,8 +104,6 @@ |
| 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 |
| ... | ... | @@ -166,8 +164,6 @@ |
| 166 | 164 | }; |
| 167 | 165 | } |
| 168 | 166 | break; |
| 169 | - case PROM_AP1000: | |
| 170 | - return PROMDEV_I_UNK; | |
| 171 | 167 | }; |
| 172 | 168 | return PROMDEV_O_UNK; |
| 173 | 169 | } |
arch/m68k/sun3/prom/init.c
| ... | ... | @@ -31,11 +31,6 @@ |
| 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) { |
| ... | ... | @@ -53,10 +48,6 @@ |
| 53 | 48 | prom_printf("PROMLIB: Sun IEEE Prom not supported yet\n"); |
| 54 | 49 | prom_halt(); |
| 55 | 50 | break; |
| 56 | - case 42: /* why not :-) */ | |
| 57 | - prom_vers = PROM_AP1000; | |
| 58 | - break; | |
| 59 | - | |
| 60 | 51 | default: |
| 61 | 52 | prom_printf("PROMLIB: Bad PROM version %d\n", |
| 62 | 53 | romvec->pv_romvers); |
arch/m68k/sun3/prom/printf.c
| ... | ... | @@ -37,10 +37,6 @@ |
| 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); |
| ... | ... | @@ -53,7 +49,6 @@ |
| 53 | 49 | |
| 54 | 50 | prom_putchar(ch); |
| 55 | 51 | } |
| 56 | -#endif | |
| 57 | 52 | #endif |
| 58 | 53 | va_end(args); |
| 59 | 54 | return; |
include/asm-m68k/oplib.h
| ... | ... | @@ -19,7 +19,6 @@ |
| 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; |