Sfoglia il codice sorgente

add alsa hrtimer for rpi, fix some dependency bugs after the switch to miniconfig

Waldemar Brodkorb 11 anni fa
parent
commit
e73de827e7

+ 5 - 1
mk/modules.mk

@@ -1163,10 +1163,14 @@ $(eval $(call KMOD_template,SND,snd,\
 	$(MODULES_DIR)/kernel/sound/core/snd-pcm \
 ,40))
 
+$(eval $(call KMOD_template,SND_HRTIMER,snd-hrtimer,\
+	$(MODULES_DIR)/kernel/sound/core/snd-hrtimer \
+,41))
+
 $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\
 	$(MODULES_DIR)/kernel/sound/core/snd-hwdep \
 	$(MODULES_DIR)/kernel/sound/core/snd-rawmidi \
-,41))
+,42))
 
 $(eval $(call KMOD_template,SND_OSSEMUL,snd-ossemul,\
 	$(MODULES_DIR)/kernel/sound/core/oss/snd-mixer-oss \

+ 2 - 2
package/nfs-utils/Makefile

@@ -21,9 +21,9 @@ PKG_SITES:=		http://openadk.org/distfiles/
 PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 
 PKG_SUBPKGS:=		NFS_UTILS NFS_UTILS_CLIENT NFS_UTILS_SERVER
-PKGSS_NFS_UTILS_CLIENT:=kmod-nfs-fs
+PKGSS_NFS_UTILS_CLIENT:=kmod-nfs-fs kmod-sunrpc
 PKGSD_NFS_UTILS_CLIENT:=NFS client utilities (mount)
-PKGSS_NFS_UTILS_SERVER:=kmod-nfsd
+PKGSS_NFS_UTILS_SERVER:=kmod-nfsd kmod-sunrpc
 PKGSD_NFS_UTILS_SERVER:=NFS server daemons and utilities
 
 PKG_FLAVOURS_NFS_UTILS:=WITH_KERBEROS

+ 7 - 0
target/linux/config/Config.in.audio

@@ -4,6 +4,9 @@ depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SOUND
 config ADK_KERNEL_SND_ARM
 	boolean
 
+config ADK_KERNEL_SND_USB
+	boolean
+
 config ADK_KERNEL_SND_SOC
 	boolean
 
@@ -28,6 +31,9 @@ config ADK_KERNEL_SND_MIXER_OSS
 config ADK_KERNEL_SND_PCM_OSS
 	boolean
 
+config ADK_KERNEL_SND_HRTIMER
+	boolean
+
 config ADK_KPACKAGE_KMOD_SOUND
 	tristate
 
@@ -126,6 +132,7 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835
 	tristate
 	select ADK_KPACKAGE_KMOD_SND
 	select ADK_KERNEL_SND_ARM
+	select ADK_KERNEL_SND_HRTIMER
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n

+ 5 - 0
target/linux/config/Config.in.fsnet

@@ -1,3 +1,6 @@
+config ADK_KERNEL_FILE_LOCKING
+	boolean
+
 config ADK_KERNEL_FS_POSIX_ACL
 	boolean
 	default y
@@ -62,6 +65,7 @@ config ADK_KPACKAGE_KMOD_NFS_FS
 	default n
 	select ADK_KERNEL_NFS_V3
 	select ADK_KERNEL_NFS_V4
+	select ADK_KERNEL_FILE_LOCKING
 	select ADK_KERNEL_DNOTIFY
 	select ADK_KPACKAGE_KMOD_SUNRPC
 	select ADK_KPACKAGE_KMOD_LOCKD
@@ -117,6 +121,7 @@ config ADK_KPACKAGE_KMOD_NFSD
 	select ADK_KERNEL_NFSD_V3
 	select ADK_KERNEL_NFSD_V4
 	select ADK_KERNEL_DNOTIFY
+	select ADK_KERNEL_FILE_LOCKING
 	select ADK_KPACKAGE_KMOD_SUNRPC
 	select ADK_KPACKAGE_KMOD_SUNRPC_GSS
 	select ADK_KPACKAGE_KMOD_LOCKD

+ 4 - 0
target/linux/config/Config.in.netdevice

@@ -291,8 +291,12 @@ config ADK_KPACKAGE_KMOD_R8169
 
 endmenu
 
+config ADK_KERNEL_WLAN
+	boolean
+
 config ADK_KERNEL_WIRELESS
 	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_WLAN
 	boolean
 
 config ADK_KERNEL_WIRELESS_EXT

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

@@ -1,7 +1,11 @@
 menu "USB support"
 depends on ADK_TARGET_WITH_USB
 
+config ADK_KERNEL_USB_SUPPORT
+	boolean
+
 config ADK_KERNEL_USB
+	select ADK_KERNEL_USB_SUPPORT
 	boolean
 
 config ADK_KERNEL_USB_LIBUSUAL
@@ -29,6 +33,7 @@ config ADK_KPACKAGE_KMOD_USB
 	prompt "kmod-usb......................... USB support"
 	tristate
 	select ADK_KERNEL_NLS
+	select ADK_KERNEL_USB_SUPPORT
 	depends on !ADK_KERNEL_USB
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_QEMU_SH4
@@ -44,7 +49,6 @@ config ADK_KPACKAGE_KMOD_USB
 	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 	help
 	  Universal Serial Bus (USB) is a specification for a serial bus
@@ -335,6 +339,7 @@ config ADK_KPACKAGE_KMOD_SND_USB_AUDIO
 	prompt "kmod-snd-usb-audio................ USB sound adapter"
 	tristate
 	default n
+	select ADK_KERNEL_SND_USB
 	select ADK_KPACKAGE_KMOD_SND
 	select ADK_KPACKAGE_KMOD_SND_RAWMIDI
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER