[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: 2.4 kernel



Cameron Berkenpas wrote:

> How do you get 2.4 to boot? Do you use bootx?

>From my original post, as quoted in your email:

> On Thu, 5 Oct 2000, Adam C Powell IV wrote:
>
> > In the meantime, I built -test6 successfully, and it boots with quik on a
> > StarMax (pmac 4400 clone) and runs fine, except for ppp, but we've discussed
> > that before.  Couldn't get -test8 to build.  Maybe -test6  will work with
> > tdfx-fb?

Does that answer your question?

BTW, I just confirmed that quik boots 2.4.0-test9 on the same machine, though it
needed the attached patch to finish building.

-Adam P.

                Welcome to the best software in the world today cafe!
--- 2.4.0-test9/drivers/ide/ide-pmac.c	Mon Jun 26 07:52:57 2000
+++ linux/drivers/ide/ide-pmac.c	Mon Oct  9 14:39:45 2000
@@ -395,7 +395,9 @@
 
 		if (np->parent && np->parent->name
 		    && strcasecmp(np->parent->name, "media-bay") == 0) {
+#ifdef CONFIG_PMAC_PBOOK
 			media_bay_set_ide_infos(np->parent,base,irq,i);
+#endif
 		} else if (pmac_ide[i].kind == controller_ohare) {
 			/* The code below is having trouble on some ohare machines
 			 * (timing related ?). Until I can put my hand on one of these
@@ -436,8 +438,12 @@
 		pmac_ide_init_hwif_ports(&hwif->hw, base, 0, &hwif->irq);
 		memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->io_ports));
 		hwif->chipset = ide_pmac;
+#ifdef CONFIG_PMAC_PBOOK
 		hwif->noprobe = (!hwif->io_ports[IDE_DATA_OFFSET]) ||
 			(check_media_bay_by_base(base, MB_CD) == -EINVAL);
+#else
+		hwif->noprobe = (!hwif->io_ports[IDE_DATA_OFFSET]);
+#endif
 
 #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
 		if (np->n_addrs >= 2) {

Reply to: