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

7 files changed, 34 insertions, 169 deletions

diff --git a/target/arm/kernel.config b/target/arm/kernel.config
index d7eacd13e..1b14baed0 100644
--- a/target/arm/kernel.config
+++ b/target/arm/kernel.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.9.9 Kernel Configuration
+# Linux/arm 3.9.11 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -18,7 +18,6 @@ CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
 
 #
 # General setup
@@ -33,8 +32,8 @@ CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZMA is not set
+CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="openadk"
 CONFIG_SYSVIPC=y
@@ -77,8 +76,9 @@ CONFIG_TINY_RCU=y
 # CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_STALL_COMMON is not set
 # CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=17
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=16
 # CONFIG_CGROUPS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 # CONFIG_NAMESPACES is not set
@@ -163,7 +163,7 @@ CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
 CONFIG_INLINE_WRITE_UNLOCK=y
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_FREEZER=y
+# CONFIG_FREEZER is not set
 
 #
 # System Type
@@ -289,7 +289,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ZONE_DMA_FLAG=0
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_CROSS_MEMORY_ATTACH is not set
 CONFIG_NEED_PER_CPU_KM=y
 # CONFIG_CLEANCACHE is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
@@ -326,7 +326,7 @@ CONFIG_CMDLINE=""
 #
 # At least one emulation must be selected
 #
-# CONFIG_VFP is not set
+CONFIG_VFP=y
 
 #
 # Userspace binary formats
@@ -341,19 +341,10 @@ CONFIG_COREDUMP=y
 #
 # Power management options
 #
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_PM_SLEEP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
+# CONFIG_SUSPEND is not set
 # CONFIG_PM_RUNTIME is not set
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-# CONFIG_APM_EMULATION is not set
-CONFIG_PM_CLK=y
-CONFIG_CPU_PM=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM_CPU_SUSPEND=y
+# CONFIG_ARM_CPU_SUSPEND is not set
 CONFIG_NET=y
 
 #
@@ -739,9 +730,9 @@ CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_EXPORTFS=y
 CONFIG_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
-# CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-# CONFIG_FANOTIFY is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTACTL is not set
 # CONFIG_AUTOFS4_FS is not set
@@ -789,7 +780,7 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 # CONFIG_DETECT_HUNG_TASK is not set
-CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHED_DEBUG is not set
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_OBJECTS is not set
@@ -967,7 +958,6 @@ CONFIG_CRYPTO_HW=y
 #
 # Library routines
 #
-CONFIG_BITREVERSE=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_PCI_IOMAP=y
@@ -976,9 +966,8 @@ CONFIG_GENERIC_IO=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_T10DIF is not set
 # CONFIG_CRC_ITU_T is not set
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32 is not set
+# CONFIG_CRC32_SLICEBY8 is not set
 # CONFIG_CRC32_SLICEBY4 is not set
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
diff --git a/target/config/Config.in b/target/config/Config.in
index 15981617e..f8f59eabf 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -93,21 +93,17 @@ depends on ADK_TARGET_KERNEL64 && ADK_LINUX_X86_64
 config ADK_TARGET_ABI_64
 	boolean "64 Bit ABI"
 	select ADK_64
-	select ADK_TARGET_MULTILIB_X86_64 if ADK_TARGET_WITH_MULTILIB
 
 config ADK_TARGET_ABI_X32
 	boolean "x32 ABI (new)"
 	select ADK_x32
-	select ADK_TARGET_MULTILIB_X86_X32 if ADK_TARGET_WITH_MULTILIB
 
 config ADK_TARGET_ABI_32
 	boolean "32 Bit ABI"
 	select ADK_32
-	select ADK_TARGET_MULTILIB_X86_32 if ADK_TARGET_WITH_MULTILIB
 
 endchoice
 
-# multilib support
 config ADK_TARGET_LIBC_PATH
 	string
 	default "lib32" if ADK_n32
@@ -120,71 +116,6 @@ config ADK_TARGET_LIBC_PATH
 	default "lib"
 
 
-menu "Target multilib support"
-depends on ADK_TARGET_DISABLED && \
-	( ADK_LINUX_X86_64 || ADK_LINUX_MIPS ) && \
-	( ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_GLIBC )
-
-config ADK_TARGET_WITH_MULTILIB 
-	boolean "multilib support"
-
-config ADK_TARGET_MULTILIB_MIPS_64
-	boolean "64 bit libraries (n64 abi)"
-	depends on ADK_LINUX_MIPS && ADK_TARGET_WITH_MULTILIB
-	default y if ADK_n64
-
-config ADK_TARGET_MULTILIB_MIPS_N32
-	boolean "32 bit libraries (n32 abi)"
-	depends on ADK_LINUX_MIPS && ADK_TARGET_WITH_MULTILIB
-	default y if ADK_n32
-
-config ADK_TARGET_MULTILIB_MIPS_O32
-	boolean "32 bit libraries (o32 abi)"
-	depends on ADK_LINUX_MIPS && ADK_TARGET_WITH_MULTILIB
-	default y if ADK_o32
-
-config ADK_TARGET_MULTILIB_X86_64
-	boolean "64 bit libraries"
-	depends on ADK_LINUX_X86_64 && ADK_TARGET_WITH_MULTILIB
-	default y if ADK_64
-	
-config ADK_TARGET_MULTILIB_X86_32
-	boolean "32 bit libraries"
-	depends on ADK_LINUX_X86_64 && ADK_TARGET_WITH_MULTILIB
-	default y if ADK_32
-
-config ADK_TARGET_MULTILIB_X86_X32
-	boolean "x32 bit libraries"
-	depends on ADK_LINUX_X86_64 && ADK_TARGET_WITH_MULTILIB
-	default y if ADK_x32
-
-config ADK_MULTILIB_TARGET
-	string
-	default "m32" if ADK_TARGET_MULTILIB_X86_32 \
-			&& !ADK_TARGET_MULTILIB_X86_64 \
-			&& !ADK_TARGET_MULTILIB_X86_X32
-	default "m64" if !ADK_TARGET_MULTILIB_X86_32 \
-			&& ADK_TARGET_MULTILIB_X86_64 \
-			&& !ADK_TARGET_MULTILIB_X86_X32
-	default "x32" if !ADK_TARGET_MULTILIB_X86_32 \
-			&& !ADK_TARGET_MULTILIB_X86_64 \
-			&& ADK_TARGET_MULTILIB_X86_X32
-	default "m32,m64" if ADK_TARGET_MULTILIB_X86_32 \
-		 	&& ADK_TARGET_MULTILIB_X86_64 \
-			&& !ADK_TARGET_MULTILIB_X86_X32
-	default "mx32,m64" if !ADK_TARGET_MULTILIB_X86_32 \
-		 	&& ADK_TARGET_MULTILIB_X86_64 \
-			&& ADK_TARGET_MULTILIB_X86_X32
-	default "m32,mx32" if ADK_TARGET_MULTILIB_X86_32 \
-		 	&& !ADK_TARGET_MULTILIB_X86_64 \
-			&& ADK_TARGET_MULTILIB_X86_X32
-	default "m64,m32,mx32" if ADK_TARGET_MULTILIB_X86_32 \
-		 	&& ADK_TARGET_MULTILIB_X86_64 \
-			&& ADK_TARGET_MULTILIB_X86_X32
-	
-
-endmenu
-
 # submodel support
 #
 choice
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index 50c173321..cea0198d1 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -90,7 +90,8 @@ config ADK_KPACKAGE_KMOD_OPROFILE
 	prompt "kernel support for oprofile"
 	tristate
 	select ADK_KERNEL_PROFILING
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
+	depends on !ADK_LINUX_CRIS
+	depends on !ADK_LINUX_M68K
 	default n
 	help
 	 use oprofile package to make use of the kernel support.
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index c0fae6e1e..00d05dcd4 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -4,6 +4,10 @@ config ADK_KERNEL_INET
 	boolean
 	default y
 
+config ADK_KERNEL_NET_CORE
+	boolean
+	default y
+
 config ADK_KERNEL_IP_FIB_HASH
 	boolean
 	default y
diff --git a/target/m68k/kernel.config b/target/m68k/kernel.config
index f20c2239a..bf7ba4f8a 100644
--- a/target/m68k/kernel.config
+++ b/target/m68k/kernel.config
@@ -331,9 +331,7 @@ CONFIG_GENERIC_CPU_DEVICES=y
 CONFIG_BLK_DEV=y
 # CONFIG_ATARI_FLOPPY is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_DRBD is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_RAM is not set
@@ -363,76 +361,17 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # Altera FPGA firmware download module
 #
 CONFIG_HAVE_IDE=y
-CONFIG_IDE=y
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_ATAPI=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-# CONFIG_IDE_GD_ATAPI is not set
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IDE_PROC_FS is not set
-
-#
-# IDE chipset support/bugfixes
-#
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_FALCON_IDE is not set
-# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_IDE is not set
 
 #
 # SCSI device support
 #
 CONFIG_SCSI_MOD=y
 # CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_PROC_FS is not set
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CHR_DEV_OSST is not set
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=y
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_ISCSI_BOOT_SYSFS is not set
-# CONFIG_SCSI_UFSHCD is not set
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_ATARI_SCSI is not set
-# CONFIG_SCSI_DH is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
 # CONFIG_MD is not set
-# CONFIG_TARGET_CORE is not set
 CONFIG_NETDEVICES=y
 # CONFIG_NET_CORE is not set
 
diff --git a/target/m68k/uclibc.config b/target/m68k/uclibc.config
index d1c132bc3..12e42b194 100644
--- a/target/m68k/uclibc.config
+++ b/target/m68k/uclibc.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Version: 0.9.33.2
-# Fri Sep 21 11:44:35 2012
+# Thu Oct 17 09:03:34 2013
 #
 # TARGET_alpha is not set
 # TARGET_arm is not set
@@ -77,11 +77,12 @@ LDSO_LD_LIBRARY_PATH=y
 UCLIBC_CTOR_DTOR=y
 # LDSO_GNU_HASH_SUPPORT is not set
 # HAS_NO_THREADS is not set
-LINUXTHREADS_OLD=y
+# LINUXTHREADS_OLD is not set
 # LINUXTHREADS_NEW is not set
-# UCLIBC_HAS_THREADS_NATIVE is not set
+UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
+UCLIBC_HAS_TLS=y
+# PTHREADS_DEBUG_SUPPORT is not set
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
@@ -194,6 +195,7 @@ UCLIBC_HAS_ERRNO_MESSAGES=y
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 # UCLIBC_HAS_SYS_SIGLIST is not set
 UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
 UCLIBC_HAS_GNU_GETSUBOPT=y
 
 #
@@ -234,7 +236,6 @@ UCLIBC_BUILD_NOEXECSTACK=y
 CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
 # DODEBUG is not set
-# DODEBUG_PT is not set
 DOSTRIP=y
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox
index 889c85358..cedb79b04 100644
--- a/target/packages/pkg-available/mpdbox
+++ b/target/packages/pkg-available/mpdbox
@@ -34,7 +34,7 @@ config ADK_PKG_MPDBOX
 	select ADK_PACKAGE_LIGHTTPD_MOD_DIRLISTING
 	select ADK_PACKAGE_PHP
 	select ADK_PACKAGE_PHP_MOD_SESSION
-	select ADK_PACKAGE_PHP_MOD_SQLITE
+	select ADK_PACKAGE_PHP_MOD_JSON
 	select ADK_PACKAGE_PHP_FASTCGI
 	select ADK_PACKAGE_SCREEN
 	select ADK_PACKAGE_VIM