[Linux-mips-commits]CVS: linux/arch/mips/au1000/pb1000 setup.c,1.4,1.5

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

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/pb1000
In directory usw-pr-cvs1:/tmp/cvs-serv13548/arch/mips/au1000/pb1000

Modified Files:
	setup.c 
Log Message:
Sync to 2.4.7



Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1000/setup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** setup.c	2001/08/23 17:20:04	1.4
--- setup.c	2001/08/25 02:19:27	1.5
***************
*** 63,69 ****
  extern void au1000_halt(void);
  extern void au1000_power_off(void);
- extern struct resource ioport_resource;
- extern struct resource iomem_resource;
  
  
  void au1000_wbflush(void)
--- 63,84 ----
  extern void au1000_halt(void);
  extern void au1000_power_off(void);
  
+ struct {
+     struct resource ram;
+     struct resource io;
+     struct resource sram;
+     struct resource flash;
+     struct resource boot;
+     struct resource pcmcia;
+     struct resource lcd;
+ } au1000_resources = {
+     { "RAM",           0,          0x3FFFFFF,  IORESOURCE_MEM },
+     { "I/O",           0x10000000, 0x119FFFFF                 },
+     { "SRAM",          0x1e000000, 0x1E03FFFF                 },
+     { "System Flash",  0x1F800000, 0x1FBFFFFF                 },
+     { "Boot ROM",      0x1FC00000, 0x1FFFFFFF                 },
+     { "PCMCIA",        0x20000000, 0x27FFFFFF                 },
+     { "LCD",           0x60000000, 0x603FFFFF                 },
+ };
  
  void au1000_wbflush(void)
***************
*** 80,84 ****
  
  #ifdef CONFIG_AU1000_SERIAL_CONSOLE
! 	if ((argptr = strstr(argptr, "console=")) == NULL) {
  		argptr = prom_getcmdline();
  		strcat(argptr, " console=ttyS0,115200");
--- 95,99 ----
  
  #ifdef CONFIG_AU1000_SERIAL_CONSOLE
! 	if ((argptr = strstr(argptr, "console=ttyS0")) == NULL) {
  		argptr = prom_getcmdline();
  		strcat(argptr, " console=ttyS0,115200");
***************
*** 95,103 ****
  	 * IO/MEM resources. 
  	 */
! 	mips_io_port_base = 0;
! 	ioport_resource.start = 0;
! 	ioport_resource.end = 0xffffffff;
! 	iomem_resource.start = 0;
! 	ioport_resource.end = 0xffffffff;
  
  #ifdef CONFIG_BLK_DEV_INITRD
--- 110,116 ----
  	 * IO/MEM resources. 
  	 */
! 	mips_io_port_base = KSEG1;
! 	ioport_resource.start = au1000_resources.io.start;
! 	ioport_resource.end = au1000_resources.lcd.end;
  
  #ifdef CONFIG_BLK_DEV_INITRD