Messages in this thread Patch in this message | | | Date | Wed, 23 Dec 1998 22:31:07 +0000 (GMT) | From | Riley Williams <> | Subject | Re: CONFIG_PCI_BIOS in 2.1.132 |
| |
Hi Linus.
>> That should provide you with the correct combination of options...
> It doesn't work too well, though - try it and see what happens to > the config file after doing "make oldconfig" etc.
> The proper fix is probably something like
> unset CONFIG_PCI_BIOS CONFIG_PCI_DIRECT > choice 'PCI access mode' \ > "BIOS CONFIG_PCI_ACCESS_BIOS \ > Direct CONFIG_PCI_ACCESS_DIRECT \ > Both CONFIG_PCI_ACCESS_BOTH" CONFIG_PCI_ACCESS_BOTH > if [ "$CONFIG_PCI_ACCESS_BIOS" = "y" -o "$CONFIG_PCI_ACCESS_BOTH" = "y" ] > then > define_bool CONFIG_PCI_BIOS y > fi > if [ "$CONFIG_PCI_ACCESS_DIRECT" = y -o "$CONFIG_PCI_ACCESS_BOTH" = "y" ] > then > define_bool CONFIG_PCI_DIRECT y > fi
> (note the "unset" and the different name spaces to make sure that > we don't get configuration confusion).
> I have _not_ tested the above, but I tested your previous patch and > it didn't work reliably. The above approach _should_ work, but if > anybody really wants to see this in the next kernel, please test it > out and send me a patch if/when it works..
I've just downloaded 2.1.132 on this system, and am unpacking it at the moment...ah, done. let's have a look...OK, try this...
===8<=== CUT ===>8=== --- linux/arch/i386/config.in.orig Fri Dec 18 22:01:48 1998 +++ linux/arch/i386/config.in Wed Dec 23 22:15:41 1998 @@ -36,14 +36,20 @@ comment 'General setup' bool 'Networking support' CONFIG_NET bool 'PCI support' CONFIG_PCI if [ "$CONFIG_PCI" = "y" ]; then - bool ' PCI BIOS support' CONFIG_PCI_BIOS - bool ' PCI direct access support' CONFIG_PCI_DIRECT - if [ "$CONFIG_PCI_BIOS" = "n" -a "$CONFIG_PCI_DIRECT" = "n" ]; then + unset CONFIG_PCI_BIOS CONFIG_PCI_DIRECT + choice 'PCI access mode' \ + "BIOS CONFIG_PCI_GOBIOS \ + Direct CONFIG_PCI_GODIRECT \ + Any CONFIG_PCI_GOANY" Any + if [ -n "$CONFIG_PCI_GOBIOS" -o -n "$CONFIG_PCI_GOANY" ]; then define_bool CONFIG_PCI_BIOS y + fi + if [ -n "$CONFIG_PCI_GODIRECT" -o -n "$CONFIG_PCI_GOANY" ]; then + define_bool CONFIG_PCI_DIRECT y fi bool ' PCI quirks' CONFIG_PCI_QUIRKS if [ "$CONFIG_PCI_QUIRKS" = "y" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then bool ' PCI bridge optimization (experimental)' CONFIG_PCI_OPTIMIZE fi ===8<=== CUT ===>8=== I've changed the "Both" option to "Any" to make the options differ from the first letter onwards, and the above appears to work for "oldconfig", "config" and "menuconfig" - I can't test "xconfig" atm, so can't comment on that...
Best wishes from Riley.
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/
| |