[backfire] merge [20906:20912], [20914:20922] & [20972]

[openwrt-10.03/.git] / package / mmc_over_gpio / Makefile

diff --git a/package/mmc_over_gpio/Makefile b/package/mmc_over_gpio/Makefile
index 20b7b6ac421b3083d24e11bb131e72d7e8a86e39..5a3ab1d6011b37b90347a9f0e598a3bedd33db78 100644 (file)
--- a/package/mmc_over_gpio/Makefile
+++ b/package/mmc_over_gpio/Makefile
@@ -8,18 +8,43 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mmc-over-gpio
-PKG_RELEASE:=2
+PKG_RELEASE:=4
 
 include $(INCLUDE_DIR)/package.mk
 
 
 define KernelPackage/mmc-over-gpio
   SUBMENU:=Other modules
-  DEPENDS:=@GPIO_SUPPORT +kmod-mmc-spi +kmod-spi-gpio
-  KCONFIG:=CONFIG_GPIOMMC
+  DEPENDS:=@GPIO_SUPPORT +kmod-mmc-spi +kmod-spi-gpio-old
+  KCONFIG:=CONFIG_GPIOMMC \
+       CONFIG_CONFIGFS_FS=y
   TITLE:=MMC/SD card over GPIO support
   FILES:=$(LINUX_DIR)/drivers/mmc/host/gpiommc.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,93,spi_gpio gpiommc)
+  AUTOLOAD:=$(call AutoLoad,93,gpiommc)
+  MENU:=1
+endef
+
+define Package/kmod-mmc-over-gpio/config
+       menu "Configuration"
+               depends PACKAGE_kmod-mmc-over-gpio
+
+       config KMOD_MMC_OVER_GPIO_DI_PIN
+               int "GPIO DI (Data-In) pin"
+               default 1
+
+       config KMOD_MMC_OVER_GPIO_DO_PIN
+               int "GPIO DO (Data-Out) pin"
+               default 3
+
+       config KMOD_MMC_OVER_GPIO_CLK_PIN
+               int "GPIO CLK (Clock) pin"
+               default 4
+
+       config KMOD_MMC_OVER_GPIO_CS_PIN
+               int "GPIO CS (Chip-Select) pin"
+               default 7
+
+       endmenu
 endef
 
 define KernelPackage/mmc-over-gpio/description
@@ -34,8 +59,16 @@ define Build/Compile
 endef
 
 define KernelPackage/mmc-over-gpio/install
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_DATA) ./files/mmc_over_gpio.config $(1)/etc/config/mmc_over_gpio
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/mmc_over_gpio.init $(1)/etc/init.d/mmc_over_gpio
+
+       $(SED) 's,@GPIO_DI_PIN@,$(CONFIG_KMOD_MMC_OVER_GPIO_DI_PIN),g' \
+               -e 's,@GPIO_DO_PIN@,$(CONFIG_KMOD_MMC_OVER_GPIO_DO_PIN),g' \
+               -e 's,@GPIO_CLK_PIN@,$(CONFIG_KMOD_MMC_OVER_GPIO_CLK_PIN),g' \
+               -e 's,@GPIO_CS_PIN@,$(CONFIG_KMOD_MMC_OVER_GPIO_CS_PIN),g' \
+               $(1)/etc/config/mmc_over_gpio
 endef
 
 $(eval $(call KernelPackage,mmc-over-gpio))