23 files changed, 102 insertions, 63 deletions
diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi
index 39b02e77b..fe3289a0e 100644
--- a/target/arm/sys-available/raspberry-pi
+++ b/target/arm/sys-available/raspberry-pi
@@ -7,10 +7,12 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_KERNEL_AEABI
 	select ADK_EABIHF
 	select ADK_CPU_RASPBERRY_PI
-	select ADK_PACKAGE_BCM2835_FIRMWARE
 	select ADK_TARGET_WITH_MMC
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_WITH_INPUT
+	select ADK_PACKAGE_BCM2835_FIRMWARE
+	select ADK_PACKAGE_BCM2835_VC
 	help
 	  Raspberry PI
 
diff --git a/target/linux/Config.in b/target/linux/Config.in
index d7d9b5355..e4b81dd2f 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -10,14 +10,14 @@ source target/linux/config/Config.in.input
 source target/linux/config/Config.in.pcmcia
 source target/linux/config/Config.in.network
 source target/linux/config/Config.in.netfilter
-source target/linux/config/Config.in.multimedia
+source target/linux/config/Config.in.audio
+source target/linux/config/Config.in.video
 source target/linux/config/Config.in.crypto
 source target/linux/config/Config.in.bluetooth
 #source target/linux/config/Config.in.isdn
 source target/linux/config/Config.in.watchdog
 source target/linux/config/Config.in.leds
 source target/linux/config/Config.in.misc
-#source target/linux/config/Config.in.arm
 source target/linux/config/Config.in.mips
 source target/linux/config/Config.in.lib
 source target/linux/config/Config.in.pm
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.audio
index 1dafff357..a7e8f4751 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/target/linux/config/Config.in.audio
@@ -1,4 +1,4 @@
-menu "Multimedia devices support"
+menu "Audio devices support"
 depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SOUND
 
 config ADK_KERNEL_SND_ARM
@@ -38,8 +38,6 @@ config ADK_KPACKAGE_KMOD_SND_AC97_CODEC
 	tristate
 	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_SOUND
 
-menu "Audio devices support"
-
 config ADK_KPACKAGE_KMOD_SND
 	prompt "kmod-snd...................... ALSA sound support"
 	tristate
@@ -132,53 +130,3 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835
 	default n
 
 endmenu
-
-menu "Video devices support"
-config ADK_KPACKAGE_KMOD_MEDIA_SUPPORT
-	prompt "kmod-media-support............... Multimedia support"
-	tristate
-	default n
-	help
-
-config ADK_KPACKAGE_KMOD_USB_VIDEO_CLASS
-	prompt "kmod-usb-video-class............ Kernel driver for USB video webcams"
-	tristate
-	depends on ADK_KPACKAGE_KMOD_USB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	select ADK_KPACKAGE_KMOD_MEDIA_SUPPORT
-	default n
-	help
-
-config ADK_KPACKAGE_KMOD_USB_GSPCA
-	prompt "kmod-usb-gspca................... GSPCA webcam framework"
-	depends on ADK_TARGET_WITH_USB
-	tristate
-	help
-	 GSPCA webcam framework
-
-config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC207
-	prompt "kmod-usb-gpsca-pac207............ Pixart PAC207 USB Camera Driver"
-	tristate
-	depends on ADK_KPACKAGE_KMOD_USB_GSPCA
-	help
-
-config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC7311
-	prompt "kmod-usb-gpsca-pac7311........... Pixart PAC7311 USB Camera Driver"
-	tristate
-	depends on ADK_KPACKAGE_KMOD_USB_GSPCA
-	help
-
-config ADK_KPACKAGE_KMOD_USB_GSPCA_SPCA561
-	prompt "kmod-usb-gpsca-spca561........... SPCA561 USB Camera Driver"
-	tristate
-	depends on ADK_KPACKAGE_KMOD_USB_GSPCA
-	help
-
-config ADK_KPACKAGE_KMOD_USB_PWC
-	prompt "kmod-usb-pwc..................... Kernel driver for USB Philips Cameras"
-	tristate
-	depends on ADK_KPACKAGE_KMOD_USB
-	default n
-	help
-
-endmenu
-endmenu
diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet
index 40f9b1bbe..ab3087f4a 100644
--- a/target/linux/config/Config.in.fsnet
+++ b/target/linux/config/Config.in.fsnet
@@ -3,6 +3,13 @@ config ADK_KPACKAGE_KMOD_CIFS
 	tristate
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
+	select ADK_KPACKAGE_KMOD_CRYPTO_MD4
+        select ADK_KPACKAGE_KMOD_CRYPTO_MD5
+        select ADK_KPACKAGE_KMOD_CRYPTO_HMAC
+        select ADK_KPACKAGE_KMOD_CRYPTO_ARC4
+        select ADK_KPACKAGE_KMOD_CRYPTO_ECB
+        select ADK_KPACKAGE_KMOD_CRYPTO_DES
+        select ADK_KPACKAGE_KMOD_CRYPTO_SHA256
 	default n
 	help
 	  This is the client VFS module for the Common Internet File System
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 4560467d3..5b293b0c4 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -115,7 +115,7 @@ config ADK_KERNEL_FB_SM7XX
 
 config ADK_KERNEL_FB_BCM2708
 	prompt "................................ Framebuffer support for Raspberry PI"
-	tristate
+	boolean
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
 	select ADK_KERNEL_FONT_8x16
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 2df3d4444..3eff14a42 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -16,6 +16,7 @@ config ADK_KERNEL_INPUT
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 config ADK_KERNEL_KEYBOARD_GPIO
@@ -58,6 +59,7 @@ config ADK_KERNEL_INPUT_KEYBOARD
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 config ADK_KERNEL_KEYBOARD_ATKBD
@@ -127,6 +129,7 @@ config ADK_KPACKAGE_KMOD_USB_HID
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
         depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on ADK_TARGET_WITH_USB
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index e960a22ac..89d070c23 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -34,9 +34,24 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
 	  rules for simple packet filtering at local input, forwarding and
 	  local output.  See the man page for iptables(8).
 
+config ADK_KPACKAGE_KMOD_FULL_NAT
+	tristate "Meta package for Full NAT"
+	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_52
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_9_9
+
+config ADK_KPACKAGE_KMOD_NF_NAT
+	tristate 'Full NAT'
+	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
+	depends on ADK_KERNEL_VERSION_3_4_52
+	help
+	  The Full NAT option allows masquerading, port forwarding and other
+	  forms of full Network Address Port Translation.  It is controlled by
+	  the `nat' table in iptables: see the man page for iptables(8).
+
 config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 	tristate 'Full NAT'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
+	depends on ADK_KERNEL_VERSION_3_9_9
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by
@@ -44,7 +59,7 @@ config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 
 config ADK_KPACKAGE_KMOD_IP_NF_TARGET_MASQUERADE
 	tristate 'MASQUERADE target support'
-	depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4
+	depends on ADK_KPACKAGE_KMOD_FULL_NAT
 	help
 	  Masquerading is a special case of NAT: all outgoing connections are
 	  changed to seem to come from a particular interface's address, and
@@ -78,7 +93,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_ULOG
 
 config ADK_KPACKAGE_KMOD_IP_NF_TARGET_REDIRECT
 	tristate 'REDIRECT target support'
-	depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4
+	depends on ADK_KPACKAGE_KMOD_FULL_NAT
 	help
 	  REDIRECT is a special case of NAT: all incoming connections are
 	  mapped onto the incoming interface's address, causing the packets to
@@ -87,7 +102,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_REDIRECT
 
 config ADK_KPACKAGE_KMOD_IP_NF_TARGET_NETMAP
 	tristate 'NETMAP target support'
-	depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4
+	depends on ADK_KPACKAGE_KMOD_FULL_NAT
 	help
 	  NETMAP is an implementation of static 1:1 NAT mapping of network
 	  addresses. It maps the network address part, while keeping the host
@@ -96,7 +111,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_NETMAP
 
 config ADK_KPACKAGE_KMOD_IP_NF_MANGLE
 	tristate 'Packet mangling'
-	depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4
+	depends on ADK_KPACKAGE_KMOD_FULL_NAT
 	help
 	  This option adds a `mangle' table to iptables: see the man page for
 	  iptables(8).  This table is used for various packet alterations
diff --git a/target/linux/config/Config.in.video b/target/linux/config/Config.in.video
new file mode 100644
index 000000000..6182ea6cf
--- /dev/null
+++ b/target/linux/config/Config.in.video
@@ -0,0 +1,64 @@
+config ADK_KERNEL_VIDEO_DEV
+	boolean
+
+config ADK_KERNEL_VIDEO_V4L2
+	boolean
+	select ADK_KERNEL_VIDEO_DEV
+
+config ADK_KERNEL_MEDIA_USB_SUPPORT
+	boolean
+
+config ADK_KERNEL_MEDIA_CAMERA_SUPPORT
+	boolean
+
+menu "Video devices support"
+config ADK_KPACKAGE_KMOD_MEDIA_SUPPORT
+	tristate
+	default n
+	help
+
+config ADK_KPACKAGE_KMOD_USB_VIDEO_CLASS
+	prompt "kmod-usb-video-class............ Kernel driver for USB video webcams"
+	tristate
+	depends on ADK_KPACKAGE_KMOD_USB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+	select ADK_KPACKAGE_KMOD_MEDIA_SUPPORT
+	default n
+	help
+
+config ADK_KPACKAGE_KMOD_USB_GSPCA
+	prompt "kmod-usb-gspca................... GSPCA webcam framework"
+	depends on ADK_TARGET_WITH_USB
+	select ADK_KERNEL_VIDEO_V4L2
+	select ADK_KPACKAGE_KMOD_MEDIA_SUPPORT
+	select ADK_KERNEL_MEDIA_USB_SUPPORT
+	select ADK_KERNEL_MEDIA_CAMERA_SUPPORT
+	tristate
+	help
+	 GSPCA webcam framework
+
+config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC207
+	prompt "kmod-usb-gpsca-pac207............ Pixart PAC207 USB Camera Driver"
+	tristate
+	depends on ADK_KPACKAGE_KMOD_USB_GSPCA
+	help
+
+config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC7311
+	prompt "kmod-usb-gpsca-pac7311........... Pixart PAC7311 USB Camera Driver"
+	tristate
+	depends on ADK_KPACKAGE_KMOD_USB_GSPCA
+	help
+
+config ADK_KPACKAGE_KMOD_USB_GSPCA_SPCA561
+	prompt "kmod-usb-gpsca-spca561........... SPCA561 USB Camera Driver"
+	tristate
+	depends on ADK_KPACKAGE_KMOD_USB_GSPCA
+	help
+
+config ADK_KPACKAGE_KMOD_USB_PWC
+	prompt "kmod-usb-pwc..................... Kernel driver for USB Philips Cameras"
+	tristate
+	depends on ADK_TARGET_WITH_USB
+	default n
+	help
+
+endmenu
diff --git a/target/linux/patches/3.4.51/bsd-compatibility.patch b/target/linux/patches/3.4.52/bsd-compatibility.patch
index 9e91a62de..9e91a62de 100644
--- a/target/linux/patches/3.4.51/bsd-compatibility.patch
+++ b/target/linux/patches/3.4.52/bsd-compatibility.patch
diff --git a/target/linux/patches/3.4.51/cris-etrax.patch b/target/linux/patches/3.4.52/cris-etrax.patch
index a80d9a8b8..a80d9a8b8 100644
--- a/target/linux/patches/3.4.51/cris-etrax.patch
+++ b/target/linux/patches/3.4.52/cris-etrax.patch
diff --git a/target/linux/patches/3.4.51/defaults.patch b/target/linux/patches/3.4.52/defaults.patch
index 58aae610b..58aae610b 100644
--- a/target/linux/patches/3.4.51/defaults.patch
+++ b/target/linux/patches/3.4.52/defaults.patch
diff --git a/target/linux/patches/3.4.51/gemalto.patch b/target/linux/patches/3.4.52/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.4.51/gemalto.patch
+++ b/target/linux/patches/3.4.52/gemalto.patch
diff --git a/target/linux/patches/3.4.51/lemote-rfkill.patch b/target/linux/patches/3.4.52/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.4.51/lemote-rfkill.patch
+++ b/target/linux/patches/3.4.52/lemote-rfkill.patch
diff --git a/target/linux/patches/3.4.51/module-alloc-size-check.patch b/target/linux/patches/3.4.52/module-alloc-size-check.patch
index a792ac60a..a792ac60a 100644
--- a/target/linux/patches/3.4.51/module-alloc-size-check.patch
+++ b/target/linux/patches/3.4.52/module-alloc-size-check.patch
diff --git a/target/linux/patches/3.4.51/non-static.patch b/target/linux/patches/3.4.52/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.4.51/non-static.patch
+++ b/target/linux/patches/3.4.52/non-static.patch
diff --git a/target/linux/patches/3.4.51/sparc-include.patch b/target/linux/patches/3.4.52/sparc-include.patch
index 2f8ffd061..2f8ffd061 100644
--- a/target/linux/patches/3.4.51/sparc-include.patch
+++ b/target/linux/patches/3.4.52/sparc-include.patch
diff --git a/target/linux/patches/3.4.51/startup.patch b/target/linux/patches/3.4.52/startup.patch
index 68e8987b0..68e8987b0 100644
--- a/target/linux/patches/3.4.51/startup.patch
+++ b/target/linux/patches/3.4.52/startup.patch
diff --git a/target/linux/patches/3.4.51/usb-defaults-off.patch b/target/linux/patches/3.4.52/usb-defaults-off.patch
index 31367108a..31367108a 100644
--- a/target/linux/patches/3.4.51/usb-defaults-off.patch
+++ b/target/linux/patches/3.4.52/usb-defaults-off.patch
diff --git a/target/linux/patches/3.4.51/uuid.patch b/target/linux/patches/3.4.52/uuid.patch
index ca23accdf..ca23accdf 100644
--- a/target/linux/patches/3.4.51/uuid.patch
+++ b/target/linux/patches/3.4.52/uuid.patch
diff --git a/target/linux/patches/3.4.51/vga-cons-default-off.patch b/target/linux/patches/3.4.52/vga-cons-default-off.patch
index 178aeeeb9..178aeeeb9 100644
--- a/target/linux/patches/3.4.51/vga-cons-default-off.patch
+++ b/target/linux/patches/3.4.52/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.4.51/wlan-cf.patch b/target/linux/patches/3.4.52/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.4.51/wlan-cf.patch
+++ b/target/linux/patches/3.4.52/wlan-cf.patch
diff --git a/target/linux/patches/3.4.51/zlib-inflate.patch b/target/linux/patches/3.4.52/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.4.51/zlib-inflate.patch
+++ b/target/linux/patches/3.4.52/zlib-inflate.patch
diff --git a/target/mips/Makefile b/target/mips/Makefile
index a378db4c7..eab6be597 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -110,10 +110,10 @@ imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL)
 endif
 ifeq ($(ADK_TARGET_FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
-	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
-	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
 ifneq ($(ADK_HARDWARE_QEMU),)
+	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"