fix qemu-x86_64 image, get rid of duplicat include dir

- fix image build for different root filesystems
- get rid of duplicate symlink to include dir
- finetune mpd config file

16 files changed, 115 insertions, 53 deletions

diff --git a/mk/build.mk b/mk/build.mk
index b5881abdd..5296fa6c5 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -111,9 +111,8 @@ $(PACKAGE_DIR):
 	mkdir -p ${PACKAGE_DIR}/.stamps
 
 ${STAGING_DIR} ${STAGING_DIR}/etc ${STAGING_TOOLS}:
-	mkdir -p ${STAGING_DIR}/{bin,etc,include,lib,usr} \
+	mkdir -p ${STAGING_DIR}/{bin,etc,lib,usr/include} \
 		${STAGING_TOOLS}/{bin,lib}
-	cd ${STAGING_DIR}/usr; ln -s ../include include
 
 ${STAGING_DIR}/etc/ipkg.conf: ${STAGING_DIR}/etc
 	echo "dest root /" >${STAGING_DIR}/etc/ipkg.conf
diff --git a/package/mpd/files/mpd.conf b/package/mpd/files/mpd.conf
index 10b1e6918..6c23d582d 100644
--- a/package/mpd/files/mpd.conf
+++ b/package/mpd/files/mpd.conf
@@ -15,5 +15,3 @@ audio_output {
 }
 # Volume control mixer 
 mixer_type			"alsa"
-mixer_device			"default"
-mixer_control			"PCM"
diff --git a/scripts/create-image.sh b/scripts/create-image.sh
index bbebcf4d2..a43d3801c 100755
--- a/scripts/create-image.sh
+++ b/scripts/create-image.sh
@@ -1,10 +1,14 @@
 #!/usr/bin/env bash
 
 grubinstall=1
+filesystem=ext2
 
-while getopts ":tin" option
+while getopts "f:t:in" option
 do
 	case $option in
+		f)
+		filesystem=$OPTARG
+		;;
 		t)
 		emul=$OPTARG
 		;;
@@ -76,26 +80,40 @@ fi
 
 
 printf "Generate qemu image\n"
-$qimg create -f raw $1 300M
+$qimg create -f raw $1 512M >/dev/null
+
+printf "Creating filesystem $filesystem\n"
 
 printf "Create partition and filesystem\n"
 $parted -s $1 mklabel msdos
-$parted -s $1 mkpart primary ext2 0 300
+$parted -s $1 mkpart primary ext2 0 100%
 $parted -s $1 set 1 boot on
-$parted -s $1 mkfs 1 ext2
+
+dd if=$1 of=mbr bs=16384 count=1 2>/dev/null
+dd if=$1 skip=16384 of=$1.new 2>/dev/null
+
+if [ "$filesystem" = "ext2" -o "$filesystem" = "ext3" -o "$filesystem" = "ext4" ];then
+	mkfsopts=-F
+fi
+
+mkfs.$filesystem $mkfsopts ${1}.new >/dev/null
 
 if [ $? -eq 0 ];then
 	printf "Successfully created partition\n"
-	$parted $1 print
+	#$parted $1 print
 else
 	printf "Partition creation failed, Exiting.\n"
 	exit 1
 fi
 
+cat mbr ${1}.new > $1
+rm ${1}.new 
+rm mbr
 
 tmp=$(mktemp -d)
 
-mount -o loop,offset=16384 -t ext2 $1 $tmp
+mount -o loop,offset=16384 -t $filesystem $1 $tmp
+#mount -o loop -t $filesystem $1 $tmp
 
 if [ -z $initramfs ];then
 	printf "Extracting install archive\n"
@@ -165,4 +183,5 @@ mknod -m 666 $tmp/dev/ttyS0 c 4 64
 umount $tmp
 
 printf "Successfully installed.\n"
+printf "Be sure $1 is writable for the user which use qemu\n"
 exit 0
diff --git a/target/Config.in b/target/Config.in
index 420bd7b35..691242992 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -379,6 +379,9 @@ config ADK_LINUX_X86_64_QEMU
 	select ADK_x86_64_qemu
 	select ADK_KPACKAGE_KMOD_NE2K_PCI
 	select ADK_KERNEL_INPUT_KEYBOARD
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_ATA
+	select ADK_KERNEL_BLK_DEV_SD
 	help
 	 Qemu support for x86_64 architecture.
 
@@ -461,6 +464,7 @@ config ADK_TARGET_LIB_EGLIBC
 		ADK_LINUX_MIPS64_QEMU || \
 		ADK_LINUX_MIPSEL_QEMU || \
 		ADK_LINUX_MIPS64EL_QEMU || \
+		ADK_LINUX_X86_64_QEMU || \
 		ADK_LINUX_X86_ALIX1C || \
 		ADK_LINUX_X86_ALIX2D || \
 		ADK_LINUX_X86_WRAP || \
@@ -483,6 +487,7 @@ config ADK_TARGET_LIB_GLIBC
 		ADK_LINUX_MIPS64_QEMU || \
 		ADK_LINUX_MIPSEL_QEMU || \
 		ADK_LINUX_MIPS64EL_QEMU || \
+		ADK_LINUX_X86_64_QEMU || \
 		ADK_LINUX_X86_ALIX1C || \
 		ADK_LINUX_X86_ALIX2D || \
 		ADK_LINUX_X86_WRAP || \
@@ -741,6 +746,14 @@ config ADK_TARGET_ROOT_EXT4
 
 endchoice
 
+config ADK_TARGET_ROOTFS
+	string
+	default "xfs" if ADK_TARGET_ROOT_XFS
+	default "ext2" if ADK_TARGET_ROOT_EXT2
+	default "ext3" if ADK_TARGET_ROOT_EXT3
+	default "ext4" if ADK_TARGET_ROOT_EXT4
+	help
+
 config ADK_PACKAGE_SUFFIX
 	string
 	default "ipk" if ADK_TARGET_PACKAGE_IPKG
diff --git a/target/linux/patches/2.6.32/exmap.patch b/target/linux/patches/2.6.32/exmap.patch
new file mode 100644
index 000000000..012e4794e
--- /dev/null
+++ b/target/linux/patches/2.6.32/exmap.patch
@@ -0,0 +1,11 @@
+diff -Nur linux-2.6.32.orig/kernel/pid.c linux-2.6.32/kernel/pid.c
+--- linux-2.6.32.orig/kernel/pid.c	2009-12-03 04:51:21.000000000 +0100
++++ linux-2.6.32/kernel/pid.c	2009-12-06 01:04:41.000000000 +0100
+@@ -387,6 +387,7 @@
+ {
+ 	return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
+ }
++EXPORT_SYMBOL(find_task_by_vpid);
+ 
+ struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
+ {
diff --git a/target/qemu-mips/Makefile b/target/qemu-mips/Makefile
index 58d8b7936..1b9d2dcef 100644
--- a/target/qemu-mips/Makefile
+++ b/target/qemu-mips/Makefile
@@ -10,12 +10,12 @@ include $(TOPDIR)/mk/image.mk
 kernel-install:
 	cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
 
-ifeq ($(FS),ext2)
+ifeq ($(FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
 	@echo
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
 	@echo "Use following command to create a QEMU Image:"
-	@echo "sudo ./scripts/create-image.sh -n qemu-mips.img $(BIN_DIR)/$(ROOTFSTARBALL)"
+	@echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) -n qemu-mips.img $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"
 	@echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -hda qemu-mips.img -append "root=/dev/hda1"'
 	@echo 'Login as user root with password linux123 via ssh or console'
diff --git a/target/qemu-mips/target.mk b/target/qemu-mips/target.mk
index 8a5abd384..03ef1a9b7 100644
--- a/target/qemu-mips/target.mk
+++ b/target/qemu-mips/target.mk
@@ -1,7 +1,7 @@
 ARCH:=			mips
 CPU_ARCH:=		mips
-KERNEL_VERSION:=	2.6.31.5
+KERNEL_VERSION:=	2.6.32
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		926bff46d24e2f303e4ee92234e394d8
+KERNEL_MD5SUM:=		260551284ac224c3a43c4adac7df4879
 TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=    -march=mips32 -mabi=32
diff --git a/target/qemu-mips64/Makefile b/target/qemu-mips64/Makefile
index 1e4bc3ee6..9412f0919 100644
--- a/target/qemu-mips64/Makefile
+++ b/target/qemu-mips64/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/mk/image.mk
 kernel-install:
 	cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
 
-ifeq ($(FS),ext2)
+ifeq ($(FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
 	@echo
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
diff --git a/target/qemu-mips64el/Makefile b/target/qemu-mips64el/Makefile
index 46ca45cc8..b5ca36c32 100644
--- a/target/qemu-mips64el/Makefile
+++ b/target/qemu-mips64el/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/mk/image.mk
 kernel-install:
 	cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
 
-ifeq ($(FS),ext2)
+ifeq ($(FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
 	@echo
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
diff --git a/target/qemu-mipsel/Makefile b/target/qemu-mipsel/Makefile
index a74fc3ba8..9f676e3e6 100644
--- a/target/qemu-mipsel/Makefile
+++ b/target/qemu-mipsel/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/mk/image.mk
 kernel-install:
 	cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
 
-ifeq ($(FS),ext2)
+ifeq ($(FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
 	@echo
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
diff --git a/target/qemu-x86/Makefile b/target/qemu-x86/Makefile
index 99138be1a..94418ec5f 100644
--- a/target/qemu-x86/Makefile
+++ b/target/qemu-x86/Makefile
@@ -12,10 +12,13 @@ kernel-install:
 
 ifeq ($(FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
+	@cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
 	@echo
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
 	@echo "Use following command to create a QEMU Image:"
 	@echo "sudo ./scripts/create-image.sh qemu.img $(BIN_DIR)/$(ROOTFSTARBALL)"
+	@echo "Start qemu with following command line:"
+	@echo 'qemu -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu-${CPU_ARCH}.img'
 	@echo 'Login as user root with password linux123 via ssh or console'
 endif
 
@@ -24,6 +27,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS)
 	@cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
 	@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
 	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
-	@echo 'qemu -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} -append "console=ttyS0"'
+	@echo "Start qemu with following command line:"
+	@echo 'qemu -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
 	@echo 'Login as user root with password linux123 via ssh or console'
 endif
diff --git a/target/qemu-x86_64/Makefile b/target/qemu-x86_64/Makefile
index e5ad35946..f843b9aba 100644
--- a/target/qemu-x86_64/Makefile
+++ b/target/qemu-x86_64/Makefile
@@ -12,10 +12,13 @@ kernel-install:
 
 ifeq ($(FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
+	@cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
 	@echo
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
 	@echo "Use following command to create a QEMU Image:"
-	@echo "sudo ./scripts/create-image.sh qemu.img $(BIN_DIR)/$(ROOTFSTARBALL)"
+	@echo "sudo ./scripts/create-image.sh -n -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
+	@echo "Start qemu with following command line:"
+	@echo 'qemu-system-x86_64 -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel qemu-${CPU_ARCH}.img'
 	@echo 'Login as user root with password linux123 via ssh or console'
 endif
 
@@ -24,6 +27,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS)
 	@cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel
 	@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel'
 	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
-	@echo 'qemu-system-x86_64 -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} -append "console=ttyS0"'
+	@echo "Start qemu with following command line:"
+	@echo 'qemu-system-x86_64 -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
 	@echo 'Login as user root with password linux123 via ssh or console'
 endif
diff --git a/target/qemu-x86_64/kernel.config b/target/qemu-x86_64/kernel.config
index da79cd7b6..83b55369c 100644
--- a/target/qemu-x86_64/kernel.config
+++ b/target/qemu-x86_64/kernel.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.31.4
-# Sat Oct 24 17:51:22 2009
+# Linux kernel version: 2.6.32
+# Sun Dec  6 19:49:04 2009
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -17,7 +17,6 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_FAST_CMPXCHG_LOCAL=y
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
@@ -35,7 +34,8 @@ CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
@@ -76,11 +76,12 @@ CONFIG_SYSVIPC_SYSCTL=y
 #
 # RCU Subsystem
 #
-CONFIG_CLASSIC_RCU=y
-# CONFIG_TREE_RCU is not set
-# CONFIG_PREEMPT_RCU is not set
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=64
+# CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
@@ -114,21 +115,20 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
-CONFIG_HAVE_PERF_COUNTERS=y
+CONFIG_HAVE_PERF_EVENTS=y
 
 #
-# Performance Counters
+# Kernel Performance Events And Counters
 #
+# CONFIG_PERF_EVENTS is not set
 # CONFIG_PERF_COUNTERS is not set
-CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_VM_EVENT_COUNTERS is not set
 CONFIG_PCI_QUIRKS=y
-# CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
 # CONFIG_PROFILING is not set
-# CONFIG_MARKERS is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -208,6 +208,7 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_MVIAC7 is not set
 # CONFIG_MPSC is not set
 # CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
 CONFIG_GENERIC_CPU=y
 CONFIG_X86_CPU=y
 CONFIG_X86_L1_CACHE_BYTES=64
@@ -269,6 +270,7 @@ CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+# CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 # CONFIG_X86_RESERVE_LOW_64K is not set
@@ -285,14 +287,17 @@ CONFIG_HZ=250
 # CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x200000
 # CONFIG_RELOCATABLE is not set
-CONFIG_PHYSICAL_ALIGN=0x200000
-# CONFIG_CMDLINE_BOOL is not set
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="root=/dev/sda1 console=tty0 console=ttyS0"
+# CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
 #
 # Power management and ACPI options
 #
 # CONFIG_PM is not set
+# CONFIG_SFI is not set
 
 #
 # CPU Frequency scaling
@@ -376,6 +381,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_NETFILTER is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -406,6 +412,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
 # CONFIG_CFG80211 is not set
+CONFIG_CFG80211_DEFAULT_PS_VALUE=0
 CONFIG_WIRELESS_OLD_REGULATORY=y
 # CONFIG_WIRELESS_EXT is not set
 # CONFIG_LIB80211 is not set
@@ -413,7 +420,6 @@ CONFIG_WIRELESS_OLD_REGULATORY=y
 #
 # CFG80211 needs to be enabled for MAC80211
 #
-CONFIG_MAC80211_DEFAULT_PS_VALUE=0
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
@@ -426,6 +432,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FW_LOADER is not set
@@ -489,6 +496,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_OSD_INITIATOR is not set
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_ATA_VERBOSE_ERROR is not set
 # CONFIG_SATA_PMP is not set
 # CONFIG_SATA_AHCI is not set
 # CONFIG_SATA_SIL24 is not set
@@ -510,6 +518,7 @@ CONFIG_ATA_PIIX=y
 # CONFIG_PATA_ALI is not set
 # CONFIG_PATA_AMD is not set
 # CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATP867X is not set
 # CONFIG_PATA_ATIIXP is not set
 # CONFIG_PATA_CMD640_PCI is not set
 # CONFIG_PATA_CMD64X is not set
@@ -537,6 +546,7 @@ CONFIG_ATA_PIIX=y
 # CONFIG_PATA_OPTIDMA is not set
 # CONFIG_PATA_PDC_OLD is not set
 # CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
 # CONFIG_PATA_RZ1000 is not set
 # CONFIG_PATA_SC1200 is not set
 # CONFIG_PATA_SERVERWORKS is not set
@@ -618,10 +628,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
 # CONFIG_SFC is not set
 # CONFIG_BE2NET is not set
 # CONFIG_TR is not set
-
-#
-# Wireless LAN
-#
+CONFIG_WLAN=y
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
 
@@ -637,6 +644,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_VMXNET3 is not set
 # CONFIG_ISDN is not set
 # CONFIG_PHONE is not set
 
@@ -665,6 +673,7 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
@@ -743,7 +752,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
-# CONFIG_THERMAL_HWMON is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 
@@ -770,6 +778,7 @@ CONFIG_AGP_AMD64=y
 # CONFIG_AGP_INTEL is not set
 # CONFIG_AGP_SIS is not set
 # CONFIG_AGP_VIA is not set
+CONFIG_VGA_ARB=y
 # CONFIG_DRM is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -855,7 +864,6 @@ CONFIG_FONT_8x16=y
 # CONFIG_SOUND is not set
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
 # CONFIG_HIDRAW is not set
 # CONFIG_HID_PID is not set
 
@@ -960,6 +968,8 @@ CONFIG_EXT2_FS=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+# CONFIG_AUFS_FS is not set
 CONFIG_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
@@ -1019,7 +1029,6 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ROMFS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-# CONFIG_NILFS2_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 # CONFIG_NFS_FS is not set
 # CONFIG_NFSD is not set
@@ -1062,6 +1071,7 @@ CONFIG_PRINTK_TIME=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=0
 CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
@@ -1080,7 +1090,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
 CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FTRACE_SYSCALLS=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
@@ -1112,8 +1122,12 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_SECURITYFS is not set
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
 # CONFIG_CRYPTO is not set
+
+#
+# OCF Configuration
+#
+# CONFIG_OCF_OCF is not set
 CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
 # CONFIG_VIRTUALIZATION is not set
 # CONFIG_BINARY_PRINTF is not set
 
diff --git a/target/qemu-x86_64/target.mk b/target/qemu-x86_64/target.mk
index 7652dbff4..522a73e46 100644
--- a/target/qemu-x86_64/target.mk
+++ b/target/qemu-x86_64/target.mk
@@ -1,7 +1,7 @@
 ARCH:=			x86
 CPU_ARCH:=		x86_64
-KERNEL_VERSION:=	2.6.31.5
+KERNEL_VERSION:=	2.6.32
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		926bff46d24e2f303e4ee92234e394d8
+KERNEL_MD5SUM:=		260551284ac224c3a43c4adac7df4879
 TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 400141524..d13da8141 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -14,8 +14,8 @@ $(WRKBUILD)/.headers:
 		INSTALL_HDR_PATH=$(TOOLCHAIN_SYSROOT)/usr \
 		headers_install
 	# cryptodev.h from ocf-linux-20080917
-	mkdir -p ${STAGING_DIR}/include/crypto
-	cp files/cryptodev.h ${STAGING_DIR}/include/crypto/
+	mkdir -p ${STAGING_DIR}/usr/include/crypto
+	cp files/cryptodev.h ${STAGING_DIR}/usr/include/crypto/
 ifeq ($(ARCH),cris)
 ifeq ($(CPU_ARCH),crisv32)
 	cd $(STAGING_DIR)/usr/include && ln -sf arch-v32/arch arch
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 2bca1bb23..4c3207c4a 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -25,9 +25,9 @@ ifneq ($(ADK_DEBUG),)
 	$(SED) 's,DOSTRIP,DODEBUG,' ${WRKBUILD}/.config
 endif
 	$(MAKE) -C $(WRKBUILD) \
-		PREFIX=$(TOOLCHAIN_SYSROOT)/ \
+		PREFIX=$(TOOLCHAIN_SYSROOT) \
 		DEVEL_PREFIX=/usr/ \
-		RUNTIME_PREFIX=$(TOOLCHAIN_SYSROOT)/ \
+		RUNTIME_PREFIX=$(TOOLCHAIN_SYSROOT) \
 		HOSTCC="$(HOSTCC)" \
 		CPU_CFLAGS="$(TARGET_CFLAGS)" \
 		install_headers
@@ -47,7 +47,7 @@ $(WRKBUILD)/.compiled:
 $(WRKBUILD)/.install_headers: $(WRKBUILD)/.compiled
 	$(MAKE) -C $(WRKBUILD) \
 		PREFIX=$(STAGING_DIR) \
-		DEVEL_PREFIX=/ \
+		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
 		CPU_CFLAGS="$(TARGET_CFLAGS)" \
 		install_dev
@@ -56,7 +56,7 @@ $(WRKBUILD)/.install_headers: $(WRKBUILD)/.compiled
 $(WRKBUILD)/.installed: $(WRKBUILD)/.install_headers
 	$(MAKE) -C $(WRKBUILD) \
 		PREFIX=$(STAGING_DIR) \
-		DEVEL_PREFIX=/ \
+		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
 		CPU_CFLAGS="$(TARGET_CFLAGS)" \
 		install_runtime