Update of /cvsroot/linux-mips/linux/arch/mips/au1000/hyd1100
In directory usw-pr-cvs1:/tmp/cvs-serv1799/arch/mips/au1000/hyd1100
Modified Files:
setup.c
Log Message:
Split up the Pb board and Au CPU dependencies properly.
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/hyd1100/setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setup.c 25 Sep 2002 07:38:58 -0000 1.1
+++ setup.c 26 Sep 2002 05:39:39 -0000 1.2
@@ -46,7 +46,7 @@
#include <asm/au1000.h>
#include <asm/hyd1100.h>
-#if defined(CONFIG_AU1000_SERIAL_CONSOLE)
+#if defined(CONFIG_AU1X00_SERIAL_CONSOLE)
extern void console_setup(char *, int *);
char serial_console[20];
#endif
@@ -79,7 +79,7 @@
__asm__ volatile ("sync");
}
-void __init au1100_setup(void)
+void __init au1x00_setup(void)
{
char *argptr;
u32 pin_func, static_cfg0;
@@ -92,7 +92,7 @@
/* Various early Au1000 Errata corrected by this */
/* set_cp0_config(1<<19);*/ /* Config[OD] */
-#ifdef CONFIG_AU1000_SERIAL_CONSOLE
+#ifdef CONFIG_AU1X00_SERIAL_CONSOLE
if ((argptr = strstr(argptr, "console=")) == NULL) {
argptr = prom_getcmdline();
strcat(argptr, " console=ttyS0,115200");
@@ -127,7 +127,7 @@
writel(0, SYS_PINSTATERD);
udelay(100);
-#if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1000_USB_DEVICE)
+#if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
#ifdef CONFIG_USB_OHCI
if ((argptr = strstr(argptr, "usb_ohci=")) == NULL) {
char usb_args[80];
@@ -167,12 +167,12 @@
// get USB Functionality pin state (device vs host drive pins)
pin_func = readl(SYS_PINFUNC) & (u32)(~0x8000);
-#ifndef CONFIG_AU1000_USB_DEVICE
+#ifndef CONFIG_AU1X00_USB_DEVICE
// 2nd USB port is USB host
pin_func |= 0x8000;
#endif
writel(pin_func, SYS_PINFUNC);
-#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1000_USB_DEVICE)
+#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
#ifdef CONFIG_USB_OHCI
// enable host controller and wait for reset done
|
