r415 - in openbios-devel: arch/sparc64 config/examples

Author: blueswirl
Date: 2009-01-17 19:42:48 +0100 (Sat, 17 Jan 2009)
New Revision: 415

Modified:
   openbios-devel/arch/sparc64/openbios.c
   openbios-devel/config/examples/cross-sparc64_config.xml
   openbios-devel/config/examples/sparc64_config.xml
Log:
Use PCI IDE controller

Modified: openbios-devel/arch/sparc64/openbios.c
===================================================================
--- openbios-devel/arch/sparc64/openbios.c	2009-01-17 15:37:30 UTC (rev 414)
+++ openbios-devel/arch/sparc64/openbios.c	2009-01-17 18:42:48 UTC (rev 415)
@@ -498,9 +498,6 @@
 arch_init( void )
 {
    modules_init();
-        // XXX use PCI IDE
-	setup_timers();
-	ob_ide_init("/pci/pci/pci/ebus", 0x1f0, 0x3f4, 0x170, 0x374);
 #ifdef CONFIG_DRIVER_PCI
         ob_pci_init();
 #endif

Modified: openbios-devel/config/examples/cross-sparc64_config.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc64_config.xml	2009-01-17 15:37:30 UTC (rev 414)
+++ openbios-devel/config/examples/cross-sparc64_config.xml	2009-01-17 18:42:48 UTC (rev 415)
@@ -69,7 +69,7 @@
   <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/>
   <option name="CONFIG_DEBUG_PCI" type="boolean" value="false"/>
   <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/>
-  <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/>
+  <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="2"/>
   <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/>
   <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/>
   <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/>

Modified: openbios-devel/config/examples/sparc64_config.xml
===================================================================
--- openbios-devel/config/examples/sparc64_config.xml	2009-01-17 15:37:30 UTC (rev 414)
+++ openbios-devel/config/examples/sparc64_config.xml	2009-01-17 18:42:48 UTC (rev 415)
@@ -69,7 +69,7 @@
   <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/>
   <option name="CONFIG_DEBUG_PCI" type="boolean" value="false"/>
   <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/>
-  <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/>
+  <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="2"/>
   <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/>
   <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/>
   <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/>