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

8 files changed, 71 insertions, 52 deletions

diff --git a/target/config/Config.in b/target/config/Config.in
index 38f8090dd..7393bfe9c 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -15,7 +15,8 @@ config ADK_TARGET_TOOLCHAIN
 	boolean
 
 config ADK_TARGET_UCLINUX
-	select ADK_TARGET_USE_STATIC_LIBS
+	select ADK_PACKAGE_SASH
+	select ADK_PACKAGE_SIMPLEINIT
 	boolean
 
 config ADK_TARGET_QEMU
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 845786a45..2caec15ec 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -150,7 +150,7 @@ config ADK_RUNTIME_KBD_LAYOUT
 
 choice
 prompt "initial login shell for the root user"
-default ADK_ROOTSH_HUSH if ADK_TARGET_UCLINUX
+default ADK_ROOTSH_SASH if ADK_TARGET_UCLINUX
 default ADK_ROOTSH_MKSH
 
 config ADK_ROOTSH_MKSH
@@ -160,6 +160,12 @@ config ADK_ROOTSH_MKSH
 	  Use mksh (a Korn Shell variant) as standard login shell
 	  for the superuser.
 
+config ADK_ROOTSH_SASH
+	select ADK_PACKAGE_SASH if !ADK_TOOLCHAIN_ONLY
+	bool "sash (Shell compatible with non-MMU systems)"
+	help
+	  standalone shell.
+
 config ADK_ROOTSH_HUSH
 	select ADK_PACKAGE_HUSH if !ADK_TOOLCHAIN_ONLY
 	bool "hush (Shell compatible with non-MMU systems)"
@@ -197,7 +203,7 @@ endchoice
 
 choice
 prompt "system /bin/sh (POSIX script shell)"
-default ADK_BINSH_HUSH if ADK_TARGET_UCLINUX
+default ADK_BINSH_SASH if ADK_TARGET_UCLINUX
 default ADK_BINSH_MKSH
 
 config ADK_BINSH_MKSH
@@ -207,6 +213,12 @@ config ADK_BINSH_MKSH
 	  Use mksh (a Korn Shell variant) as system shell, which is
 	  both small and powerful, so quite suited for this task.
 
+config ADK_BINSH_SASH
+	select ADK_PACKAGE_SASH if !ADK_TOOLCHAIN_ONLY
+	bool "sash (Standalone Shell)"
+	help
+	  hush shell.
+
 config ADK_BINSH_HUSH
 	select ADK_PACKAGE_HUSH if !ADK_TOOLCHAIN_ONLY
 	bool "hush (busybox)"
diff --git a/target/config/Config.in.target b/target/config/Config.in.target
index 6cb858450..ad1e8dfe0 100644
--- a/target/config/Config.in.target
+++ b/target/config/Config.in.target
@@ -3,7 +3,7 @@
 
 config ADK_TARGET_CFLAGS
 	string
-	default "-march=isaaplus -mcpu=5208" if ADK_CPU_CF_5208
+	default "-mcpu=5208" if ADK_CPU_CF_5208
 	default "-mcpu=v7.10.d" if ADK_CPU_MICROBLAZE
 	default "-m4 -ml" if ADK_CPU_SH4 && ADK_little
 	default "-m4 -mb" if ADK_CPU_SH4 && ADK_big
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 63d8a03db..46d1fa684 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -170,7 +170,7 @@ config ADK_KERNEL_ATA_PIIX
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default n
 	help
-	  ATA PIXX driver
+	  ATA PIIX driver.
 
 config ADK_KERNEL_PATA_MACIO
 	prompt "MAC IO support"
diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu
index 5bfa6d6c1..1f158a27c 100644
--- a/target/linux/config/Config.in.cpu
+++ b/target/linux/config/Config.in.cpu
@@ -53,6 +53,7 @@ config ADK_KERNEL_ARM_IMX6_CPUFREQ
 	select ADK_KERNEL_REGULATOR
 	select ADK_KERNEL_REGULATOR_FIXED_VOLTAGE
 	select ADK_KERNEL_REGULATOR_ANATOP
+	select ADK_KERNEL_REGULATOR_PFUZE100
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c
index e7cbc24f2..bc4da73f6 100644
--- a/target/linux/config/Config.in.i2c
+++ b/target/linux/config/Config.in.i2c
@@ -12,6 +12,7 @@ config ADK_KERNEL_I2C_IMX
 	tristate
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_KERNEL_I2C
+	select ADK_KERNEL_REGMAP_I2C
 	select ADK_KERNEL_I2C_CHARDEV
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default n
diff --git a/target/m68k/uclibc-ng.config b/target/m68k/uclibc-ng.config
index c3225505d..2ca37cc90 100644
--- a/target/m68k/uclibc-ng.config
+++ b/target/m68k/uclibc-ng.config
@@ -54,9 +54,8 @@ UCLIBC_HAS_THREADS=y
 # PTHREADS_DEBUG_SUPPORT is not set
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
-MALLOC=y
-# MALLOC_SIMPLE is not set
-MALLOC_GLIBC_COMPAT=y
+MALLOC_SIMPLE=y
+# MALLOC_GLIBC_COMPAT is not set
 UCLIBC_HAS_OBSTACK=y
 UCLIBC_DYNAMIC_ATEXIT=y
 UCLIBC_SUSV2_LEGACY=y
diff --git a/target/m68k/uclibc.config b/target/m68k/uclibc.config
index 54e6f6322..49c804c17 100644
--- a/target/m68k/uclibc.config
+++ b/target/m68k/uclibc.config
@@ -1,19 +1,32 @@
 #
-# Automatically generated file; DO NOT EDIT.
-# uClibc-ng 1.0.0 C Library Configuration
+# Automatically generated make config: don't edit
+# Version: 0.9.33.2
+# Mon Aug 18 18:48:15 2014
 #
 # TARGET_alpha is not set
-# TARGET_arc is not set
 # TARGET_arm is not set
+# TARGET_avr32 is not set
 # TARGET_bfin is not set
+# TARGET_c6x is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
 # TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
 TARGET_m68k=y
-# TARGET_metag is not set
 # TARGET_microblaze is not set
 # TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
 # TARGET_powerpc is not set
 # TARGET_sh is not set
+# TARGET_sh64 is not set
 # TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
 # TARGET_x86_64 is not set
 # TARGET_xtensa is not set
 
@@ -23,58 +36,48 @@ TARGET_m68k=y
 TARGET_ARCH="m68k"
 FORCE_OPTIONS_FOR_ARCH=y
 TARGET_SUBARCH=""
-
-#
-# Using ELF file format
-#
-ARCH_HAS_DEPRECATED_SYSCALLS=y
+# UCLIBC_FORMAT_ELF is not set
+# UCLIBC_FORMAT_FDPIC_ELF is not set
+# UCLIBC_FORMAT_DSBT_ELF is not set
+# UCLIBC_FORMAT_FLAT is not set
+UCLIBC_FORMAT_FLAT_SEP_DATA=y
+# UCLIBC_FORMAT_SHARED_FLAT is not set
 ARCH_BIG_ENDIAN=y
 
 #
 # Using Big Endian
 #
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
+# ARCH_HAS_MMU is not set
 UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
 DO_C99_MATH=y
 # DO_XSI_MATH is not set
-UCLIBC_HAS_FENV=y
+# UCLIBC_HAS_FENV is not set
 UCLIBC_HAS_LONG_DOUBLE_MATH=y
 KERNEL_HEADERS=""
+UCLIBC_UCLINUX_BROKEN_MUNMAP=y
 HAVE_DOT_CONFIG=y
 
 #
 # General Library Settings
 #
-DOPIC=y
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-LDSO_PRELOAD_ENV_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# LDSO_STANDALONE_SUPPORT is not set
-# LDSO_PRELINK_SUPPORT is not set
-UCLIBC_STATIC_LDCONFIG=y
-LDSO_RUNPATH=y
-LDSO_SAFE_RUNPATH=y
-LDSO_SEARCH_INTERP_PATH=y
-LDSO_LD_LIBRARY_PATH=y
-# LDSO_NO_CLEANUP is not set
-# LDSO_GNU_HASH_SUPPORT is not set
+# DOPIC is not set
+ARCH_HAS_NO_SHARED=y
+ARCH_HAS_NO_LDSO=y
+UCLIBC_CTOR_DTOR=y
 HAS_NO_THREADS=y
+# LINUXTHREADS_OLD is not set
+# LINUXTHREADS_NEW is not set
 # UCLIBC_HAS_THREADS_NATIVE is not set
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_HAS_OBSTACK=y
+MALLOC_SIMPLE=y
+# MALLOC_STANDARD is not set
+# MALLOC_GLIBC_COMPAT is not set
 UCLIBC_DYNAMIC_ATEXIT=y
-UCLIBC_SUSV2_LEGACY=y
+COMPAT_ATEXIT=y
 UCLIBC_SUSV3_LEGACY=y
 # UCLIBC_SUSV3_LEGACY_MACROS is not set
 UCLIBC_SUSV4_LEGACY=y
@@ -104,6 +107,8 @@ UCLIBC_GRP_BUFFER_SIZE=256
 #
 # Support various families of functions
 #
+UCLIBC_LINUX_MODULE_26=y
+# UCLIBC_LINUX_MODULE_24 is not set
 UCLIBC_LINUX_SPECIFIC=y
 UCLIBC_HAS_GNU_ERROR=y
 UCLIBC_BSD_SPECIFIC=y
@@ -125,6 +130,7 @@ UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
 UCLIBC_HAS_IPV6=y
+# UCLIBC_HAS_RPC is not set
 UCLIBC_USE_NETLINK=y
 UCLIBC_SUPPORT_AI_ADDRCONFIG=y
 UCLIBC_HAS_BSD_RES_CLOSE=y
@@ -149,6 +155,8 @@ UCLIBC_HAS_WCHAR=y
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
 # UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
 # UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
 # UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
@@ -178,14 +186,16 @@ UCLIBC_HAS_GNU_GETSUBOPT=y
 # Big and Tall
 #
 UCLIBC_HAS_REGEX=y
+# UCLIBC_HAS_REGEX_OLD is not set
 UCLIBC_HAS_FNMATCH=y
+# UCLIBC_HAS_FNMATCH_OLD is not set
 UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_NFTW=y
 UCLIBC_HAS_FTW=y
 UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
-UCLIBC_HAS_GNU_GLOB=y
-UCLIBC_HAS_UTMPX=y
+# UCLIBC_HAS_GNU_GLOB is not set
+# UCLIBC_HAS_UTMPX is not set
 
 #
 # Library Installation Options
@@ -198,11 +208,8 @@ HARDWIRED_ABSPATH=y
 #
 # Security options
 #
-UCLIBC_HAS_ARC4RANDOM=y
-# ARC4RANDOM_USES_NODEV is not set
+# UCLIBC_HAS_ARC4RANDOM is not set
 # UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-# UCLIBC_BUILD_NOW is not set
 UCLIBC_BUILD_NOEXECSTACK=y
 
 #
@@ -213,10 +220,8 @@ UCLIBC_EXTRA_CFLAGS=""
 # DODEBUG is not set
 # DOSTRIP is not set
 # DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
 # UCLIBC_MALLOC_DEBUGGING is not set
-# UCLIBC_HAS_BACKTRACE is not set
 WARNINGS="-Wall"
 EXTRA_WARNINGS=y
 # DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set