drop the '0' default in config_get_bool

[openwrt.git] / package / kernel / modules / block.mk

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 497aa3a..29bc799 100644 (file)
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -11,7 +11,7 @@ BLOCK_MENU:=Block Devices
 define KernelPackage/ata-core
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Serial and Parallel ATA support
 define KernelPackage/ata-core
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Serial and Parallel ATA support

-  DEPENDS:=@PCI_SUPPORT @LINUX_2_6
+  DEPENDS:=@PCI_SUPPORT @LINUX_2_6 +kmod-scsi-core

   KCONFIG:=CONFIG_ATA
   FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,21,libata)
   KCONFIG:=CONFIG_ATA
   FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,21,libata)


@@ -23,7 +23,7 @@ $(eval $(call KernelPackage,ata-core))
 define KernelPackage/ata-artop
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=ARTOP 6210/6260 PATA support
 define KernelPackage/ata-artop
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=ARTOP 6210/6260 PATA support

-  DEPENDS:=kmod-ata-core +kmod-scsi-core
+  DEPENDS:=kmod-ata-core

   KCONFIG:=CONFIG_PATA_ARTOP
   FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,41,pata_artop)
   KCONFIG:=CONFIG_PATA_ARTOP
   FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,41,pata_artop)


@@ -39,7 +39,7 @@ $(eval $(call KernelPackage,ata-artop))
 define KernelPackage/ata-piix
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Intel PIIX PATA/SATA support
 define KernelPackage/ata-piix
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Intel PIIX PATA/SATA support

-  DEPENDS:=kmod-ata-core +kmod-ide-core +kmod-scsi-core
+  DEPENDS:=kmod-ata-core +kmod-ide-core

   KCONFIG:=CONFIG_ATA_PIIX
   FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,41,ata_piix)
   KCONFIG:=CONFIG_ATA_PIIX
   FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,41,ata_piix)


@@ -61,7 +61,9 @@ define KernelPackage/ide-core
        CONFIG_IDE_GENERIC \
        CONFIG_BLK_DEV_IDE \
        CONFIG_IDE_GENERIC \
        CONFIG_IDE_GENERIC \
        CONFIG_BLK_DEV_IDE \
        CONFIG_IDE_GENERIC \

-       CONFIG_BLK_DEV_IDEDISK
+       CONFIG_BLK_DEV_IDEDISK \
+       CONFIG_BLK_DEV_IDEDMA_PCI=y \
+       CONFIG_BLK_DEV_IDEPCI=y

   FILES:= \
        $(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX)
   FILES:= \
        $(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX)


@@ -74,7 +76,6 @@ define KernelPackage/ide-core/2.4
 endef
 
 define KernelPackage/ide-core/2.6
 endef
 
 define KernelPackage/ide-core/2.6

-#  KCONFIG+=CONFIG_IDE_GENERIC

   FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD+=$(call AutoLoad,30,ide-generic)
 endef
   FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD+=$(call AutoLoad,30,ide-generic)
 endef


@@ -93,8 +94,8 @@ $(eval $(call KernelPackage,ide-core))
 define KernelPackage/ide-aec62xx
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Acard AEC62xx IDE driver
 define KernelPackage/ide-aec62xx
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Acard AEC62xx IDE driver

-  DEPENDS:=@PCI_SUPPORT
-  KCONFIG:=CONFIG_BLK_DEV_AEC62XX
+  DEPENDS:=@PCI_SUPPORT +kmod-ide-core
+  KCONFIG:=CONFIG_BLK_DEV_AEC62XX 

   FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,aec62xx)
 endef
   FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,aec62xx)
 endef


@@ -109,7 +110,7 @@ $(eval $(call KernelPackage,ide-aec62xx))
 define KernelPackage/ide-pdc202xx
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Promise PDC202xx IDE driver
 define KernelPackage/ide-pdc202xx
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Promise PDC202xx IDE driver

-  DEPENDS:=@LINUX_2_4
+  DEPENDS:=@LINUX_2_4 +kmod-ide-core

   KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD
   FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old)
   KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD
   FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old)


@@ -137,16 +138,19 @@ endef
 
 $(eval $(call KernelPackage,scsi-core))
 
 
 $(eval $(call KernelPackage,scsi-core))
 

-define KernelPackage/scsi-generic 
-  TITLE:=Kernel support for SCSI generic 
-  SUBMENU:=$(EMENU) 
-  KCONFIG:=$(CONFIG_CHR_DEV_SG) 
-  FILES:= \ 
-    $(LINUX_DIR)/drivers/scsi/sg.$(LINUX_KMOD_SUFFIX) 
-  AUTOLOAD:=$(call AutoLoad,65,sg) 
+
+define KernelPackage/scsi-generic
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Kernel support for SCSI generic
+  KCONFIG:= \
+       CONFIG_CHR_DEV_SG
+  FILES:= \
+       $(LINUX_DIR)/drivers/scsi/sg.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,65,sg)

 endef
 
 endef
 

-$(eval $(call KernelPackage,scsi-generic)) 
+$(eval $(call KernelPackage,scsi-generic))
+

 
 define KernelPackage/loop
   SUBMENU:=$(BLOCK_MENU)
 
 define KernelPackage/loop
   SUBMENU:=$(BLOCK_MENU)


@@ -178,3 +182,18 @@ define KernelPackage/nbd/description
 endef
 
 $(eval $(call KernelPackage,nbd))
 endef
 
 $(eval $(call KernelPackage,nbd))

+
+
+define KernelPackage/rb153-cf
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=RouterBoard 153 CF Slot
+  KCONFIG:=CONFIG_BLK_DEV_CF_MIPS
+  FILES:=$(LINUX_DIR)/drivers/block/rb1xx/rb153-cf.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,rb153-cf)
+endef
+
+define KernelPackage/rb153-cf/description
+  Kernel module for the RouterBoard 153 CF slot
+endef
+
+$(eval $(call KernelPackage,rb153-cf))