Browse Source

some usb fixes, wrong controller choosen. (and some more minor changes)

Waldemar Brodkorb 14 years ago
parent
commit
b944726b75

+ 2 - 2
package/busybox/config/util-linux/Config.in

@@ -358,7 +358,7 @@ config BUSYBOX_LOSETUP
 
 
 config BUSYBOX_LSPCI
 config BUSYBOX_LSPCI
 	bool "lspci"
 	bool "lspci"
-	default y
+	default n
 	depends on !ADK_PACKAGE_PCIUTILS
 	depends on !ADK_PACKAGE_PCIUTILS
 	help
 	help
 	  lspci is a utility for displaying information about PCI buses in the
 	  lspci is a utility for displaying information about PCI buses in the
@@ -368,7 +368,7 @@ config BUSYBOX_LSPCI
 
 
 config BUSYBOX_LSUSB
 config BUSYBOX_LSUSB
 	bool "lsusb"
 	bool "lsusb"
-	default y
+	default n
 	depends on !ADK_PACKAGE_LSUSB
 	depends on !ADK_PACKAGE_LSUSB
 	help
 	help
 	  lsusb is a utility for displaying information about USB buses in the
 	  lsusb is a utility for displaying information about USB buses in the

+ 1 - 0
package/firefox/Makefile

@@ -16,6 +16,7 @@ PKG_BUILDDEP:=		alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11
 PKG_BUILDDEP+=		nspr nss jpeg libXt fontconfig sqlite
 PKG_BUILDDEP+=		nspr nss jpeg libXt fontconfig sqlite
 PKG_URL:=		http://www.mozilla.org/
 PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
+PKG_NOPARALLEL:=	1
 
 
 PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
 PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
 PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin
 PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin

+ 4 - 4
package/pciutils/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 
 PKG_NAME:=		pciutils
 PKG_NAME:=		pciutils
 PKG_VERSION:=		3.1.7
 PKG_VERSION:=		3.1.7
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		f3e349d22a3714b4272b171649ad5235
 PKG_MD5SUM:=		f3e349d22a3714b4272b171649ad5235
 PKG_DESCR:=		PCI Utilities
 PKG_DESCR:=		PCI Utilities
 PKG_SECTION:=		utils
 PKG_SECTION:=		utils
@@ -29,8 +29,8 @@ MAKE_FLAGS+=		CC="${TARGET_CC}" \
 ALL_TARGET:=
 ALL_TARGET:=
 
 
 do-install:
 do-install:
-	${INSTALL_DIR} ${IDIR_PCIUTILS}/usr/{share,sbin}
-	${INSTALL_BIN} ${WRKBUILD}/{lspci,setpci} ${IDIR_PCIUTILS}/usr/sbin/
-	${INSTALL_DATA} ${WRKBUILD}/pci.ids ${IDIR_PCIUTILS}/usr/share/
+	${INSTALL_DIR} ${IDIR_PCIUTILS}/usr/{share,bin}
+	${INSTALL_BIN} ${WRKBUILD}/{lspci,setpci} ${IDIR_PCIUTILS}/usr/bin
+	${INSTALL_DATA} ${WRKBUILD}/pci.ids ${IDIR_PCIUTILS}/usr/share
 
 
 include ${TOPDIR}/mk/pkg-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

+ 1 - 0
package/uclibc++/Makefile

@@ -12,6 +12,7 @@ PKG_SECTION:=		libs
 PKG_URL:=		http://cxx.uclibc.org/
 PKG_URL:=		http://cxx.uclibc.org/
 PKG_SITES:=		http://cxx.uclibc.org/src/
 PKG_SITES:=		http://cxx.uclibc.org/src/
 PKG_NEED_CXX:=		1
 PKG_NEED_CXX:=		1
+PKG_NOPARALLEL:=	1
 
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 

+ 3 - 3
package/usbutils/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 
 PKG_NAME:=		usbutils
 PKG_NAME:=		usbutils
 PKG_VERSION:=		0.86
 PKG_VERSION:=		0.86
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		34979f675d2bcb3e1b45012fa830a53f
 PKG_MD5SUM:=		34979f675d2bcb3e1b45012fa830a53f
 PKG_DESCR:=		A program to list USB devices
 PKG_DESCR:=		A program to list USB devices
 PKG_SECTION:=		utils
 PKG_SECTION:=		utils
@@ -23,7 +23,7 @@ post-install:
 	${INSTALL_DIR} ${IDIR_LSUSB}/usr/share
 	${INSTALL_DIR} ${IDIR_LSUSB}/usr/share
 	${INSTALL_DATA} ${WRKINST}/usr/share/usb.ids \
 	${INSTALL_DATA} ${WRKINST}/usr/share/usb.ids \
 		${IDIR_LSUSB}/usr/share/
 		${IDIR_LSUSB}/usr/share/
-	${INSTALL_DIR} ${IDIR_LSUSB}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/lsusb ${IDIR_LSUSB}/usr/sbin/
+	${INSTALL_DIR} ${IDIR_LSUSB}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/lsusb ${IDIR_LSUSB}/usr/bin
 
 
 include ${TOPDIR}/mk/pkg-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

+ 1 - 6
target/linux/config/Config.in.misc

@@ -1,9 +1,3 @@
-#config ADK_LINUX_INITRAMFS_BUILTIN
-#	select ADK_KERNEL_BLK_DEV_INITRD
-#	select ADK_KERNEL_INITRAMFS_COMPRESSION_NONE
-#	boolean
-#	default n
-
 config ADK_KERNEL_RFKILL
 config ADK_KERNEL_RFKILL
  	boolean
  	boolean
 
 
@@ -46,6 +40,7 @@ config ADK_KERNEL_RTC_DRV_CMOS
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_IBM_X40
  	default n
  	default n
+	depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40)
  	help
  	help
 	 PC CMOS RTC support.
 	 PC CMOS RTC support.
 	
 	

+ 21 - 19
target/linux/config/Config.in.usb

@@ -1,35 +1,37 @@
 menu "USB support"
 menu "USB support"
 depends on ADK_TARGET_WITH_USB
 depends on ADK_TARGET_WITH_USB
 
 
+config ADK_KERNEL_USB
+	boolean
+
 config ADK_KERNEL_USB_LIBUSUAL
 config ADK_KERNEL_USB_LIBUSUAL
 	tristate
 	tristate
 
 
 config ADK_KERNEL_USB_SERIAL
 config ADK_KERNEL_USB_SERIAL
 	boolean
 	boolean
 
 
-config ADK_KERNEL_USB
-	boolean
-
 config ADK_KERNEL_USB_STORAGE
 config ADK_KERNEL_USB_STORAGE
 	boolean
 	boolean
 
 
 config ADK_KERNEL_USB_EHCI_HCD
 config ADK_KERNEL_USB_EHCI_HCD
 	boolean
 	boolean
+	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 
 
 config ADK_KERNEL_USB_UHCI_HCD
 config ADK_KERNEL_USB_UHCI_HCD
 	boolean
 	boolean
+	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 
 
 config ADK_KPACKAGE_KMOD_USB
 config ADK_KPACKAGE_KMOD_USB
 	prompt "kmod-usb......................... USB support"
 	prompt "kmod-usb......................... USB support"
 	tristate
 	tristate
+	select ADK_KERNEL_NLS
+	depends on !ADK_KERNEL_USB
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default n
 	default n
-	depends on !ADK_KERNEL_USB
-	select ADK_KERNEL_NLS
 	help
 	help
 	  Universal Serial Bus (USB) is a specification for a serial bus
 	  Universal Serial Bus (USB) is a specification for a serial bus
 	  subsystem which offers higher speeds and more features than the
 	  subsystem which offers higher speeds and more features than the
@@ -62,10 +64,12 @@ config ADK_KPACKAGE_KMOD_USB
 config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
 config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
 	prompt   "kmod-usb-uhci................... Support for UHCI controllers"
 	prompt   "kmod-usb-uhci................... Support for UHCI controllers"
 	tristate
 	tristate
+	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on !ADK_KERNEL_USB_UHCI_HCD
 	depends on !ADK_KERNEL_USB_UHCI_HCD
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	select ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default y if ADK_TARGET_SYSTEM_IBM_X40
+	default n
 	help
 	help
 	  The Universal Host Controller Interface is a standard by Intel for
 	  The Universal Host Controller Interface is a standard by Intel for
 	  accessing the USB hardware in the PC (which is also called the USB
 	  accessing the USB hardware in the PC (which is also called the USB
@@ -79,15 +83,13 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
 config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	prompt   "kmod-usb-ohci................... Support for OHCI controllers"
 	prompt   "kmod-usb-ohci................... Support for OHCI controllers"
 	tristate
 	tristate
+	select ADK_PACKAGE_KMOD_USB_CONTROLLER
+	depends on ADK_KPACKAGE_KMOD_USB
+	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
-	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default n
 	default n
-	depends on ADK_KPACKAGE_KMOD_USB
-	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	help
 	help
 	  The Open Host Controller Interface (OHCI) is a standard for accessing
 	  The Open Host Controller Interface (OHCI) is a standard for accessing
 	  USB 1.1 host controller hardware.  It does more in hardware than Intel's
 	  USB 1.1 host controller hardware.  It does more in hardware than Intel's
@@ -101,10 +103,10 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD
 config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD
 	prompt   "kmod-usb-isp116x................ ISP116X HCD support"
 	prompt   "kmod-usb-isp116x................ ISP116X HCD support"
 	tristate
 	tristate
-	default n
+	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	select ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
 	help
 	help
 	  The ISP1160 and ISP1161 chips are USB host controllers. Enable this
 	  The ISP1160 and ISP1161 chips are USB host controllers. Enable this
 	  option if your board has this chip. If unsure, say N.
 	  option if your board has this chip. If unsure, say N.
@@ -114,10 +116,10 @@ config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD
 config ADK_KPACKAGE_KMOD_USB_SL811_HCD
 config ADK_KPACKAGE_KMOD_USB_SL811_HCD
 	prompt   "kmod-usb-sl811.................. SL811HS HCD support"
 	prompt   "kmod-usb-sl811.................. SL811HS HCD support"
 	tristate
 	tristate
-	default n
+	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	select ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
 	help
 	help
 	  The SL811HS is a single-port USB controller that supports either
 	  The SL811HS is a single-port USB controller that supports either
 	  host side or peripheral side roles.  Enable this option if your
 	  host side or peripheral side roles.  Enable this option if your
@@ -128,15 +130,15 @@ config ADK_KPACKAGE_KMOD_USB_SL811_HCD
 config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 	prompt   "kmod-usb-ehci................... Support for USB 2.0 controllers"
 	prompt   "kmod-usb-ehci................... Support for USB 2.0 controllers"
 	tristate
 	tristate
+	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on !ADK_KERNEL_USB_EHCI_HCD
 	depends on !ADK_KERNEL_USB_EHCI_HCD
+	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
+	depends on ADK_KPACKAGE_KMOD_USB
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default n
 	default n
-	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on ADK_KPACKAGE_KMOD_USB
-	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	help
 	help
 	  The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
 	  The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
 	  "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
 	  "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
@@ -158,7 +160,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 
 
 config ADK_PACKAGE_KMOD_USB_CONTROLLER
 config ADK_PACKAGE_KMOD_USB_CONTROLLER
 	tristate
 	tristate
-	depends on ADK_KPACKAGE_KMOD_USB_UHCI_HCD || ADK_KPACKAGE_KMOD_USB_OHCI_HCD || ADK_KPACKAGE_KMOD_EHCI_HCD
+	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default n
 	default n
 
 
 config ADK_KPACKAGE_KMOD_USB_ACM
 config ADK_KPACKAGE_KMOD_USB_ACM

+ 0 - 8
target/packages/pkg-available/laptop

@@ -1,19 +1,11 @@
 config ADK_PKG_LAPTOP
 config ADK_PKG_LAPTOP
 	bool "Choose packages for a laptop system with X"
 	bool "Choose packages for a laptop system with X"
 	default n
 	default n
-	select ADK_KPACKAGE_KMOD_PCMCIA
-	select ADK_KPACKAGE_KMOD_PCCARD
-	select ADK_KPACKAGE_KMOD_SERIAL_8250_CS
 	select ADK_PACKAGE_SCREEN
 	select ADK_PACKAGE_SCREEN
 	select ADK_PACKAGE_VIM
 	select ADK_PACKAGE_VIM
 	select ADK_PACKAGE_SUDO
 	select ADK_PACKAGE_SUDO
 	select ADK_PACKAGE_KEYCHAIN
 	select ADK_PACKAGE_KEYCHAIN
-	select ADK_PACKAGE_CRYPTSETUP
-	select ADK_PACKAGE_OPENSC
-	select ADK_PACKAGE_PCSC_LITE
-	select ADK_PACKAGE_CCID
 	select ADK_PACKAGE_ALSA_UTILS
 	select ADK_PACKAGE_ALSA_UTILS
-	select ADK_PACKAGE_OPENSSL_PKCS11
 	select ADK_PACKAGE_OPENSSH_CLIENT
 	select ADK_PACKAGE_OPENSSH_CLIENT
 	select ADK_PACKAGE_OPENSSH_CLIENT_UTILS
 	select ADK_PACKAGE_OPENSSH_CLIENT_UTILS
 	select ADK_PACKAGE_OPENSSH_SERVER
 	select ADK_PACKAGE_OPENSSH_SERVER