enable usb support by default.

SVN-Revision: 22129
This commit is contained in:
Claudio Mignanti 2010-07-11 12:27:09 +00:00
parent ba56a699a9
commit 07ccad1f99
4 changed files with 7 additions and 35 deletions

View file

@ -131,7 +131,9 @@ CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS=5
CONFIG_ETRAX_SERIAL=y CONFIG_ETRAX_SERIAL=y
# CONFIG_ETRAX_SOFT_SHUTDOWN is not set # CONFIG_ETRAX_SOFT_SHUTDOWN is not set
# CONFIG_ETRAX_SYNCHRONOUS_SERIAL is not set # CONFIG_ETRAX_SYNCHRONOUS_SERIAL is not set
# CONFIG_ETRAX_USB_HOST is not set CONFIG_ETRAX_USB_HOST=y
CONFIG_ETRAX_USB_HOST_PORT1=y
CONFIG_ETRAX_USB_HOST_PORT2=y
# CONFIG_ETRAX_VCS_SIM is not set # CONFIG_ETRAX_VCS_SIM is not set
# CONFIG_ETRAX_WATCHDOG is not set # CONFIG_ETRAX_WATCHDOG is not set
CONFIG_FORCE_MAX_ZONEORDER=6 CONFIG_FORCE_MAX_ZONEORDER=6
@ -153,6 +155,8 @@ CONFIG_MTDRAM_ABS_POS=0
CONFIG_MTDRAM_ERASE_SIZE=128 CONFIG_MTDRAM_ERASE_SIZE=128
CONFIG_MTDRAM_TOTAL_SIZE=0 CONFIG_MTDRAM_TOTAL_SIZE=0
# CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_1000 is not set
CONFIG_NLS=y
CONFIG_NLS_UTF8=y
CONFIG_NO_IOPORT=y CONFIG_NO_IOPORT=y
# CONFIG_OOM_REBOOT is not set # CONFIG_OOM_REBOOT is not set
CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGEFLAGS_EXTENDED=y
@ -164,6 +168,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
# CONFIG_TREE_PREEMPT_RCU is not set # CONFIG_TREE_PREEMPT_RCU is not set
CONFIG_TREE_RCU=y CONFIG_TREE_RCU=y
CONFIG_UID16=y CONFIG_UID16=y
CONFIG_USB=y
# CONFIG_USB_ARCH_HAS_EHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set
# CONFIG_USB_ARCH_HAS_HCD is not set # CONFIG_USB_ARCH_HAS_HCD is not set
# CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_OHCI is not set

View file

@ -33,7 +33,7 @@
/***************************************************************************/ /***************************************************************************/
/***************************************************************************/ /***************************************************************************/
#define VERSION "1.00-openwrt_diff" #define VERSION "1.00-openwrt_diff-v1"
#define COPYRIGHT "(c) 2005, 2006 Axis Communications AB" #define COPYRIGHT "(c) 2005, 2006 Axis Communications AB"
#define DESCRIPTION "ETRAX 100LX USB Host Controller" #define DESCRIPTION "ETRAX 100LX USB Host Controller"

View file

@ -1,22 +0,0 @@
#
# Copyright (C) 2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
define KernelPackage/usb-etrax
SUBMENU:=$(USB_MENU)
TITLE:=Support for the ETRAX USB host controller
KCONFIG:=CONFIG_ETRAX_USB_HOST \
CONFIG_ETRAX_USB_HOST_PORT1=y CONFIG_ETRAX_USB_HOST_PORT2=y
FILES:=$(LINUX_DIR)/drivers/usb/host/hc-crisv10.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,hc-crisv10,1)
$(call AddDepends/usb,@TARGET_etrax)
endef
define KernelPackage/usb-etrax/description
Kernel support for the ETRAX USB host controller
endef
$(eval $(call KernelPackage,usb-etrax))

View file

@ -18,14 +18,3 @@
obj-$(CONFIG_USB_C67X00_HCD) += c67x00/ obj-$(CONFIG_USB_C67X00_HCD) += c67x00/
--- a/arch/cris/arch-v10/drivers/Kconfig
+++ b/arch/cris/arch-v10/drivers/Kconfig
@@ -410,7 +410,7 @@ config ETRAX_RS485_DISABLE_RECEIVER
Axis 2400/2401 must disable receiver.
config ETRAX_USB_HOST
- bool "USB host"
+ tristate "ETRAX USB host"
select USB
help
This option enables the host functionality of the ETRAX 100LX