linux-mips-commits

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/galileo-boards/ev96100
In directory usw-pr-cvs1:/tmp/cvs-serv13548/arch/mips/galileo-boards/ev96100

Modified Files:
	init.c irq.c setup.c time.c 
Log Message:
Sync to 2.4.7



Index: init.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/galileo-boards/ev96100/init.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** init.c	2001/07/06 01:25:33	1.2
--- init.c	2001/08/25 02:19:27	1.3
***************
*** 44,52 ****
  
  
- int prom_argc;
- char **prom_argv, **prom_envp;
- char arcs_cmdline[COMMAND_LINE_SIZE];
- 
  /* Environment variable */
  typedef struct {
  	char *name;
--- 44,49 ----
  
  
  /* Environment variable */
+ 
  typedef struct {
  	char *name;
***************
*** 54,86 ****
  } t_env_var;
  
  
  int init_debug = 0;
  
- char * __init prom_getcmdline(void)
- {
- 	return &(arcs_cmdline[0]);
- }
- 
- void  __init prom_init_cmdline(void)
- {
- 	char *cp;
- 	int actr;
- 
- 	actr = 1; /* Always ignore argv[0] */
- 
- 	cp = &(arcs_cmdline[0]);
- 	while(actr < prom_argc) {
- 	        strcpy(cp, prom_argv[actr]);
- 		cp += strlen(prom_argv[actr]);
- 		*cp++ = ' ';
- 		actr++;
- 	}
- 	if (cp != &(arcs_cmdline[0])) /* get rid of trailing space */
- 		--cp;
- 	*cp = '\0';
- }
- 
- void prom_free_prom_memory (void) {};
- 
  char *prom_getenv(char *envname)
  {
--- 51,59 ----
  } t_env_var;
  
+ int prom_argc;
+ char **prom_argv, **prom_envp;
  
  int init_debug = 0;
  
  char *prom_getenv(char *envname)
  {
***************
*** 150,172 ****
  }
  
- unsigned long __init prom_get_memsize(void)
- {
- 	char *memsize_str;
- 	unsigned int memsize;
- 
- 	memsize_str = prom_getenv("memsize");
- 	if (!memsize_str) {
- 		memsize = 32; /* set to 32 MB */
- 	} else {
- #ifdef DEBUG
- 		printk("prom_memsize: %s\n", memsize_str);
- #endif
- 		memsize = simple_strtol(memsize_str, NULL, 0);
- 	}
- 	return memsize;
- }
  
  void __init prom_init(int argc, char **argv, char **envp, int *prom_vec)
  {
  	prom_argc = argc;
  	prom_argv = argv;
--- 123,132 ----
  }
  
  
  void __init prom_init(int argc, char **argv, char **envp, int *prom_vec)
  {
+ 	volatile unsigned char *uart;
+ 	char ppbuf[8];
+ 
  	prom_argc = argc;
  	prom_argv = argv;

Index: irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/galileo-boards/ev96100/irq.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** irq.c	2001/08/22 18:18:13	1.4
--- irq.c	2001/08/25 02:19:27	1.5
***************
*** 65,69 ****
  extern void mips_timer_interrupt(int irq, struct pt_regs *regs);
  extern asmlinkage void ev96100IRQ(void);
- irq_cpustat_t irq_stat [NR_CPUS];
  unsigned int local_bh_count[NR_CPUS];
  unsigned int local_irq_count[NR_CPUS];
--- 65,68 ----

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/galileo-boards/ev96100/setup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** setup.c	2001/07/06 01:25:33	1.2
--- setup.c	2001/08/25 02:19:27	1.3
***************
*** 71,79 ****
  extern struct rtc_ops no_rtc_ops;
  extern struct resource ioport_resource;
- extern char *prom_getenv(char *envname);
  
! void rm7000_wbflush(void)
  {
!     __asm__ __volatile__ ("sync");
  }
  
--- 71,78 ----
  extern struct rtc_ops no_rtc_ops;
  extern struct resource ioport_resource;
  
! static void rm7000_wbflush(void)
  {
! 	 __asm__ __volatile__ ("sync");
  }
  
***************
*** 89,92 ****
--- 88,92 ----
  	char *argptr;
  
+ 	clear_cp0_status(ST0_FR);
          __wbflush = rm7000_wbflush;
  
***************
*** 169,173 ****
  	}
  #endif
- 
  
  	board_time_init = ev96100_time_init;
--- 169,172 ----

Index: time.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/galileo-boards/ev96100/time.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** time.c	2001/08/22 00:39:54	1.3
--- time.c	2001/08/25 02:19:27	1.4
***************
*** 119,123 ****
  
          /* FIX ME */
! 	set_cp0_status(IE_IRQ5);
  }
  
--- 119,123 ----
  
          /* FIX ME */
! 	change_cp0_status(ST0_IM, IE_IRQ5);
  }
  
***************
*** 261,268 ****
  
  	do {
- 		count = read_32bit_cp0_register(CP0_COUNT);
- 		timerhi += (count < timerlo);   /* Wrap around */
- 		timerlo = count;
- 
  		kstat.irqs[0][irq]++;
  		do_timer(regs);
--- 261,264 ----