From: Jonas Gorski Date: Wed, 23 Jan 2013 10:12:13 +0000 (+0000) Subject: bcm63xx: move bcm63xx-spi into the kernel X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3e998d9cf9b157e0fc31e4b6dcc1345db7b4743c;p=librecmc%2Flibrecmc.git 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 SVN-Revision: 35304 --- diff --git a/target/linux/brcm63xx/config-3.6 b/target/linux/brcm63xx/config-3.6 index 9fea95b480..92e6e3d630 100644 --- a/target/linux/brcm63xx/config-3.6 +++ b/target/linux/brcm63xx/config-3.6 @@ -135,7 +135,7 @@ CONFIG_RTL8367_PHY=y CONFIG_SERIAL_BCM63XX=y CONFIG_SERIAL_BCM63XX_CONSOLE=y CONFIG_SPI=y -# CONFIG_SPI_BCM63XX is not set +CONFIG_SPI_BCM63XX=y CONFIG_SPI_BCM63XX_HSSPI=y CONFIG_SPI_BITBANG=y CONFIG_SPI_GPIO=y diff --git a/target/linux/brcm63xx/modules.mk b/target/linux/brcm63xx/modules.mk index 43ec62430f..88fa4b4c51 100644 --- a/target/linux/brcm63xx/modules.mk +++ b/target/linux/brcm63xx/modules.mk @@ -5,22 +5,6 @@ # 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 SUBMENU:=$(PCMCIA_MENU) TITLE:=Broadcom BCM63xx PCMCIA support diff --git a/target/linux/brcm63xx/profiles/104-No-WiFi.mk b/target/linux/brcm63xx/profiles/104-No-WiFi.mk index 9d32da60b3..9b59b172fe 100644 --- a/target/linux/brcm63xx/profiles/104-No-WiFi.mk +++ b/target/linux/brcm63xx/profiles/104-No-WiFi.mk @@ -7,7 +7,7 @@ define Profile/NoWiFi NAME:=No WiFi (BCM6338) - PACKAGES:=kmod-bcm63xx-spi + PACKAGES:= endef define Profile/NoWiFi/description diff --git a/target/linux/brcm63xx/profiles/200-GW6X00.mk b/target/linux/brcm63xx/profiles/200-GW6X00.mk index b1c516a8b4..1cb763dac1 100644 --- a/target/linux/brcm63xx/profiles/200-GW6X00.mk +++ b/target/linux/brcm63xx/profiles/200-GW6X00.mk @@ -9,7 +9,6 @@ define Profile/GW6X00 NAME:=Tecom GW6X00 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-bcm63xx-spi \ kmod-ipt-nathelper-extra wlc endef