mac80211: add the work-in-progress IBSS HT patch, with some minor fixes

[openwrt.git] / package / mmc_over_gpio / Makefile

diff --git a/package/mmc_over_gpio/Makefile b/package/mmc_over_gpio/Makefile
index abf8937..03096ad 100644 (file)
--- a/package/mmc_over_gpio/Makefile
+++ b/package/mmc_over_gpio/Makefile
@@ -4,46 +4,75 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 

-#XXX This package will go away once the stuff is merged into the kernel.
-

 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mmc-over-gpio
 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
 
 include $(INCLUDE_DIR)/package.mk
 
 
 define KernelPackage/mmc-over-gpio
   SUBMENU:=Other modules

-  DEPENDS:=@GPIO_SUPPORT +kmod-mmc-spi +kmod-spi-gpio
+  DEPENDS:=@GPIO_SUPPORT +kmod-mmc-spi +kmod-spi-gpio-old
+  KCONFIG:=CONFIG_GPIOMMC \
+       CONFIG_CONFIGFS_FS=y

   TITLE:=MMC/SD card over GPIO support
   TITLE:=MMC/SD card over GPIO support

-  FILES:=$(PKG_BUILD_DIR)/mmc_over_spigpio.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,93,spi_gpio mmc_over_spigpio)
+  FILES:=$(LINUX_DIR)/drivers/mmc/host/gpiommc.ko
+  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
  Support for driving an MMC/SD card over GPIO pins via SPI.
 endef
 
 endef
 
 define KernelPackage/mmc-over-gpio/description
  Support for driving an MMC/SD card over GPIO pins via SPI.
 endef
 

+define KernelPackage/mmc-over-gpio/conffiles
+/etc/config/mmc_over_gpio
+endef
+

 define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)
 define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)

-       $(CP) ./src/* $(PKG_BUILD_DIR)/

 endef
 
 define Build/Compile
 endef
 
 define Build/Compile

-       $(MAKE) -C "$(LINUX_DIR)" \
-               CROSS_COMPILE="$(TARGET_CROSS)" \
-               ARCH="$(LINUX_KARCH)" \
-               SUBDIRS="$(PKG_BUILD_DIR)" \
-               EXTRA_CFLAGS="$(BUILDFLAGS)" \
-               modules

 endef
 
 define KernelPackage/mmc-over-gpio/install
 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
        $(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))
 endef
 
 $(eval $(call KernelPackage,mmc-over-gpio))