Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4131/casio-be300
In directory usw-pr-cvs1:/tmp/cvs-serv7883
Modified Files:
setup.c
Log Message:
More cleanups. Play with new API better.
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4131/casio-be300/setup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setup.c 9 Mar 2002 01:28:02 -0000 1.2
+++ setup.c 9 Mar 2002 02:14:39 -0000 1.3
@@ -14,17 +14,17 @@
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/console.h>
+#include <linux/ide.h>
+#include <linux/ioport.h>
#include <asm/vr41xx.h>
#include <asm/reboot.h>
#include <asm/time.h>
-extern void vr4122_restart(char *command);
-extern void vr4122_halt(void);
-extern void vr4122_power_off(void);
-
-extern void vr4122_time_init(void);
-extern void vr4122_timer_setup(struct irqaction *irq);
+#ifdef CONFIG_BLK_DEV_INITRD
+extern unsigned long initrd_start, initrd_end;
+extern void *__rd_start, *__rd_end;
+#endif
void __init bus_error_init(void)
{
@@ -32,15 +32,33 @@
void __init nec_vr41xx_setup(void)
{
- _machine_restart = vr4122_restart;
- _machine_halt = vr4122_halt;
- _machine_power_off = vr4122_power_off;
+ _machine_restart = vr41xx_restart;
+ _machine_halt = vr41xx_halt;
+ _machine_power_off = vr41xx_power_off;
- board_time_init = vr4122_time_init;
- board_timer_setup = vr4122_timer_setup;
+ board_time_init = vr41xx_time_init;
+ board_timer_setup = vr41xx_timer_setup;
+
+#ifdef CONFIG_BLK_DEV_INITRD
+ ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
+ initrd_start = (unsigned long)&__rd_start;
+ initrd_end = (unsigned long)&__rd_end;
+#endif
+
+#ifdef CONFIG_BLK_DEV_IDE
+ ide_ops = &std_ide_ops;
+#endif
#ifdef CONFIG_FB
conswitchp = &dummy_con;
+#endif
+
+ vr41xx_bcu_init();
+
+ vr41xx_siu_init(1, SIU_RS232C, 0);
+
+#ifdef CONFIG_PCI
+ vr41xx_pciu_init();
#endif
}
|
