Use modules for wifi and usb

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21898 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 17 insertions, 57 deletions

diff --git a/target/linux/omap35xx/gumstix/base-files/lib/firmware/license.txt b/target/linux/omap35xx/gumstix/base-files/lib/firmware/license.txt
deleted file mode 100644
index 3224e1bbfb..0000000000
--- a/target/linux/omap35xx/gumstix/base-files/lib/firmware/license.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-FIRMWARE LICENSE TERMS
-
-
-Copyright (c) Marvell International Ltd.
-
-All rights reserved.
-
-Redistribution. Redistribution and use in binary form, without modification, are permitted provided that the following conditions are met:
-
-* Redistributions must reproduce the above copyright notice and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-* Neither the name of Marvell International Ltd. nor the names of its suppliers may be used to endorse or promote products derived from this software without specific prior written permission.
-
-* No reverse engineering, decompilation, or disassembly of this software is permitted.
-
-Limited patent license. Marvell International Ltd. grants a world-wide, royalty-free, non-exclusive license under patents it now or hereafter owns or controls to make, have made, use, import, offer to sell and sell ("Utilize") this software, but solely to the extent that any such patent is necessary to Utilize the software alone, or in combination with an operating system licensed under an approved Open Source license as listed by the Open Source Initiative at http://opensource.org/licenses. The patent license shall not apply to any other combinations which include this software. No hardware per se is licensed hereunder.
-
-DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/target/linux/omap35xx/gumstix/config-2.6.34 b/target/linux/omap35xx/gumstix/config-2.6.34
index 407b0c32e2..4dd057af5a 100644
--- a/target/linux/omap35xx/gumstix/config-2.6.34
+++ b/target/linux/omap35xx/gumstix/config-2.6.34
@@ -30,7 +30,6 @@ CONFIG_ARM_L1_CACHE_SHIFT_6=y
 CONFIG_ARM_THUMB=y
 # CONFIG_ARM_THUMBEE is not set
 # CONFIG_ARPD is not set
-# CONFIG_ATH_COMMON is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV_INITRD is not set
 CONFIG_BLK_DEV_LOOP=y
@@ -44,13 +43,6 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 # CONFIG_BRIDGE is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CFG80211=y
-# CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_WEXT=y
 CONFIG_CMDLINE=" debug "
 CONFIG_COMMON_CLKDEV=y
 CONFIG_COMPAT_BRK=y
@@ -109,7 +101,6 @@ CONFIG_DEVKMEM=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_DISPLAY_SUPPORT=y
-# CONFIG_DM9000 is not set
 CONFIG_DNOTIFY=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_ELF_CORE=y
@@ -170,6 +161,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
@@ -197,12 +189,6 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_SPIN_UNLOCK=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=y
@@ -219,7 +205,6 @@ CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_RARP=y
 # CONFIG_ISDN is not set
 # CONFIG_ISP1301_OMAP is not set
-# CONFIG_IWM is not set
 CONFIG_JBD=y
 CONFIG_JBD2=m
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
@@ -242,14 +227,7 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_LEDS_GPIO is not set
 # CONFIG_LEDS_REGULATOR is not set
 # CONFIG_LEDS_TRIGGERS is not set
-CONFIG_LIB80211=y
 CONFIG_LIBCRC32C=y
-CONFIG_LIBERTAS=y
-# CONFIG_LIBERTAS_DEBUG is not set
-# CONFIG_LIBERTAS_MESH is not set
-CONFIG_LIBERTAS_SDIO=y
-CONFIG_LIBERTAS_SPI=y
-CONFIG_LIBERTAS_USB=y
 CONFIG_LOG_BUF_SHIFT=16
 # CONFIG_MACH_CM_T35 is not set
 # CONFIG_MACH_DEVKIT8000 is not set
@@ -267,8 +245,6 @@ CONFIG_LOG_BUF_SHIFT=16
 # CONFIG_MACH_OMAP_ZOOM3 is not set
 CONFIG_MACH_OVERO=y
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_MARVELL_PHY=y
-# CONFIG_MAX63XX_WATCHDOG is not set
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MISC_DEVICES is not set
 CONFIG_MMC=y
@@ -306,9 +282,9 @@ CONFIG_NEON=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_NETWORK_FILESYSTEMS is not set
+# CONFIG_NET_ETHERNET is not set
 CONFIG_NET_KEY=y
 # CONFIG_NET_SCHED is not set
-# CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
@@ -352,7 +328,6 @@ CONFIG_PANEL_GENERIC=y
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_PDA_POWER is not set
 CONFIG_PERF_USE_VMALLOC=y
-CONFIG_PHYLIB=y
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_OPS=y
@@ -391,7 +366,6 @@ CONFIG_SERIO=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y
-CONFIG_SMSC911X=y
 CONFIG_SPI=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_GPIO is not set
@@ -411,7 +385,6 @@ CONFIG_THERMAL_HWMON=y
 # CONFIG_THUMB2_KERNEL is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_TINY_RCU is not set
-# CONFIG_TI_DAVINCI_EMAC is not set
 CONFIG_TREE_RCU=y
 # CONFIG_TWL4030_CODEC is not set
 CONFIG_TWL4030_CORE=y
@@ -434,11 +407,6 @@ CONFIG_USB_MUSB_HOST=y
 # CONFIG_USB_MUSB_PERIPHERAL is not set
 CONFIG_USB_MUSB_SOC=y
 CONFIG_USB_OTG_UTILS=y
-CONFIG_USB_SERIAL=y
-# CONFIG_USB_SERIAL_CONSOLE is not set
-CONFIG_USB_SERIAL_CP210X=y
-CONFIG_USB_SERIAL_FTDI_SIO=y
-CONFIG_USB_SERIAL_PL2303=y
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_TI_CPPI_DMA is not set
 CONFIG_VECTORS_BASE=0xffff0000
diff --git a/target/linux/omap35xx/gumstix/defconfig.gumstix b/target/linux/omap35xx/gumstix/defconfig.gumstix
index 55407d16de..ed4d2c6067 100644
--- a/target/linux/omap35xx/gumstix/defconfig.gumstix
+++ b/target/linux/omap35xx/gumstix/defconfig.gumstix
@@ -15,3 +15,8 @@ CONFIG_TARGET_ROOTFS_PARTSIZE=200
 CONFIG_SOFT_FLOAT=n
 CONFIG_TARGET_ROOTFS_EXT2FS=y
 CONFIG_UDEV_EXTRA_firmware=y
+CONFIG_IMAGEOPT=y
+CONFIG_UCI_PRECONFIG_network_lan_dns="192.168.2.1"
+CONFIG_UCI_PRECONFIG_network_lan_gateway="192.168.2.1"
+CONFIG_UCI_PRECONFIG_network_lan_ipaddr="192.168.2.4"
+
diff --git a/target/linux/omap35xx/gumstix/profiles/gumstix.mk b/target/linux/omap35xx/gumstix/profiles/gumstix.mk
index 27939a8196..60b2d2a1b8 100644
--- a/target/linux/omap35xx/gumstix/profiles/gumstix.mk
+++ b/target/linux/omap35xx/gumstix/profiles/gumstix.mk
@@ -12,7 +12,11 @@ define Profile/Gumstix
 		ext2 usb udev kmod-bluetooth ntpclient wpa-supplicant \
 		wireless-tools wpa-cli \
 		bluez-utils bluez-hcidump hegw usbutils python pyserial \
-		python-mini python-openssl python-sqlite3 libstdcpp
+		python-mini python-openssl python-sqlite3 libstdcpp \
+		kmod-usb-serial kmod-usb-serial-cp210x kmod-usb-serial-ftdi \
+		kmod-usb-serial-pl2303 kmod-usb-uhci kmod-cfg80211 \
+		kmod-lib80211 kmod-libertas-sd kmod-mac80211 libnl-tiny \
+		crda iw
 endef
 
 define Profile/Gumstix/Description
diff --git a/target/linux/omap35xx/image/Makefile b/target/linux/omap35xx/image/Makefile
index aa23c0c838..adaf395b70 100644
--- a/target/linux/omap35xx/image/Makefile
+++ b/target/linux/omap35xx/image/Makefile
@@ -20,15 +20,16 @@ define Image/BuildKernel
 	rm linux.bin
 endef
 
-define Image/Build/squashfs
-    $(call prepare_generic_squashfs,$(BIN_DIR)/$(IMG_PREFIX)-$(KERNEL)-root.$(1))
-endef
-
 define Image/Build
 	$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(KERNEL)-root.$(1)
 	PADDING="true" PATH="$(TARGET_PATH)" ./gen_image.sh $(BIN_DIR)/$(IMG_PREFIX)-$(1).image 4 $(KDIR)/root.bootscript 240 $(KDIR)/root.$(1)
 	$(call Image/Build/$(1),$(1))
 endef
 
+ifdef CONFIG_TARGET_omap35xx_gumstix
+define Image/Prepare
+        $(CP) ../gumstix/base-files/lib/wifi/mac80211.sh $(TARGET_DIR)/lib/wifi
+endef
+endif
 
 $(eval $(call BuildImage))