Browse Source

bcm63xx: move bcm63xx-spi into the kernel

The SPI driver is needed for supporting to boot from SPI flash on BCM6358
and BCM6368, and for SPI connected switches.

Signed-off-by: Jonas Gorski <[email protected]>

SVN-Revision: 35304
Jonas Gorski 13 years ago
parent
commit
3e998d9cf9

+ 1 - 1
target/linux/brcm63xx/config-3.6

@@ -135,7 +135,7 @@ CONFIG_RTL8367_PHY=y
 CONFIG_SERIAL_BCM63XX=y
 CONFIG_SERIAL_BCM63XX=y
 CONFIG_SERIAL_BCM63XX_CONSOLE=y
 CONFIG_SERIAL_BCM63XX_CONSOLE=y
 CONFIG_SPI=y
 CONFIG_SPI=y
-# CONFIG_SPI_BCM63XX is not set
+CONFIG_SPI_BCM63XX=y
 CONFIG_SPI_BCM63XX_HSSPI=y
 CONFIG_SPI_BCM63XX_HSSPI=y
 CONFIG_SPI_BITBANG=y
 CONFIG_SPI_BITBANG=y
 CONFIG_SPI_GPIO=y
 CONFIG_SPI_GPIO=y

+ 0 - 16
target/linux/brcm63xx/modules.mk

@@ -5,22 +5,6 @@
 # See /LICENSE for more information.
 # See /LICENSE for more information.
 #
 #
 
 
-define KernelPackage/bcm63xx-spi
-  SUBMENU:=$(SPI_MENU)
-  TITLE:=Broadcom BCM63xx SPI driver
-  DEPENDS:=@TARGET_brcm63xx
-  KCONFIG:=CONFIG_SPI_BCM63XX
-  FILES:=$(LINUX_DIR)/drivers/spi/spi-bcm63xx.ko
-  AUTOLOAD:=$(call AutoLoad,92,spi-bcm63xx)
-endef
-
-define KernelPackage/bcm63xx-spi/description
-  This package contains the Broadcom BCM63xx SPI Master driver
-endef
-
-$(eval $(call KernelPackage,bcm63xx-spi))
-
-
 define KernelPackage/pcmcia-bcm63xx
 define KernelPackage/pcmcia-bcm63xx
   SUBMENU:=$(PCMCIA_MENU)
   SUBMENU:=$(PCMCIA_MENU)
   TITLE:=Broadcom BCM63xx PCMCIA support
   TITLE:=Broadcom BCM63xx PCMCIA support

+ 1 - 1
target/linux/brcm63xx/profiles/104-No-WiFi.mk

@@ -7,7 +7,7 @@
 
 
 define Profile/NoWiFi
 define Profile/NoWiFi
   NAME:=No WiFi (BCM6338)
   NAME:=No WiFi (BCM6338)
-  PACKAGES:=kmod-bcm63xx-spi
+  PACKAGES:=
 endef
 endef
 
 
 define Profile/NoWiFi/description
 define Profile/NoWiFi/description

+ 0 - 1
target/linux/brcm63xx/profiles/200-GW6X00.mk

@@ -9,7 +9,6 @@ define Profile/GW6X00
   NAME:=Tecom GW6X00
   NAME:=Tecom GW6X00
   PACKAGES:=kmod-brcm-wl kmod-usb-core kmod-usb-ohci kmod-usb-storage \
   PACKAGES:=kmod-brcm-wl kmod-usb-core kmod-usb-ohci kmod-usb-storage \
 	kmod-fs-ext4 kmod-nls-cp437 kmod-nls-iso8859-1 e2fsprogs \
 	kmod-fs-ext4 kmod-nls-cp437 kmod-nls-iso8859-1 e2fsprogs \
-	kmod-bcm63xx-spi \
 	kmod-ipt-nathelper-extra wlc
 	kmod-ipt-nathelper-extra wlc
 endef
 endef