i[amazon] use SYS_HAS_EARLY_PRINTK instead of prom_printf

SVN-Revision: 19459
master
Hauke Mehrtens 15 years ago
parent 6a78996e76
commit b74263a00c
  1. 18
      target/linux/amazon/files/arch/mips/amazon/prom.c
  2. 7
      target/linux/amazon/files/arch/mips/amazon/setup.c
  3. 8
      target/linux/amazon/files/drivers/serial/amazon_asc.c

@ -39,24 +39,6 @@ void prom_putchar(char c)
amazon_writel(c, AMAZON_ASC_TBUF);
}
void prom_printf(const char * fmt, ...)
{
va_list args;
int l;
char *p, *buf_end;
char buf[1024];
va_start(args, fmt);
/* FIXME - hopefully i < sizeof(buf) */
l = vsprintf(buf, fmt, args);
va_end(args);
buf_end = buf + l;
for (p = buf; p < buf_end; p++)
prom_putchar(*p);
}
void __init prom_init(void)
{
char **envp = (char **) fw_arg2;

@ -42,7 +42,6 @@ static unsigned int r4k_cur;
/* required in arch/mips/kernel/kspd.c */
unsigned long cpu_khz;
extern void prom_printf(const char * fmt, ...);
static void amazon_reboot_setup(void);
/* the CPU clock rate - lifted from u-boot */
@ -142,11 +141,11 @@ void __init plat_mem_setup(void)
part_no = AMAZON_MCD_CHIPID_PART_NUMBER_GET(chipid);
if(part_no == AMAZON_CHIPID_YANGTSE){
prom_printf("Yangtse Version\n");
printk("Yangtse Version\n");
} else if (part_no == AMAZON_CHIPID_STANDARD) {
prom_printf(SYSTEM_MODEL_NAME "\n");
printk(SYSTEM_MODEL_NAME "\n");
} else {
prom_printf("unknown version %8x\n",part_no);
printk("unknown version %8x\n",part_no);
}
amazon_reboot_setup();

@ -68,7 +68,6 @@
#define SERIAL_AMAZONASC_NR UART_NR
static void amazonasc_tx_chars(struct uart_port *port);
extern void prom_printf(const char * fmt, ...);
static struct uart_port amazonasc_ports[UART_NR];
static struct uart_driver amazonasc_reg;
static unsigned int uartclk = 0;
@ -658,13 +657,6 @@ static struct console amazonasc_console = {
data: &amazonasc_reg,
};
static int __init amazonasc_console_init(void)
{
register_console(&amazonasc_console);
return 0;
}
console_initcall(amazonasc_console_init);
static struct uart_driver amazonasc_reg = {
.owner = THIS_MODULE,
.driver_name = "serial",

Loading…
Cancel
Save