Create the kmod-spi package and load mmc_over_gpio after spi (#3273)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10675 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 11c45136d3454c1578b5c88bee9f3c615e260486..2313135c568dceca98f07a84f3f992f8b0ff89a3 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -514,14 +514,21 @@ $(eval $(call KernelPackage,mmc-spi))
 
 define KernelPackage/spi
   SUBMENU:=$(OTHER_MENU)
-  DEPENDS:=@LINUX_2_6 +kmod-crc-itu-t +kmod-crc7
   TITLE:=Serial Peripheral Interface
+  DEPENDS:=@LINUX_2_6 +kmod-crc-itu-t +kmod-crc7
   KCONFIG:=CONFIG_SPI=y \
-       CONFIG_MTD_DATAFLASH=n \
-       CONFIG_MTD_M25P80=n \
-       CONFIG_SPI_AT25=n \
-       CONFIG_SPI_SPIDEV=n \
-       CONFIG_SPI_TLE62X0=n
+       CONFIG_MTD_DATAFLASH \
+       CONFIG_MTD_M25P80 \
+       CONFIG_SPI_AT25 \
+       CONFIG_SPI_SPIDEV \
+       CONFIG_SPI_TLE62X0
+  FILES:= \
+       $(LINUX_DIR)/drivers/spi/at25.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/spi/spidev.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/spi/tle62x0.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/mtd/devices/m25p80.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/mtd/devices/mtd_dataflash.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,90,spi)
 endef
 
 define KernelPackage/spi/description
@@ -532,9 +539,11 @@ $(eval $(call KernelPackage,spi))
 
 define KernelPackage/spi-bitbang
   SUBMENU:=$(OTHER_MENU)
-  DEPENDS:=@LINUX_2_6
   TITLE:=Serial Peripheral Interface bitbanging
-  KCONFIG:=CONFIG_SPI_BITBANG=y
+  DEPENDS:=@LINUX_2_6 +kmod-spi
+  KCONFIG:=CONFIG_SPI_BITBANG
+  FILES:=$(LINUX_DIR)/drivers/spi/spi_bitbang.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,91,spi_bitbang)
 endef
 
 define KernelPackage/spi-bitbang/description

diff --git a/package/mmc_over_gpio/Makefile b/package/mmc_over_gpio/Makefile
index d38fa416e5da9e486973e16fb65fe5621f11a792..88fe7f6087f7cc0091b0fea3a8a33fd4ee3ac87e 100644 (file)
--- a/package/mmc_over_gpio/Makefile
+++ b/package/mmc_over_gpio/Makefile
@@ -21,7 +21,7 @@ define KernelPackage/mmc-over-gpio
   TITLE:=MMC/SD card over GPIO support
   FILES:=$(PKG_BUILD_DIR)/spi_gpio.$(LINUX_KMOD_SUFFIX) \
          $(PKG_BUILD_DIR)/mmc_over_spigpio.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,90,spi_gpio mmc_over_spigpio)
+  AUTOLOAD:=$(call AutoLoad,92,spi_gpio mmc_over_spigpio)
 endef
 
 define KernelPackage/mmc-over-gpio/description