From 411e1a07578c02532e850ee1ed684b1766cd04c7 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 30 Jul 2008 00:27:21 +0000 Subject: fixes ipkg dependency bug for spi modules, #3272 SVN-Revision: 12001 --- package/kernel/modules/other.mk | 33 ++++++++++++--------------------- package/spi-ks8995/Makefile | 5 +++-- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index a27149bb05..925f87b9e7 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -565,8 +565,10 @@ $(eval $(call KernelPackage,input-gpio-buttons)) define KernelPackage/mmc-spi SUBMENU:=$(OTHER_MENU) TITLE:=MMC/SD over SPI Support - DEPENDS:=@LINUX_2_6 +kmod-mmc +kmod-spi +kmod-crc-itu-t +kmod-crc7 - KCONFIG:=CONFIG_MMC_SPI + DEPENDS:=@LINUX_2_6 +kmod-mmc +kmod-crc-itu-t +kmod-crc7 + KCONFIG:=CONFIG_MMC_SPI \ + CONFIG_SPI=y \ + CONFIG_SPI_MASTER=y FILES:=$(LINUX_DIR)/drivers/mmc/host/mmc_spi.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,mmc_spi) endef @@ -592,26 +594,13 @@ endef $(eval $(call KernelPackage,mmc-atmelmci)) -define KernelPackage/spi - SUBMENU:=$(OTHER_MENU) - TITLE:=Serial Peripheral Interface support - DEPENDS:=@LINUX_2_6 - KCONFIG:=\ - CONFIG_SPI=y \ - CONFIG_SPI_MASTER=y -endef - -define KernelPackage/spi/description - This package contains the Serial Peripheral Interface Master driver -endef - -$(eval $(call KernelPackage,spi)) - define KernelPackage/spi-bitbang SUBMENU:=$(OTHER_MENU) TITLE:=Serial Peripheral Interface bitbanging library - DEPENDS:=@LINUX_2_6 +kmod-spi - KCONFIG:=CONFIG_SPI_BITBANG + DEPENDS:=@LINUX_2_6 + KCONFIG:=CONFIG_SPI_BITBANG \ + CONFIG_SPI=y \ + CONFIG_SPI_MASTER=y FILES:=$(LINUX_DIR)/drivers/spi/spi_bitbang.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,91,spi_bitbang) endef @@ -640,8 +629,10 @@ $(eval $(call KernelPackage,spi-gpio)) define KernelPackage/spi-dev SUBMENU:=$(OTHER_MENU) TITLE:=User mode SPI device driver - DEPENDS:=@LINUX_2_6 +kmod-spi - KCONFIG:=CONFIG_SPI_SPIDEV + DEPENDS:=@LINUX_2_6 + KCONFIG:=CONFIG_SPI_SPIDEV \ + CONFIG_SPI=y \ + CONFIG_SPI_MASTER=y FILES:=$(LINUX_DIR)/drivers/spi/spidev.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,91,spidev) endef diff --git a/package/spi-ks8995/Makefile b/package/spi-ks8995/Makefile index 4bb6d9bcff..5f5b37bb39 100644 --- a/package/spi-ks8995/Makefile +++ b/package/spi-ks8995/Makefile @@ -16,9 +16,10 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/spi-ks8995 SUBMENU:=Other modules TITLE:=Micrel/Kendin KS8995 Ethernet switch control - DEPENDS:=@LINUX_2_6 +kmod-spi + DEPENDS:=@LINUX_2_6 FILES:=$(PKG_BUILD_DIR)/spi_ks8995.$(LINUX_KMOD_SUFFIX) - KCONFIG:= + KCONFIG:=CONFIG_SPI=y \ + CONFIG_SPI_MASTER=y endef define KernelPackage/spi-ks8995/description -- cgit v1.2.3