lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m68k: remove AP1000 code

Browse Source 
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>
This commit is contained in:
Adrian Bunk
2008-07-17 21:16:15 +02:00
committed by Linus Torvalds
parent b739912efc
commit d33b4432e6
4 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/m68k/sun3/prom/console.c
View File

@@ -104,8 +104,6 @@ prom_query_input_device()
return PROMDEV_ITTYB; return PROMDEV_ITTYB;
} }
return PROMDEV_I_UNK; return PROMDEV_I_UNK;
case PROM_AP1000:
return PROMDEV_I_UNK;
}; };
} }
#endif #endif
@@ -166,8 +164,6 @@ prom_query_output_device()
}; };
} }
break; break;
case PROM_AP1000:
return PROMDEV_I_UNK;
}; };
return PROMDEV_O_UNK; return PROMDEV_O_UNK;
} }

9
arch/m68k/sun3/prom/init.c
View File

@@ -31,11 +31,6 @@ extern void prom_ranges_init(void);
void __init prom_init(struct linux_romvec *rp) void __init prom_init(struct linux_romvec *rp)
{ {
#ifdef CONFIG_AP1000
extern struct linux_romvec *ap_prom_init(void);
rp = ap_prom_init();
#endif
romvec = rp; romvec = rp;
#ifndef CONFIG_SUN3 #ifndef CONFIG_SUN3
switch(romvec->pv_romvers) { switch(romvec->pv_romvers) {
@@ -53,10 +48,6 @@ void __init prom_init(struct linux_romvec *rp)
prom_printf("PROMLIB: Sun IEEE Prom not supported yet\n"); prom_printf("PROMLIB: Sun IEEE Prom not supported yet\n");
prom_halt(); prom_halt();
break; break;
case 42: /* why not :-) */
prom_vers = PROM_AP1000;
break;
default: default:
prom_printf("PROMLIB: Bad PROM version %d\n", prom_printf("PROMLIB: Bad PROM version %d\n",
romvec->pv_romvers); romvec->pv_romvers);

5
arch/m68k/sun3/prom/printf.c
View File

@@ -37,10 +37,6 @@ prom_printf(char *fmt, ...)
bptr = ppbuf; bptr = ppbuf;
#ifdef CONFIG_AP1000
ap_write(1,bptr,strlen(bptr));
#else
#ifdef CONFIG_KGDB #ifdef CONFIG_KGDB
if (kgdb_initialized) { if (kgdb_initialized) {
printk("kgdb_initialized = %d\n", kgdb_initialized); printk("kgdb_initialized = %d\n", kgdb_initialized);
@@ -53,7 +49,6 @@ prom_printf(char *fmt, ...)
prom_putchar(ch); prom_putchar(ch);
} }
#endif
#endif #endif
va_end(args); va_end(args);
return; return;

1
include/asm-m68k/oplib.h
View File

@@ -19,7 +19,6 @@ enum prom_major_version {
PROM_V2, /* sun4c and early sun4m V2 prom */ PROM_V2, /* sun4c and early sun4m V2 prom */
PROM_V3, /* sun4m and later, up to sun4d/sun4e machines V3 */ PROM_V3, /* sun4m and later, up to sun4d/sun4e machines V3 */
PROM_P1275, /* IEEE compliant ISA based Sun PROM, only sun4u */ PROM_P1275, /* IEEE compliant ISA based Sun PROM, only sun4u */
PROM_AP1000, /* actually no prom at all */
}; };
extern enum prom_major_version prom_vers; extern enum prom_major_version prom_vers;