From 976f690ebd630f7162eadb5a7b334213a3455dd6 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Thu, 4 Jun 2009 06:39:36 +0000 Subject: [PATCH] kernel/modules: move SPI drivers into a new submenu SVN-Revision: 16323 --- package/kernel/modules/other.mk | 97 +---------------------------- package/kernel/modules/spi.mk | 106 ++++++++++++++++++++++++++++++++ package/spi-ks8995/Makefile | 2 +- 3 files changed, 108 insertions(+), 97 deletions(-) create mode 100644 package/kernel/modules/spi.mk diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 9c8bfcf137..309e25b929 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -707,23 +707,6 @@ endef $(eval $(call KernelPackage,input-joydev)) -define KernelPackage/mmc-spi - SUBMENU:=$(OTHER_MENU) - TITLE:=MMC/SD over SPI Support - 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 - -define KernelPackage/mmc-spi/description - Kernel support for MMC/SD over SPI -endef - -$(eval $(call KernelPackage,mmc-spi)) - define KernelPackage/mmc-atmelmci SUBMENU:=$(OTHER_MENU) TITLE:=Amtel MMC Support @@ -739,84 +722,6 @@ endef $(eval $(call KernelPackage,mmc-atmelmci)) -define KernelPackage/spi-bitbang - SUBMENU:=$(OTHER_MENU) - TITLE:=Serial Peripheral Interface bitbanging library - 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 - -define KernelPackage/spi-bitbang/description - This package contains the SPI bitbanging library -endef - -$(eval $(call KernelPackage,spi-bitbang)) - -define KernelPackage/spi-gpio-old - SUBMENU:=$(OTHER_MENU) - TITLE:=Old GPIO based bitbanging SPI controller (DEPRECATED) - DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang - KCONFIG:=CONFIG_SPI_GPIO_OLD - FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio_old.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,92,spi_gpio_old) -endef - -define KernelPackage/spi-gpio-old/description - This package contains the GPIO based bitbanging SPI controller driver -endef - -$(eval $(call KernelPackage,spi-gpio-old)) - -define KernelPackage/spi-gpio - SUBMENU:=$(OTHER_MENU) - TITLE:=GPIO-based bitbanging SPI Master - DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang - KCONFIG:=CONFIG_SPI_GPIO - FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,92,spi_gpio) -endef - -define KernelPackage/spi-gpio/description - This package contains the GPIO-based bitbanging SPI Master -endef - -$(eval $(call KernelPackage,spi-gpio)) - -define KernelPackage/spi-dev - SUBMENU:=$(OTHER_MENU) - TITLE:=User mode SPI device driver - 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 - -define KernelPackage/spi-dev/description - This package contains the user mode SPI device driver -endef - -$(eval $(call KernelPackage,spi-dev)) - -define KernelPackage/bcm63xx-spi - SUBMENU:=$(OTHER_MENU) - TITLE:=Broadcom BCM63xx SPI driver - DEPENDS:=@TARGET_brcm63xx +kmod-spi-bitbang - KCONFIG:=CONFIG_SPI_BCM63XX - FILES:=$(LINUX_DIR)/drivers/spi/bcm63xx_spi.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,92,bcm63xx_spi) -endef - -define KernelPackage/bcm63xx-spi/description - This package contains the Broadcom BCM63xx SPI Master driver -endef - -$(eval $(call KernelPackage,bcm63xx-spi)) define KernelPackage/cs5535-gpio SUBMENU:=$(OTHER_MENU) diff --git a/package/kernel/modules/spi.mk b/package/kernel/modules/spi.mk new file mode 100644 index 0000000000..7e74239ed9 --- /dev/null +++ b/package/kernel/modules/spi.mk @@ -0,0 +1,106 @@ +# +# Copyright (C) 2006-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +SPI_MENU:=SPI Support + +define KernelPackage/mmc-spi + SUBMENU:=$(SPI_MENU) + TITLE:=MMC/SD over SPI Support + 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 + +define KernelPackage/mmc-spi/description + Kernel support for MMC/SD over SPI +endef + +$(eval $(call KernelPackage,mmc-spi)) + + +define KernelPackage/spi-bitbang + SUBMENU:=$(SPI_MENU) + TITLE:=Serial Peripheral Interface bitbanging library + 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 + +define KernelPackage/spi-bitbang/description + This package contains the SPI bitbanging library +endef + +$(eval $(call KernelPackage,spi-bitbang)) + + +define KernelPackage/spi-gpio-old + SUBMENU:=$(SPI_MENU) + TITLE:=Old GPIO based bitbanging SPI controller (DEPRECATED) + DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang + KCONFIG:=CONFIG_SPI_GPIO_OLD + FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio_old.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,92,spi_gpio_old) +endef + +define KernelPackage/spi-gpio-old/description + This package contains the GPIO based bitbanging SPI controller driver +endef + +$(eval $(call KernelPackage,spi-gpio-old)) + +define KernelPackage/spi-gpio + SUBMENU:=$(SPI_MENU) + TITLE:=GPIO-based bitbanging SPI Master + DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang + KCONFIG:=CONFIG_SPI_GPIO + FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,92,spi_gpio) +endef + +define KernelPackage/spi-gpio/description + This package contains the GPIO-based bitbanging SPI Master +endef + +$(eval $(call KernelPackage,spi-gpio)) + +define KernelPackage/spi-dev + SUBMENU:=$(SPI_MENU) + TITLE:=User mode SPI device driver + 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 + +define KernelPackage/spi-dev/description + This package contains the user mode SPI device driver +endef + +$(eval $(call KernelPackage,spi-dev)) + +define KernelPackage/bcm63xx-spi + SUBMENU:=$(SPI_MENU) + TITLE:=Broadcom BCM63xx SPI driver + DEPENDS:=@TARGET_brcm63xx +kmod-spi-bitbang + KCONFIG:=CONFIG_SPI_BCM63XX + FILES:=$(LINUX_DIR)/drivers/spi/bcm63xx_spi.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,92,bcm63xx_spi) +endef + +define KernelPackage/bcm63xx-spi/description + This package contains the Broadcom BCM63xx SPI Master driver +endef + +$(eval $(call KernelPackage,bcm63xx-spi)) diff --git a/package/spi-ks8995/Makefile b/package/spi-ks8995/Makefile index 26b9d12a4d..84c5250ec0 100644 --- a/package/spi-ks8995/Makefile +++ b/package/spi-ks8995/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk define KernelPackage/spi-ks8995 - SUBMENU:=Other modules + SUBMENU:=SPI Support TITLE:=Micrel/Kendin KS8995 Ethernet switch control DEPENDS:=@LINUX_2_6 FILES:=$(PKG_BUILD_DIR)/spi_ks8995.$(LINUX_KMOD_SUFFIX)