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

66 files changed, 1237 insertions, 691 deletions

diff --git a/target/Makefile b/target/Makefile
index edd839d4e..b8b92c960 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -59,7 +59,7 @@ ifeq ($(ADK_NATIVE),y)
 	if [ -f /proc/config.gz ];then zcat /proc/config.gz > ${BUILD_DIR}/.kernelconfig.board; else cp ${ADK_TARGET}/kernel.config.$(ARCH) ${BUILD_DIR}/.kernelconfig.board; fi; \
 	fi
 else
-	if [ -f ${ADK_TARGET_ARCH}/${KERNEL_CFG}.$(ADK_TARGET_SYSTEM) ];then \
+	@if [ -f ${ADK_TARGET_ARCH}/${KERNEL_CFG}.$(ADK_TARGET_SYSTEM) ];then \
 		cp ${ADK_TARGET_ARCH}/${KERNEL_CFG}.$(ADK_TARGET_SYSTEM) ${BUILD_DIR}/.kernelconfig.board; \
 	else \
 		cp ${ADK_TARGET_ARCH}/${KERNEL_CFG} ${BUILD_DIR}/.kernelconfig.board; \
diff --git a/target/arm/Makefile b/target/arm/Makefile
index 0007e8a36..6dc9cd306 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -7,14 +7,10 @@ include $(TOPDIR)/mk/modules.mk
 include $(TOPDIR)/mk/kernel-build.mk
 include $(TOPDIR)/mk/image.mk
 
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y)
-KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage
-else ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
-KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage
-else ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+ifeq ($(ADK_TARGET_KERNEL_ZIMAGE),y)
 KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage
 else
-KERNEL:=$(LINUX_DIR)/vmlinux
+KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL)
 endif
 
 LOADADDR:=0x20008000
diff --git a/target/arm/kernel.config b/target/arm/kernel.config
index d71d50b3e..7a4266c04 100644
--- a/target/arm/kernel.config
+++ b/target/arm/kernel.config
@@ -331,7 +331,7 @@ CONFIG_ATAGS=y
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZBOOT_ROM_BSS=0
 # CONFIG_ARM_APPENDED_DTB is not set
-CONFIG_CMDLINE="console=tty0"
+CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_FROM_BOOTLOADER is not set
 CONFIG_CMDLINE_EXTEND=y
 # CONFIG_CMDLINE_FORCE is not set
diff --git a/target/arm/sys-available/acmesystems-foxg20 b/target/arm/sys-available/acmesystems-foxg20
index 3ee53f072..8ea196d97 100644
--- a/target/arm/sys-available/acmesystems-foxg20
+++ b/target/arm/sys-available/acmesystems-foxg20
@@ -14,6 +14,7 @@ config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	select ADK_TARGET_WITH_MMC
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_KERNEL_IMAGE
 	help
 	  Acme Systems Foxboard FOXG20
 
diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm
index 1e62f2abb..141e80d25 100644
--- a/target/arm/sys-available/qemu-arm
+++ b/target/arm/sys-available/qemu-arm
@@ -6,5 +6,6 @@ config ADK_TARGET_SYSTEM_QEMU_ARM
 	select ADK_EABI
 	select ADK_TARGET_NO_FPU
 	select ADK_HARDWARE_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Qemu Emulator (arm).
diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi
index 846f0fcf8..9d743ed18 100644
--- a/target/arm/sys-available/raspberry-pi
+++ b/target/arm/sys-available/raspberry-pi
@@ -15,7 +15,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_TARGET_WITH_INPUT
 	select ADK_PACKAGE_BCM2835_FIRMWARE
 	select ADK_PACKAGE_BCM2835_VC
-	select ADK_KERNEL_SWAP
+	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	  Raspberry PI
 
diff --git a/target/arm/sys-available/sharp-zaurus b/target/arm/sys-available/sharp-zaurus
index f236cb350..848dfdbd1 100644
--- a/target/arm/sys-available/sharp-zaurus
+++ b/target/arm/sys-available/sharp-zaurus
@@ -17,5 +17,6 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	select ADK_KERNEL_MACH_SPITZ
 	select ADK_KERNEL_PXA_SHARP_Cxx00
 	select ADK_KERNEL_SPI_PXA2XX
+	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Sharp Zaurus CL3200 (Terrier)
diff --git a/target/arm/uclibc.config.big b/target/arm/uclibc.config.big
index 51293a19b..6dacd4833 100644
--- a/target/arm/uclibc.config.big
+++ b/target/arm/uclibc.config.big
@@ -210,7 +210,7 @@ UCLIBC_HAS_FNMATCH=y
 UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_NFTW=y
 UCLIBC_HAS_FTW=y
-# UCLIBC_HAS_FTS is not set
+UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
 # UCLIBC_HAS_UTMPX is not set
diff --git a/target/arm/uclibc.config.little b/target/arm/uclibc.config.little
index c388f5696..851ac0c06 100644
--- a/target/arm/uclibc.config.little
+++ b/target/arm/uclibc.config.little
@@ -210,7 +210,7 @@ UCLIBC_HAS_FNMATCH=y
 UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_NFTW=y
 UCLIBC_HAS_FTW=y
-# UCLIBC_HAS_FTS is not set
+UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
 # UCLIBC_HAS_UTMPX is not set
diff --git a/target/config/Config.in b/target/config/Config.in
index b3a918bf6..f5cf3e120 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -1,6 +1,26 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
+config ADK_TARGET_KERNEL_VMLINUZ
+	boolean
+
+config ADK_TARGET_KERNEL_ZIMAGE
+	boolean
+
+config ADK_TARGET_KERNEL_IMAGE
+	boolean
+
+config ADK_TARGET_KERNEL_BZIMAGE
+	boolean
+
+config ADK_TARGET_KERNEL
+	string
+	default "zImage" if ADK_TARGET_KERNEL_ZIMAGE
+	default "Image" if ADK_TARGET_KERNEL_IMAGE
+	default "vmlinuz" if ADK_TARGET_KERNEL_VMLINUZ
+	default "bzImage" if ADK_TARGET_KERNEL_BZIMAGE
+	default "vmlinux"
+
 config ADK_big
 	boolean
 
@@ -75,6 +95,7 @@ depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS
 config ADK_TARGET_ABI_N32
 	boolean "N32 ABI (new)"
 	select ADK_n32
+	depends on !ADK_TARGET_LIB_MUSL
 
 config ADK_TARGET_ABI_O32
 	boolean "O32 ABI (old)"
@@ -83,6 +104,7 @@ config ADK_TARGET_ABI_O32
 config ADK_TARGET_ABI_N64
 	boolean "N64 ABI"
 	select ADK_n64
+	depends on !ADK_TARGET_LIB_MUSL
 
 endchoice
 
@@ -122,14 +144,6 @@ choice
 prompt "Qemu ARM Emulation"
 depends on ADK_TARGET_SYSTEM_QEMU_ARM
 
-config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
-	boolean "Xscale PXA270 Spitz PDA"
-	select ADK_KERNEL_ARCH_PXA
-	select ADK_KERNEL_PXA_SHARPSL
-	select ADK_KERNEL_MACH_SPITZ
-	select ADK_KERNEL_SPI_PXA2XX
-	select ADK_TARGET_WITH_VGA
-
 config ADK_TARGET_QEMU_ARM_MODEL_VERSATILE
 	boolean "ARM Ltd. Versatile"
 	select ADK_KERNEL_ARCH_VERSATILE
@@ -139,6 +153,14 @@ config ADK_TARGET_QEMU_ARM_MODEL_VERSATILE
 	select ADK_KERNEL_BLK_DEV_SD
 	select ADK_KERNEL_SCSI_SYM53C8XX_2
 
+config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
+	boolean "Xscale PXA270 Spitz PDA"
+	select ADK_KERNEL_ARCH_PXA
+	select ADK_KERNEL_PXA_SHARPSL
+	select ADK_KERNEL_MACH_SPITZ
+	select ADK_KERNEL_SPI_PXA2XX
+	select ADK_TARGET_WITH_VGA
+
 endchoice
 
 choice
@@ -424,8 +446,8 @@ config ADK_TARGET_CPU_ARCH
 config ADK_TARGET_ABI_CFLAGS
 	string
 	default "-mabi=32" if ADK_TARGET_ABI_O32
-	default "-mabi=n32 -Wl,-m -Wl,elf32ltsmipn32" if ADK_TARGET_ABI_N32
-	default "-mabi=64 -Wl,-m -Wl,elf64ltsmip" if ADK_TARGET_ABI_N64
+	default "-mabi=n32" if ADK_TARGET_ABI_N32
+	default "-mabi=64" if ADK_TARGET_ABI_N64
 	default "-m32" if ADK_TARGET_ABI_32
 	default "-mx32" if ADK_TARGET_ABI_X32
 	default "-m64" if ADK_TARGET_ABI_64
@@ -436,9 +458,9 @@ config ADK_TARGET_ABI_LDFLAGS
 
 config ADK_TARGET_KERNEL_LDFLAGS
 	string
-	default "-mabi=64 -m elf64ltsmip" if ADK_TARGET_ABI_N32
-	default "-mabi=64 -m elf64ltsmip" if ADK_TARGET_ABI_O32
-	default "-mabi=64 -m elf64ltsmip" if ADK_TARGET_ABI_N64
+	default "-mabi=64" if ADK_TARGET_ABI_N32
+	default "-mabi=64" if ADK_TARGET_ABI_O32
+	default "-mabi=64" if ADK_TARGET_ABI_N64
 
 config ADK_TARGET_CFLAGS
 	string
@@ -462,7 +484,7 @@ config ADK_TARGET_CFLAGS
 
 config ADK_TARGET_CMDLINE
 	string
-	default "console=tty0" if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default "dwc_otg.fiq_split_enable=0" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default "console=tty no_auto_cmd" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100
 	default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP
@@ -719,6 +741,7 @@ config ADK_TARGET_ROOTFS_MMC
 
 config ADK_TARGET_ROOTFS_ARCHIVE
 	bool "Archive usable for different filesystems"
+	select ADK_KERNEL_EXT2_FS if ADK_HARDWARE_QEMU
 	help
 	  Use this option if your root filesystem is ext2/ext3/ext4/xfs.
 
@@ -734,7 +757,7 @@ config ADK_TARGET_ROOT_EXT4_RASPBERRY_PI
 
 choice
 prompt "Root filesystem type"
-depends on ADK_TARGET_ROOTFS_ARCHIVE && !ADK_TARGET_SYSTEM_RASPBERRY_PI
+depends on ADK_TARGET_ROOTFS_ARCHIVE && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_HARDWARE_QEMU
 default ADK_TARGET_ROOT_EXT2_FS
 
 config ADK_TARGET_ROOT_EXT2
diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk
index ea139b7ec..341adbd48 100644
--- a/target/config/Config.in.adk
+++ b/target/config/Config.in.adk
@@ -12,12 +12,6 @@ config ADK_HOST
 	help
 	  Configure host for IPKG package management.
 
-config ADK_LOCALES
-	bool "Enable locale support in C library and applications"
-	default n
-	help
-	  Multilanguage support.
-
 config ADK_DEBUG
 	bool "Compile applications with debug support by default"
 	default n
@@ -111,10 +105,4 @@ config ADK_HOST_CYGWIN
 
 endchoice
 
-config ADK_64BIT_KERNEL
-	prompt "Build a 64bit Kernel"
-	boolean
-	default n
-	depends on ADK_TARGET_KERNEL_MAY_64BIT
-
 endmenu
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 4532d4442..51b2dde0c 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -22,6 +22,7 @@ config ADK_RUNTIME_PASSWORD
 
 config ADK_RUNTIME_TMPFS_SIZE
 	string "size of /tmp in memory (kB)"
+	default "16384" if ADK_HARDWARE_QEMU
 	default "32768" if ADK_TARGET_SYSTEM_IBM_X40
 	default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default "2048"
diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu
index b892f1455..17e82c3c3 100644
--- a/target/linux/config/Config.in.cpu
+++ b/target/linux/config/Config.in.cpu
@@ -35,3 +35,4 @@ config ADK_KERNEL_USE_GENERIC_SMP_HELPERS
 
 config ADK_KERNEL_VFP
 	boolean
+
diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet
index 77871f171..c22ae210c 100644
--- a/target/linux/config/Config.in.fsnet
+++ b/target/linux/config/Config.in.fsnet
@@ -3,7 +3,7 @@ config ADK_KERNEL_FS_POSIX_ACL
 	default y
 
 config ADK_KPACKAGE_KMOD_CIFS
-	prompt "kmod-fs-cifs...................... CIFS support"
+	prompt "kmod-cifs......................... CIFS support"
 	tristate
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index e35f97ac4..3e59afda8 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -19,7 +19,6 @@ config ADK_KERNEL_VT_CONSOLE
 config ADK_KERNEL_VGA_CONSOLE
 	boolean
 	default y if ADK_HARDWARE_VBOX
-	default y if ADK_HARDWARE_QEMU
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default n
 
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 587a7f2c9..51d25c4ac 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -140,6 +140,8 @@ config ADK_KPACKAGE_KMOD_USB_HID
 	tristate
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_HID
+	select ADK_KERNEL_INPUT_KEYBOARD
+	select ADK_KERNEL_INPUT_MOUSEDEV
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
         depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on ADK_TARGET_WITH_USB
@@ -152,12 +154,14 @@ config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
 	tristate
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_INPUT_KEYBOARD
+	depends on !ADK_KERNEL_KEYBOARD_ATKBD
 	default n
 
 config ADK_KPACKAGE_KMOD_INPUT_MOUSEDEV
-	prompt "kmod-input-mouse................. Mouse support (PS/2)"
+	prompt "kmod-input-mouse................. Mouse support"
 	tristate
 	select ADK_KERNEL_INPUT
+	depends on !ADK_KERNEL_INPUT_MOUSEDEV
 	default n
 
 config ADK_KPACKAGE_KMOD_INPUT_EVDEV
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 0bff56a1b..dcf9f03ec 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -65,8 +65,6 @@ config ADK_KERNEL_PCNET32
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
-	default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL
-	default y if ADK_TARGET_SYSTEM_QEMU_MIPS
 	default n
 	help
 
@@ -166,6 +164,10 @@ config ADK_KERNEL_E1000
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
+	default y if ADK_TARGET_SYSTEM_QEMU_MIPS64
+	default y if ADK_TARGET_SYSTEM_QEMU_MIPS64EL
+	default y if ADK_TARGET_SYSTEM_QEMU_MIPS
+	default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL
 	default n
 	help
 
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index 77d24ede7..817000d63 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -36,14 +36,14 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
 
 config ADK_KPACKAGE_KMOD_FULL_NAT
 	tristate "Meta package for Full NAT"
-	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_60
+	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_65
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_9_11
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_5
 
 config ADK_KPACKAGE_KMOD_NF_NAT
 	tristate 'Full NAT'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
-	depends on ADK_KERNEL_VERSION_3_4_60
+	depends on ADK_KERNEL_VERSION_3_4_65
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 1459039b6..e2e3051da 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -176,6 +176,8 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on ADK_KPACKAGE_KMOD_USB
+	default y if ADK_TARGET_SYSTEM_QEMU_I686
+	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
diff --git a/target/linux/patches/3.11.5/export-symbol-for-exmap.patch b/target/linux/patches/3.11.5/export-symbol-for-exmap.patch
new file mode 100644
index 000000000..4f0fc8449
--- /dev/null
+++ b/target/linux/patches/3.11.5/export-symbol-for-exmap.patch
@@ -0,0 +1,11 @@
+diff -Nur linux-3.11.5.orig/kernel/pid.c linux-3.11.5/kernel/pid.c
+--- linux-3.11.5.orig/kernel/pid.c	2013-10-14 03:14:45.000000000 +0200
++++ linux-3.11.5/kernel/pid.c	2013-10-29 15:37:02.000000000 +0100
+@@ -450,6 +450,7 @@
+ {
+ 	return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
+ }
++EXPORT_SYMBOL(find_task_by_vpid);
+ 
+ struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
+ {
diff --git a/target/linux/patches/3.11.5/mips-lzo-fix.patch b/target/linux/patches/3.11.5/mips-lzo-fix.patch
new file mode 100644
index 000000000..0740bdc6a
--- /dev/null
+++ b/target/linux/patches/3.11.5/mips-lzo-fix.patch
@@ -0,0 +1,12 @@
+diff -Nur linux-3.11.5.orig/arch/mips/boot/compressed/decompress.c linux-3.11.5/arch/mips/boot/compressed/decompress.c
+--- linux-3.11.5.orig/arch/mips/boot/compressed/decompress.c	2013-10-14 03:14:45.000000000 +0200
++++ linux-3.11.5/arch/mips/boot/compressed/decompress.c	2013-11-08 18:19:47.000000000 +0100
+@@ -43,7 +43,7 @@
+ /* activate the code for pre-boot environment */
+ #define STATIC static
+ 
+-#ifdef CONFIG_KERNEL_GZIP
++#if defined(CONFIG_KERNEL_GZIP) || defined(CONFIG_KERNEL_LZO)
+ void *memcpy(void *dest, const void *src, size_t n)
+ {
+ 	int i;
diff --git a/target/linux/patches/3.11.5/ppc64-missing-zlib.patch b/target/linux/patc