Commit 5de99be5 authored by Kai Germaschewski's avatar Kai Germaschewski

Cleanup drivers/pcmcia/Makefile part 2

Adding some more flexibility to Config.in (Allow for core built-in but
socket driver modular) cleans up the Makefile as well ;-)
parent 528125c2
...@@ -7,25 +7,20 @@ ...@@ -7,25 +7,20 @@
mainmenu_option next_comment mainmenu_option next_comment
comment 'PCMCIA/CardBus support' comment 'PCMCIA/CardBus support'
#dep_tristate 'CardBus support' CONFIG_PCMCIA $CONFIG_PCI
#if [ "$CONFIG_PCMCIA" != "n" ]; then
# define_bool CONFIG_CARDBUS y
#fi
tristate 'PCMCIA/CardBus support' CONFIG_PCMCIA tristate 'PCMCIA/CardBus support' CONFIG_PCMCIA
if [ "$CONFIG_PCMCIA" != "n" ]; then if [ "$CONFIG_PCMCIA" != "n" ]; then
if [ "$CONFIG_PCI" != "n" ]; then if [ "$CONFIG_PCI" != "n" ]; then
bool ' CardBus support' CONFIG_CARDBUS bool ' CardBus support' CONFIG_CARDBUS
fi fi
dep_bool ' i82092 compatible bridge support' CONFIG_I82092 $CONFIG_PCI dep_tristate ' i82092 compatible bridge support' CONFIG_I82092 $CONFIG_PCMCIA $CONFIG_PCI
bool ' i82365 compatible bridge support' CONFIG_I82365 dep_tristate ' i82365 compatible bridge support' CONFIG_I82365 $CONFIG_PCMCIA
bool ' Databook TCIC host bridge support' CONFIG_TCIC dep_tristate ' Databook TCIC host bridge support' CONFIG_TCIC $CONFIG_PCMCIA
if [ "$CONFIG_HD64465" = "y" ]; then if [ "$CONFIG_HD64465" = "y" ]; then
dep_tristate ' HD64465 host bridge support' CONFIG_HD64465_PCMCIA $CONFIG_PCMCIA dep_tristate ' HD64465 host bridge support' CONFIG_HD64465_PCMCIA $CONFIG_PCMCIA
fi fi
fi if [ "$CONFIG_ARM" = "y" ]; then
if [ "$CONFIG_ARM" = "y" ]; then dep_tristate ' SA1100 support' CONFIG_PCMCIA_SA1100 $CONFIG_ARCH_SA1100 $CONFIG_PCMCIA
dep_tristate ' SA1100 support' CONFIG_PCMCIA_SA1100 $CONFIG_ARCH_SA1100 $CONFIG_PCMCIA fi
fi fi
endmenu endmenu
...@@ -10,20 +10,13 @@ obj-$(CONFIG_PCMCIA) += pcmcia_core.o ds.o ...@@ -10,20 +10,13 @@ obj-$(CONFIG_PCMCIA) += pcmcia_core.o ds.o
ifeq ($(CONFIG_CARDBUS),y) ifeq ($(CONFIG_CARDBUS),y)
obj-$(CONFIG_PCMCIA) += yenta_socket.o obj-$(CONFIG_PCMCIA) += yenta_socket.o
endif endif
ifeq ($(CONFIG_I82365),y)
obj-$(CONFIG_PCMCIA) += i82365.o
endif
ifeq ($(CONFIG_I82092),y)
obj-$(CONFIG_PCMCIA) += i82092.o
endif
ifeq ($(CONFIG_TCIC),y)
obj-$(CONFIG_PCMCIA) += tcic.o
endif
obj-$(CONFIG_HD64465_PCMCIA) += hd64465_ss.o
obj-$(CONFIG_I82365) += i82365.o
obj-$(CONFIG_I82092) += i82092.o
obj-$(CONFIG_TCIC) += tcic.o
obj-$(CONFIG_HD64465_PCMCIA) += hd64465_ss.o
obj-$(CONFIG_PCMCIA_SA1100) += sa1100_cs.o obj-$(CONFIG_PCMCIA_SA1100) += sa1100_cs.o
yenta_socket-objs := pci_socket.o yenta.o yenta_socket-objs := pci_socket.o yenta.o
pcmcia_core-objs-y := cistpl.o rsrc_mgr.o bulkmem.o cs.o pcmcia_core-objs-y := cistpl.o rsrc_mgr.o bulkmem.o cs.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment