Commit 57786854 authored by Kai Germaschewski's avatar Kai Germaschewski

Cleanup drivers/fusion/* build

Don't shortcut from drivers/Makefile to 
drivers/message/{fusion,i2o}/Makefile, but use intermediate
drivers/message/Makefile.

Cleanup drivers/message/fusion/Config.in and get rid of unnecessary
CONFIG_FUSION_BOOT.
parent 037af200
......@@ -142,7 +142,7 @@ DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
DRIVERS-$(CONFIG_FUSION_BOOT) += drivers/message/fusion/fusion.o
DRIVERS-$(CONFIG_FUSION) += drivers/message/message.o
DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394drv.o
ifneq ($(CONFIG_CD_NO_IDESCSI)$(CONFIG_BLK_DEV_IDECD)$(CONFIG_BLK_DEV_SR)$(CONFIG_PARIDE_PCD),)
......@@ -167,7 +167,7 @@ DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
DRIVERS-$(CONFIG_GAMEPORT) += drivers/input/gameport/gamedrv.o
DRIVERS-$(CONFIG_SERIO) += drivers/input/serio/seriodrv.o
DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.o
DRIVERS-$(CONFIG_I2O) += drivers/message/message.o
DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o
DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o
DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o
......
......@@ -7,8 +7,8 @@
mod-subdirs := dio mtd sbus video macintosh usb input telephony sgi ide \
message/i2o message/fusion scsi md ieee1394 pnp isdn atm \
fc4 net/hamradio i2c acpi bluetooth input/serio \
message scsi md ieee1394 pnp isdn atm \
fc4 i2c acpi bluetooth input/serio \
input/gameport parport hotplug
subdir-y := base char block net misc media cdrom
......@@ -35,8 +35,8 @@ subdir-$(CONFIG_PHONE) += telephony
subdir-$(CONFIG_SGI) += sgi
subdir-$(CONFIG_IDE) += ide
subdir-$(CONFIG_SCSI) += scsi
subdir-$(CONFIG_I2O) += message/i2o
subdir-$(CONFIG_FUSION) += message/fusion
subdir-$(CONFIG_I2O) += message
subdir-$(CONFIG_FUSION) += message
subdir-$(CONFIG_MD) += md
subdir-$(CONFIG_IEEE1394) += ieee1394
subdir-$(CONFIG_PNP) += pnp
......
......@@ -199,7 +199,7 @@ struct seq_operations partitions_op = {
extern int blk_dev_init(void);
#ifdef CONFIG_FUSION_BOOT
#ifdef CONFIG_FUSION
extern int fusion_init(void);
#endif
extern int net_dev_init(void);
......@@ -216,7 +216,7 @@ int __init device_init(void)
#ifdef CONFIG_I2O
i2o_init();
#endif
#ifdef CONFIG_FUSION_BOOT
#ifdef CONFIG_FUSION
fusion_init();
#endif
#ifdef CONFIG_FC4_SOC
......
#
# Makefile for MPT based block devices
#
O_TARGET := message.o
mod-subdirs := message/i2o message/fusion
subdir-$(CONFIG_I2O) += i2o
ifeq($(CONFIG_I2O),y)
obj-y += i2o/i2o.o
endif
subdir-$(CONFIG_FUSION) += fusion
ifeq($(CONFIG_FUSION),y)
obj-y += fusion/fusion.o
endif
......@@ -5,35 +5,21 @@ dep_tristate "Fusion MPT (base + ScsiHost) drivers" CONFIG_FUSION $CONFIG_SCSI $
if [ "$CONFIG_FUSION" = "y" -o "$CONFIG_FUSION" = "m" ]; then
if [ "$CONFIG_BLK_DEV_SD" = "y" -a "$CONFIG_FUSION" = "y" ]; then
define_bool CONFIG_FUSION_BOOT y
if [ "$CONFIG_FUSION" = "y" ]; then
comment "(ability to boot linux kernel from Fusion device is ENABLED!)"
else
define_bool CONFIG_FUSION_BOOT n
comment "(ability to boot linux kernel from Fusion device is DISABLED!)"
fi
if [ "$CONFIG_MODULES" = "y" ]; then
# How can we force these options to module or nothing?
# Modular only
dep_tristate " Enhanced SCSI error reporting" CONFIG_FUSION_ISENSE $CONFIG_FUSION m
dep_tristate " Fusion MPT misc device (ioctl) driver" CONFIG_FUSION_CTL $CONFIG_FUSION m
fi
dep_tristate " Fusion MPT LAN driver" CONFIG_FUSION_LAN $CONFIG_FUSION $CONFIG_NET
if [ "$CONFIG_FUSION_LAN" != "n" ]; then
define_bool CONFIG_NET_FC y
fi
else
define_bool CONFIG_FUSION_BOOT n
# These <should> be define_tristate, but we leave them define_bool
# for backward compatibility with pre-linux-2.2.15 kernels.
# (Bugzilla:fibrebugs, #384)
define_bool CONFIG_FUSION_ISENSE n
define_bool CONFIG_FUSION_CTL n
define_bool CONFIG_FUSION_LAN n
fi
endmenu
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