package/kernel: Remove all 2.4 definitions

With no 2.4 support in trunk, we can safely remove any 2.4 definitions for
kmods and merge the 2.6 definitions into the generic ones.

Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>

SVN-Revision: 26901
master
Vasilis Tsiligiannis 14 years ago
parent b468227827
commit 2850136ae8
  1. 47
      package/kernel/modules/block.mk
  2. 13
      package/kernel/modules/crypto.mk
  3. 10
      package/kernel/modules/fs.mk
  4. 18
      package/kernel/modules/pcmcia.mk
  5. 50
      package/kernel/modules/sound.mk

@ -374,24 +374,10 @@ define KernelPackage/ide-core
CONFIG_BLK_DEV_IDEDMA_PCI=y \
CONFIG_BLK_DEV_IDEPCI=y
FILES:= \
$(LINUX_DIR)/drivers/ide/ide-core.ko
$(LINUX_DIR)/drivers/ide/ide-core.ko \
$(LINUX_DIR)/drivers/ide/ide-gd_mod.ko
AUTOLOAD:= \
$(call AutoLoad,20,ide-core,1)
endef
define KernelPackage/ide-core/2.4
FILES+= \
$(LINUX_DIR)/drivers/ide/ide-detect.ko \
$(LINUX_DIR)/drivers/ide/ide-disk.ko
AUTOLOAD+= \
$(call AutoLoad,35,ide-detect,1) \
$(call AutoLoad,40,ide-disk,1)
endef
define KernelPackage/ide-core/2.6
FILES+= \
$(LINUX_DIR)/drivers/ide/ide-gd_mod.ko
AUTOLOAD+= \
$(call AutoLoad,20,ide-core,1) \
$(call AutoLoad,40,ide-gd_mod,1)
endef
@ -399,8 +385,7 @@ define KernelPackage/ide-core/description
Kernel support for IDE, useful for usb mass storage devices (e.g. on WL-HDD)
Includes:
- ide-core
- ide-detect
- ide-gd_mod (or ide-disk)
- ide-gd_mod
endef
$(eval $(call KernelPackage,ide-core))
@ -417,23 +402,11 @@ define KernelPackage/ide-generic
DEPENDS:=@PCI_SUPPORT
TITLE:=Kernel support for generic PCI IDE chipsets
KCONFIG:=CONFIG_BLK_DEV_GENERIC
FILES:=$(LINUX_DIR)/drivers/ide/ide-pci-generic.ko
AUTOLOAD:=$(call AutoLoad,30,ide-pci-generic,1)
$(call AddDepends/ide)
endef
define KernelPackage/ide-generic/2.4
FILES+= \
$(LINUX_DIR)/drivers/ide/pci/generic.ko
AUTOLOAD+= \
$(call AutoLoad,30,generic,1)
endef
define KernelPackage/ide-generic/2.6
FILES+= \
$(LINUX_DIR)/drivers/ide/ide-pci-generic.ko
AUTOLOAD+= \
$(call AutoLoad,30,ide-pci-generic,1)
endef
$(eval $(call KernelPackage,ide-generic))
@ -458,10 +431,6 @@ define KernelPackage/ide-aec62xx
$(call AddDepends/ide)
endef
define KernelPackage/ide-aec62xx/2.4
FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.ko
endef
define KernelPackage/ide-aec62xx/description
Support for Acard AEC62xx (Artop ATP8xx) IDE controllers.
endef
@ -478,10 +447,6 @@ define KernelPackage/ide-pdc202xx
$(call AddDepends/ide)
endef
define KernelPackage/ide-pdc202xx/2.4
FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.ko
endef
define KernelPackage/ide-pdc202xx/description
Support for the Promise Ultra 33/66/100 (PDC202{46|62|65|67|68}) IDE
controllers.

@ -342,14 +342,19 @@ define KernelPackage/crypto-misc
FILES:= \
$(LINUX_DIR)/crypto/anubis.ko \
$(LINUX_DIR)/crypto/blowfish.ko \
$(LINUX_DIR)/crypto/camellia.ko \
$(LINUX_DIR)/crypto/cast5.ko \
$(LINUX_DIR)/crypto/cast6.ko \
$(if $(findstring y,$(CONFIG_CRYPTO_CRC32C)),,$(LINUX_DIR)/crypto/crc32c.ko) \
$(LINUX_DIR)/crypto/fcrypt.ko \
$(LINUX_DIR)/crypto/khazad.ko \
$(LINUX_DIR)/crypto/md4.ko \
$(LINUX_DIR)/crypto/serpent.ko \
$(LINUX_DIR)/crypto/sha256$(SHA256_SUFFIX).ko \
$(LINUX_DIR)/crypto/sha512$(SHA512_SUFFIX).ko \
$(LINUX_DIR)/crypto/tea.ko \
$(LINUX_DIR)/crypto/tgr192.ko \
$(LINUX_DIR)/crypto/twofish_common.ko \
$(LINUX_DIR)/crypto/wp512.ko
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),le,2.6.35)),1)
FILES += $(LINUX_DIR)/crypto/twofish.ko
@ -359,14 +364,6 @@ define KernelPackage/crypto-misc
$(call AddDepends/crypto)
endef
define KernelPackage/crypto-misc/2.6
FILES+= \
$(LINUX_DIR)/crypto/camellia.ko \
$(if $(findstring y,$(CONFIG_CRYPTO_CRC32C)),,$(LINUX_DIR)/crypto/crc32c.ko) \
$(LINUX_DIR)/crypto/fcrypt.ko \
$(LINUX_DIR)/crypto/tgr192.ko \
$(LINUX_DIR)/crypto/twofish_common.ko
endef
define KernelPackage/crypto-misc/x86
FILES+=$(LINUX_DIR)/arch/x86/crypto/twofish-i586.ko

@ -220,10 +220,6 @@ define KernelPackage/fs-msdos
$(call AddDepends/nls)
endef
define KernelPackage/fs-msdos/2.4
FILES:=$(LINUX_DIR)/fs/msdos/msdos.ko
endef
define KernelPackage/fs-msdos/description
Kernel module for MSDOS filesystem support
endef
@ -359,12 +355,6 @@ define KernelPackage/fs-vfat
$(call AddDepends/nls)
endef
define KernelPackage/fs-vfat/2.4
FILES:= \
$(LINUX_DIR)/fs/fat/fat.ko \
$(LINUX_DIR)/fs/vfat/vfat.ko
endef
define KernelPackage/fs-vfat/description
Kernel module for VFAT filesystem support
endef

@ -16,24 +16,6 @@ define KernelPackage/pcmcia-core
CONFIG_CARDBUS \
CONFIG_PCCARD \
PCMCIA_DEBUG=n
endef
define KernelPackage/pcmcia-core/2.4
# KCONFIG:= \
# CONFIG_PCMCIA \
# CONFIG_CARDBUS
FILES:= \
$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.ko \
$(LINUX_DIR)/drivers/pcmcia/ds.ko \
$(LINUX_DIR)/drivers/pcmcia/yenta_socket.ko
AUTOLOAD:=$(call AutoLoad,25,pcmcia_core ds yenta_socket)
endef
define KernelPackage/pcmcia-core/2.6
# KCONFIG:= \
# CONFIG_PCCARD \
# CONFIG_PCMCIA \
# PCMCIA_DEBUG=n
FILES:= \
$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.ko \
$(LINUX_DIR)/drivers/pcmcia/pcmcia.ko

@ -22,34 +22,7 @@ endef
$(eval $(call KernelPackage,pcspkr))
define KernelPackage/sound-core
SUBMENU:=$(SOUND_MENU)
TITLE:=Sound support
DEPENDS:=@AUDIO_SUPPORT
KCONFIG:= \
CONFIG_SOUND \
CONFIG_SND \
CONFIG_SND_HWDEP \
CONFIG_SND_RAWMIDI \
CONFIG_SND_TIMER \
CONFIG_SND_PCM \
CONFIG_SND_SEQUENCER \
CONFIG_SND_VIRMIDI \
CONFIG_SND_SEQ_DUMMY \
CONFIG_SND_SEQUENCER_OSS=y \
CONFIG_HOSTAUDIO \
CONFIG_SND_PCM_OSS \
CONFIG_SND_MIXER_OSS \
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
$(call AddDepends/input)
endef
define KernelPackage/sound-core/2.4
FILES:=$(LINUX_DIR)/drivers/sound/soundcore.ko
AUTOLOAD:=$(call AutoLoad,30,soundcore)
endef
# allow 2.6 targets to override the soundcore stuff
# allow targets to override the soundcore stuff
SOUNDCORE_LOAD ?= \
soundcore \
snd \
@ -74,9 +47,28 @@ SOUNDCORE_FILES ?= \
$(LINUX_DIR)/sound/core/oss/snd-mixer-oss.ko \
$(LINUX_DIR)/sound/core/oss/snd-pcm-oss.ko
define KernelPackage/sound-core/2.6
define KernelPackage/sound-core
SUBMENU:=$(SOUND_MENU)
TITLE:=Sound support
DEPENDS:=@AUDIO_SUPPORT
KCONFIG:= \
CONFIG_SOUND \
CONFIG_SND \
CONFIG_SND_HWDEP \
CONFIG_SND_RAWMIDI \
CONFIG_SND_TIMER \
CONFIG_SND_PCM \
CONFIG_SND_SEQUENCER \
CONFIG_SND_VIRMIDI \
CONFIG_SND_SEQ_DUMMY \
CONFIG_SND_SEQUENCER_OSS=y \
CONFIG_HOSTAUDIO \
CONFIG_SND_PCM_OSS \
CONFIG_SND_MIXER_OSS \
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
FILES:=$(SOUNDCORE_FILES)
AUTOLOAD:=$(call AutoLoad,30,$(SOUNDCORE_LOAD))
$(call AddDepends/input)
endef
define KernelPackage/sound-core/uml

Loading…
Cancel
Save