Changeset 10844


Ignore:
Timestamp:
2008-04-15T09:33:43+02:00 (8 years ago)
Author:
juhosg
Message:

[package] move spi_gpio driver into the kernel, clean-up SPI modules

Location:
trunk
Files:
4 added
6 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/modules/other.mk

    r10798 r10844  
    536536  SUBMENU:=$(OTHER_MENU) 
    537537  TITLE:=MMC/SD over SPI Support 
    538   DEPENDS:=@LINUX_2_6 
     538  DEPENDS:=@LINUX_2_6 +kmod-mmc +kmod-spi +kmod-crc-itu-t +kmod-crc7 
    539539  KCONFIG:=CONFIG_MMC_SPI 
    540540  FILES:=$(LINUX_DIR)/drivers/mmc/host/mmc_spi.$(LINUX_KMOD_SUFFIX) 
     
    565565define KernelPackage/spi 
    566566  SUBMENU:=$(OTHER_MENU) 
    567   TITLE:=Serial Peripheral Interface 
    568   DEPENDS:=@LINUX_2_6 +kmod-crc-itu-t +kmod-crc7 
    569   KCONFIG:=CONFIG_SPI=y \ 
    570         CONFIG_MTD_DATAFLASH \ 
    571         CONFIG_MTD_M25P80 \ 
    572         CONFIG_SPI_AT25 \ 
    573         CONFIG_SPI_SPIDEV \ 
    574         CONFIG_SPI_TLE62X0 
    575   FILES:= \ 
    576         $(LINUX_DIR)/drivers/spi/at25.$(LINUX_KMOD_SUFFIX) \ 
    577         $(LINUX_DIR)/drivers/spi/spidev.$(LINUX_KMOD_SUFFIX) \ 
    578         $(LINUX_DIR)/drivers/spi/tle62x0.$(LINUX_KMOD_SUFFIX) \ 
    579         $(LINUX_DIR)/drivers/mtd/devices/m25p80.$(LINUX_KMOD_SUFFIX) \ 
    580         $(LINUX_DIR)/drivers/mtd/devices/mtd_dataflash.$(LINUX_KMOD_SUFFIX) 
    581   AUTOLOAD:=$(call AutoLoad,90,spi) 
     567  TITLE:=Serial Peripheral Interface support 
     568  DEPENDS:=@LINUX_2_6 
     569  KCONFIG:=\ 
     570        CONFIG_SPI=y \ 
     571        CONFIG_SPI_MASTER=y 
    582572endef 
    583573 
    584574define KernelPackage/spi/description 
    585  This package contains the Serial Peripheral Interface driver 
     575 This package contains the Serial Peripheral Interface Master driver 
    586576endef 
    587577 
     
    590580define KernelPackage/spi-bitbang 
    591581  SUBMENU:=$(OTHER_MENU) 
    592   TITLE:=Serial Peripheral Interface bitbanging 
     582  TITLE:=Serial Peripheral Interface bitbanging library 
    593583  DEPENDS:=@LINUX_2_6 +kmod-spi 
    594584  KCONFIG:=CONFIG_SPI_BITBANG 
     
    598588 
    599589define KernelPackage/spi-bitbang/description 
    600  This package contains the Serial Peripheral Interface bitbanging library 
     590 This package contains the SPI bitbanging library 
    601591endef 
    602592 
    603593$(eval $(call KernelPackage,spi-bitbang)) 
     594 
     595define KernelPackage/spi-gpio 
     596  SUBMENU:=$(OTHER_MENU) 
     597  TITLE:=GPIO based bitbanging SPI controller 
     598  DEPENDS:=@LINUX_2_6 +kmod-spi-bitbang 
     599  KCONFIG:=CONFIG_SPI_GPIO 
     600  FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio.$(LINUX_KMOD_SUFFIX) 
     601  AUTOLOAD:=$(call AutoLoad,92,spi_gpio) 
     602endef 
     603 
     604define KernelPackage/spi-gpio/description 
     605 This package contains the GPIO based bitbanging SPI controller driver 
     606endef 
     607 
     608$(eval $(call KernelPackage,spi-gpio)) 
     609 
     610define KernelPackage/spi-dev 
     611  SUBMENU:=$(OTHER_MENU) 
     612  TITLE:=User mode SPI device driver 
     613  DEPENDS:=@LINUX_2_6 +kmod-spi 
     614  KCONFIG:=CONFIG_SPI_SPIDEV 
     615  FILES:=$(LINUX_DIR)/drivers/spi/spidev.$(LINUX_KMOD_SUFFIX) 
     616  AUTOLOAD:=$(call AutoLoad,91,spidev) 
     617endef 
     618 
     619define KernelPackage/spi-dev/description 
     620 This package contains the user mode SPI device driver 
     621endef 
     622 
     623$(eval $(call KernelPackage,spi-dev)) 
     624 
  • trunk/package/mmc_over_gpio/Makefile

    r10799 r10844  
    1 #  
     1# 
    22# Copyright (C) 2008 OpenWrt.org 
    33# 
     
    1111 
    1212PKG_NAME:=mmc-over-gpio 
    13 PKG_RELEASE:=1 
     13PKG_RELEASE:=2 
    1414 
    1515include $(INCLUDE_DIR)/package.mk 
     
    1818define KernelPackage/mmc-over-gpio 
    1919  SUBMENU:=Other modules 
    20   DEPENDS:=@LINUX_2_6 +kmod-spi +kmod-spi-bitbang +kmod-mmc +kmod-mmc-spi @!TARGET_x86 
     20  DEPENDS:=@LINUX_2_6 +kmod-mmc-spi +kmod-spi-gpio @!TARGET_x86 
    2121  TITLE:=MMC/SD card over GPIO support 
    22   FILES:=$(PKG_BUILD_DIR)/spi_gpio.$(LINUX_KMOD_SUFFIX) \ 
    23          $(PKG_BUILD_DIR)/mmc_over_spigpio.$(LINUX_KMOD_SUFFIX) 
    24   AUTOLOAD:=$(call AutoLoad,92,spi_gpio mmc_over_spigpio) 
     22  FILES:=$(PKG_BUILD_DIR)/mmc_over_spigpio.$(LINUX_KMOD_SUFFIX) 
     23  AUTOLOAD:=$(call AutoLoad,93,spi_gpio mmc_over_spigpio) 
    2524endef 
    2625 
  • trunk/package/mmc_over_gpio/src/Makefile

    r10637 r10844  
    1 obj-m += spi_gpio.o 
    21obj-m += mmc_over_spigpio.o 
  • trunk/package/mmc_over_gpio/src/mmc_over_spigpio.c

    r10637 r10844  
    1010#include <linux/list.h> 
    1111#include <linux/mutex.h> 
    12 #include "linux/spi/spi_gpio.h" //XXX 
     12#include <linux/spi/spi_gpio.h> 
    1313 
    1414 
  • trunk/target/linux/generic-2.6/config-2.6.23

    r10733 r10844  
    727727CONFIG_MSDOS_FS=m 
    728728CONFIG_MSDOS_PARTITION=y 
     729# CONFIG_MTD_DATAFLASH is not set 
     730# CONFIG_MTD_M25P80 is not set 
    729731# CONFIG_MTD_NAND is not set 
    730732# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set 
     
    13871389# CONFIG_SPI is not set 
    13881390# CONFIG_SPI_MASTER is not set 
     1391# CONFIG_SPI_AT25 is not set 
     1392# CONFIG_SPI_TLE62X0 is not set 
    13891393CONFIG_SPLIT_PTLOCK_CPUS=4 
    13901394CONFIG_SQUASHFS=y 
  • trunk/target/linux/generic-2.6/config-2.6.24

    r10842 r10844  
    747747CONFIG_MSDOS_FS=m 
    748748CONFIG_MSDOS_PARTITION=y 
     749# CONFIG_MTD_DATAFLASH is not set 
     750# CONFIG_MTD_M25P80 is not set 
    749751# CONFIG_MTD_INTEL_VR_NOR is not set 
    750752# CONFIG_MTD_NAND is not set 
     
    14251427# CONFIG_SPI is not set 
    14261428# CONFIG_SPI_MASTER is not set 
     1429# CONFIG_SPI_AT25 is not set 
     1430# CONFIG_SPI_TLE62X0 is not set 
    14271431CONFIG_SPLIT_PTLOCK_CPUS=4 
    14281432CONFIG_SQUASHFS=y 
Note: See TracChangeset for help on using the changeset viewer.