Merge branch 'master' of git+ssh://openadk.org/git/openadk

8 files changed, 94 insertions, 5 deletions

diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index dbe14cf3b..dc2ff100f 100644
--- a/target/linux/config/Config.in.audio
+++ b/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
 
diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu
index 17e82c3c3..678cb5696 100644
--- a/target/linux/config/Config.in.cpu
+++ b/target/linux/config/Config.in.cpu
@@ -36,3 +36,63 @@ config ADK_KERNEL_USE_GENERIC_SMP_HELPERS
 config ADK_KERNEL_VFP
 	boolean
 
+menu "CPU support"
+
+config ADK_KERNEL_CPU_FREQ
+	boolean
+	default n
+
+config ADK_KERNEL_CPU_FREQ_GOV_PERFORMANCE
+	boolean
+	default n
+
+config ADK_KERNEL_CPU_FREQ_GOV_POWERSAVE
+	boolean
+	default n
+
+config ADK_KERNEL_CPU_FREQ_GOV_USERSPACE
+	boolean
+	default n
+
+config ADK_KERNEL_CPU_FREQ_GOV_ONDEMAND
+	boolean
+	default n
+
+config ADK_KERNEL_CPU_FREQ_GOV_CONSERVATIVE
+	boolean
+	default n
+
+config ADK_KERNEL_ARM_BCM2835_CPUFREQ
+	prompt "CPU frequency support"
+	boolean
+	select ADK_KERNEL_CPU_FREQ
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+
+choice
+prompt "Governor"
+depends on ADK_KERNEL_ARM_BCM2835_CPUFREQ
+
+config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_ONDEMAND
+	boolean "ondemand"
+	select ADK_KERNEL_CPU_FREQ_GOV_ONDEMAND
+
+config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_PERFORMANCE
+	boolean "performance"
+	select ADK_KERNEL_CPU_FREQ_GOV_PERFORMANCE
+
+config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_POWERSAVE
+	boolean "powersave"
+	select ADK_KERNEL_CPU_FREQ_GOV_POWERSAVE
+
+config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE
+	boolean "conservative"
+	select ADK_KERNEL_CPU_FREQ_GOV_CONSERVATIVE
+
+config ADK_KERNEL_CPU_FREQ_DEFAULT_GOV_USERSPACE
+	boolean "userspace"
+	select ADK_KERNEL_CPU_FREQ_GOV_USERSPACE
+	
+endchoice
+
+endmenu
+
diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet
index c22ae210c..8c3ae5372 100644
--- a/target/linux/config/Config.in.fsnet
+++ b/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
@@ -110,13 +114,14 @@ config ADK_KERNEL_NFSD_V4
 	default n
 
 config ADK_KPACKAGE_KMOD_NFSD
-	prompt "kmod-fs-nfsd...................... NFS server support (includes V3 support)"
+	prompt "kmod-nfsd......................... NFS server support"
 	tristate
 	default n
 	select ADK_KERNEL_EXPORTFS
 	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
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index d7d7ae013..9ee0511fc 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/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
diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems
index aa707cd91..9609cf5b2 100644
--- a/target/linux/config/Config.in.systems
+++ b/target/linux/config/Config.in.systems
@@ -60,9 +60,6 @@ config ADK_KERNEL_ARCH_AT91SAM9260
 config ADK_KERNEL_MACH_ACMENETUSFOXG20
 	boolean
 
-config ADK_KERNEL_ARCH_BCM2708
-	boolean
-
 config ADK_KERNEL_BCM47XX_SSB
 	boolean
 
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 53413abde..e1fd3c0c3 100644
--- a/target/linux/config/Config.in.usb
+++ b/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
diff --git a/target/linux/kernel.config b/target/linux/kernel.config
index 8bf3aafe6..97237b382 100644
--- a/target/linux/kernel.config
+++ b/target/linux/kernel.config
@@ -13,6 +13,8 @@ CONFIG_XFRM=y
 CONFIG_INET=y
 CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
+CONFIG_BLOCK=y
+CONFIG_FILE_LOCKING=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 CONFIG_NLS=y
@@ -26,6 +28,7 @@ CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_NO_HZ=y
 CONFIG_PRINTK=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_BUG=n
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
diff --git a/target/linux/patches/3.12.6/xargs.patch b/target/linux/patches/3.12.6/xargs.patch
new file mode 100644
index 000000000..2c7b3df59
--- /dev/null
+++ b/target/linux/patches/3.12.6/xargs.patch
@@ -0,0 +1,12 @@
+diff -Nur linux-3.12.6.orig/scripts/Makefile.modpost linux-3.12.6/scripts/Makefile.modpost
+--- linux-3.12.6.orig/scripts/Makefile.modpost	2013-12-20 16:51:33.000000000 +0100
++++ linux-3.12.6/scripts/Makefile.modpost	2014-01-25 14:55:33.000000000 +0100
+@@ -60,7 +60,7 @@
+ modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers
+ 
+ # Step 1), find all modules listed in $(MODVERDIR)/
+-MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs -r grep -h '\.ko$$' | sort -u
++MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs grep -h '\.ko$$' | sort -u
+ __modules := $(shell $(MODLISTCMD))
+ modules   := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o)))
+