From owner-freebsd-current Mon Sep 21 23:53:57 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id XAA03483 for freebsd-current-outgoing; Mon, 21 Sep 1998 23:53:57 -0700 (PDT) (envelope-from owner-freebsd-current@FreeBSD.ORG) Received: from resnet.uoregon.edu (resnet.uoregon.edu [128.223.144.32]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id XAA03470 for ; Mon, 21 Sep 1998 23:53:53 -0700 (PDT) (envelope-from dwhite@resnet.uoregon.edu) Received: from localhost (dwhite@localhost) by resnet.uoregon.edu (8.8.8/8.8.8) with ESMTP id XAA06212 for ; Mon, 21 Sep 1998 23:53:22 -0700 (PDT) (envelope-from dwhite@resnet.uoregon.edu) Date: Mon, 21 Sep 1998 23:53:21 -0700 (PDT) From: Doug White To: current@FreeBSD.ORG Subject: 2.2.7->3.0-ELF: GENERICupgrade and others Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Hi all... Attached is a patch that CAMifies GENERICupgrade. You can't build the upgrade kernel otherwise. A warning in Makefile.upgrade to AIC6360, AMD, and DPT SCSI controller owners that this upgrade will orphan them may be in order, until those drivers make an appearance in CAM. I'm also tracking a bug in the Makefile that depends on the existence of /usr/local/lib/aout, which doesn't on fresh 2.2.7 systems. I think some code needs to be added to the do_move_aout_libs section that checks if the ${LIBDIRS}/aout actually exists before ldconfig'ing them. My Makefile magic just isn't there yet, or I'd fashion a patch for that too. The final thing bothering me about the upgrade is errors in the perl build I identified earlier. It may not be an error after the upgrade; if so, Mark, please set me straight. If desired I can commit this, although I'm trying to make it a policy of staying out of the kernel code so I don't start my pointy-hat collection too early. Patch ho: --- GENERICupgrade.orig Mon Sep 21 23:35:17 1998 +++ GENERICupgrade Mon Sep 21 23:39:51 1998 @@ -67,7 +67,7 @@ # A single entry for any of these controllers (ncr, ahb, ahc, amd) is # sufficient for any number of installed devices. controller ncr0 -controller amd0 +#controller amd0 controller ahb0 controller ahc0 controller isp0 @@ -76,22 +76,30 @@ # document here - see the LINT file in this directory and look up the # dpt0 entry there for much fuller documentation on this. The options # line following dpt0 here is also currently a *required* option for it. -controller dpt0 -options DPT_MEASURE_PERFORMANCE +#controller dpt0 +#options DPT_MEASURE_PERFORMANCE -controller bt0 at isa? port "IO_BT0" bio irq ? vector bt_isa_intr -controller uha0 at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr -controller aha0 at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr -controller aic0 at isa? port 0x340 bio irq 11 vector aicintr -controller nca0 at isa? port 0x1f88 bio irq 10 vector ncaintr -controller nca1 at isa? port 0x350 bio irq 5 vector ncaintr -controller sea0 at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector seaintr +# Pre-CAM controllers +#controller bt0 at isa? port "IO_BT0" bio irq ? vector bt_isa_intr +#controller uha0 at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr +#controller aha0 at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr +#controller aic0 at isa? port 0x340 bio irq 11 vector aicintr +#controller nca0 at isa? port 0x1f88 bio irq 10 vector ncaintr +#controller nca1 at isa? port 0x350 bio irq 5 vector ncaintr +#controller sea0 at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector seaintr + +# Post-CAM controllers +controller adv0 at isa? port ? cam irq ? +controller bt0 at isa? port ? cam irq ? +controller aha0 at isa? port ? cam irq ? controller scbus0 device da0 device sa0 + +device pass0 device cd0 #Only need one of these, the code dynamically grows Doug White Internet: dwhite@resnet.uoregon.edu | FreeBSD: The Power to Serve http://gladstone.uoregon.edu/~dwhite | www.freebsd.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message