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

author: Waldemar Brodkorb <wbx@openadk.org> 2013-10-02 13:06:50 +0200
committer: Waldemar Brodkorb <wbx@openadk.org> 2013-10-02 13:06:50 +0200
commit: 984ea37e4ecdc7fb5e277bf5a045af73b5204791 (patch)
tree: ab106aa77066da3ff699b0421ade63d2e15a9dec
parent: 9c99c075a925519eb073744d9cbdaee596abb4ab (diff)
parent: 771da6d340f447a74dd9306c866219a5e5b85b0d (diff)
36 files changed, 951 insertions, 794 deletions
diff --git a/Config.in b/Config.in
index d2bedf377..dcfbd9f03 100644
--- a/Config.in
+++ b/Config.in
@@ -177,6 +177,7 @@ config ADK_COMPRESSION_TOOL
 	default "xz" if ADK_TARGET_INITRAMFS_COMPRESSION_XZ
 	default "lzma -9" if ADK_TARGET_INITRAMFS_COMPRESSION_LZMA
 	default "lzop" if ADK_TARGET_INITRAMFS_COMPRESSION_LZO
+	default "gzip -n9"
 	help
 
 source "target/linux/Config.in"
diff --git a/mk/image.mk b/mk/image.mk
index 57664464e..095b69c1d 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -143,7 +143,7 @@ ${BIN_DIR}/${INITRAMFS}_list: ${TARGET_DIR}
 	) >>$@
 
 ${BIN_DIR}/${INITRAMFS}: ${BIN_DIR}/${INITRAMFS}_list
-	bash ${LINUX_DIR}/usr/gen_init_cpio ${BIN_DIR}/${INITRAMFS}_list | \
+	${LINUX_DIR}/usr/gen_init_cpio ${BIN_DIR}/${INITRAMFS}_list | \
 		${ADK_COMPRESSION_TOOL} -c >$@
 
 ${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 605922737..9d373653a 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		59
+PKG_RELEASE:=		60
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
@@ -65,6 +65,9 @@ endif
 ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILE),y)
 	$(SED) 's#ttyS#ttyAMA#g' $(IDIR_BASE_FILES)/etc/inittab
 endif
+ifeq ($(ADK_TARGET_SYSTEM_ARANYM_M68K),y)
+	$(SED) 's#ttyS#nfcon0#g' $(IDIR_BASE_FILES)/etc/inittab
+endif
 	$(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab
 	test -z $(ADK_RUNTIME_HOSTNAME) || \
 	    echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \
diff --git a/package/boost/Makefile b/package/boost/Makefile
index 271b2937c..cce3246fa 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		boost
 PKG_VERSION:=		1.54.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		efbfbff5a85a9330951f243d0a46e4b9
 PKG_DESCR:=		boost C++ library
 PKG_SECTION:=		libs
diff --git a/package/boost/patches/patch-boost_cstdint_hpp b/package/boost/patches/patch-boost_cstdint_hpp
new file mode 100644
index 000000000..5b09e892b
--- /dev/null
+++ b/package/boost/patches/patch-boost_cstdint_hpp
@@ -0,0 +1,14 @@
+--- boost_1_54_0.orig/boost/cstdint.hpp	2013-03-09 23:55:05.000000000 +0100
++++ boost_1_54_0/boost/cstdint.hpp	2013-09-19 16:46:42.000000000 +0200
+@@ -41,7 +41,10 @@
+ // so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG.
+ // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
+ //
+-#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
++#if defined(BOOST_HAS_STDINT_H)                                 \
++  && (!defined(__GLIBC__)                                       \
++      || defined(__GLIBC_HAVE_LONG_LONG)                        \
++      || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17)))))
+ 
+ // The following #include is an implementation artifact; not part of interface.
+ # ifdef __hpux
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 552a12122..de0ed663c 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		a70edc50524f258eaf5c9a9994ed8748
 PKG_DESCR:=		DBUS library and daemon
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libexpat libx11
-PKG_BUILDDEP:=		expat libX11
+PKG_DEPENDS:=		libexpat libx11 libuuid
+PKG_BUILDDEP:=		expat libX11 util-linux
 PKG_URL:=		http://dbus.freedesktop.org/
 PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus/
 
@@ -27,6 +27,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,DBUS_DEV,dbus-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_DEV},${PKGSC_DBUS_DEV},${PKG_OPTS}))
 
+TARGET_LDFLAGS+=	-luuid
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--disable-tests \
 			--disable-abstract-sockets \
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 3982ebfd9..da18b361d 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		krb5
 PKG_VERSION:=		1.11.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		56f0ae274b285320b8a597cb89442449
 PKG_DESCR:=		MIT kerberos server
 PKG_SECTION:=		crypto
@@ -47,6 +47,7 @@ CONFIGURE_ARGS+=	--disable-static \
 			--disable-profiled \
 			--with-system-ss \
 			--with-system-et \
+			--without-system-verto \
 			--without-tcl
 CONFIGURE_ENV+=		krb5_cv_attr_constructor_destructor=yes,yes \
 			ac_cv_func_regcomp=yes \
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 003cd9783..191d1f610 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -11,7 +11,7 @@ PKG_SECTION:=		libs
 
 NO_DISTFILES:=		1
 
-PKG_ARCH_DEPENDS:=	!sh !avr32
+PKG_ARCH_DEPENDS:=	!avr32
 
 include ${TOPDIR}/mk/package.mk
 
@@ -24,8 +24,16 @@ INSTALL_STYLE:=		manual
 do-install:
 ifeq ($(ADK_NATIVE),)
 	${INSTALL_DIR} ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+ifeq ($(ADK_LINUX_SH),y)
+ifeq ($(ADK_TARGET_LIB_GLIBC),y)
+	${CP} ${STAGING_TARGET_DIR}/lib/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+else
+	${CP} ${STAGING_TARGET_DIR}/lib/!m4/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+endif
+else
 	${CP} ${STAGING_TARGET_DIR}/$(ADK_TARGET_LIBC_PATH)/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
 endif
+endif
 ifeq ($(ADK_TARGET_MULTILIB_X86_32),y)
 	${INSTALL_DIR} ${IDIR_LIBGCC}/lib32
 	${CP} ${STAGING_TARGET_DIR_32}/lib/libgcc*.so* ${IDIR_LIBGCC}/lib32
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index 44f5becd0..fddf9656b 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -34,6 +34,7 @@ ifeq ($(ADK_NATIVE),y)
 else
 	(cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.17 libstdc++.so.6)
 	(cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.17 libstdc++.so)
+	(cd ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/; ln -sf libstdc++.so.6.0.17 libstdc++.so)
 	$(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
 	-@rm ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so.*-gdb.py
 endif
diff --git a/package/lsof/Makefile b/package/lsof/Makefile
index 1f968dd05..c5ede4836 100644
--- a/package/lsof/Makefile
+++ b/package/lsof/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		6dae655988c810a7042c06a4e2fa3c5f
 PKG_DESCR:=		list open files
 PKG_SECTION:=		misc
+PKG_DEPENDS:=		libtirpc
+PKG_BUILDDEP:=		libtirpc
 PKG_URL:=		http://people.freebsd.org/~abe/
 PKG_SITES:=		ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
 
@@ -23,7 +25,8 @@ $(eval $(call PKG_template,LSOF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_
 CONFIG_STYLE:=		minimal
 CONFIGURE_PROG:=	Configure
 CONFIGURE_ARGS:=	-n linux
-XAKE_FLAGS+=		CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS} -I$(STAGING_DIR)/usr/include/tirpc' CFGL='${TARGET_LDFLAGS} -L./lib -llsof -ltirpc'
+XAKE_FLAGS+=		CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS} -I$(STAGING_DIR)/usr/include/tirpc'
+XAKE_FLAGS+=		CFGL='${TARGET_LDFLAGS} -L./lib -llsof -ltirpc'
 INSTALL_STYLE:=		manual
 
 post-extract:
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index cd84e98a3..8fa2aff9c 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -20,7 +20,7 @@ WRKDIST=		${WRKDIR}/icedtea-${PKG_VERSION}
 
 PKG_HOST_DEPENDS:=	!darwin !cygwin !openbsd !netbsd !freebsd
 PKG_ARCH_DEPENDS:=	arm mips x86 x86_64
-PKG_SYSTEM_DEPENDS:=	!linksys-ag241 !fon-fon2100 !broadcom-bcm47xx
+PKG_SYSTEM_DEPENDS:=	!linksys-ag241 !fon-fon2100 !broadcom-bcm47xx !lemote-yeelong
 
 PKG_SUBPKGS:=		OPENJDK7
 PKG_CHOICES_OPENJDK7:=	ZERO SHARK CACAO
diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile
index 1cde53cf7..142a04508 100644
--- a/package/pciutils/Makefile
+++ b/package/pciutils/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		51ded74e4184d4a6c9f2ada95c28c067
 PKG_DESCR:=		PCI Utilities
 PKG_SECTION:=		utils
-PKG_DEPENDS:=		zlib
+PKG_DEPENDS:=		zlib libgcc
 PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://www.kernel.org/pub/software/utils/pciutils/
 PKG_SITES:=		http://www.kernel.org/pub/software/utils/pciutils/
diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index 80e856b57..d81eb7c06 100644
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -24,6 +24,7 @@ $(eval $(call PKG_template,LIBPCRECPP,libpcrecpp,${PKG_VERSION}-${PKG_RELEASE},$
 $(eval $(call PKG_template,LIBPCRE_DEV,libpcre-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCRE_DEV},${PKGSC_LIBPCRE_DEV}))
 
 XAKE_FLAGS+=		${TARGET_CONFIGURE_OPTS}
+TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32 -lintl
 
 libpcre-install:
 	${INSTALL_DIR} ${IDIR_LIBPCRE}/usr/lib
diff --git a/package/samba/files/smb.conf b/package/samba/files/smb.conf
index 2ac0576d8..1b65b238d 100644
--- a/package/samba/files/smb.conf
+++ b/package/samba/files/smb.conf
@@ -12,9 +12,9 @@
  pid directory = /var/run/samba
  load printers = no
  printcap name = /dev/null
- unix charset = ASCII 
+ unix charset = UTF8
  dos charset = ASCII 
- display charset = ASCII 
+ display charset = UTF8
  unix extensions = yes 
 
 #[media]
diff --git a/package/v4l-utils/Makefile b/package/v4l-utils/Makefile
index f8e1e430f..17bed1502 100644
--- a/package/v4l-utils/Makefile
+++ b/package/v4l-utils/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:=		http://linuxtv.org/downloads/v4l-utils/
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
-PKG_CFLINE_V4L_UTILS:=  depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+PKG_LIBC_DEPENDS:=	eglibc glibc
 PKG_SUBPKGS:=		V4L_UTILS LIBV4L
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xsm/Makefile b/package/xsm/Makefile
index 73602d44b..72da54414 100644
--- a/package/xsm/Makefile
+++ b/package/xsm/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		6dfc70ae1c13f775f1c646a6d8780076
 PKG_DESCR:=		X session manager
 PKG_SECTION:=		x11/apps
+PKG_DEPENDS:=		libxaw
+PKG_BUILDDEP:=		libXaw
 PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
diff --git a/rules.mk b/rules.mk
index a66762391..0a89332d3 100644
--- a/rules.mk
+++ b/rules.mk
@@ -43,6 +43,7 @@ ADK_RUNTIME_TMPFS_SIZE:=	$(strip $(subst ",, $(ADK_RUNTIME_TMPFS_SIZE)))
 ADK_RUNTIME_CONSOLE_SERIAL_SPEED:=	$(strip $(subst ",, $(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)))
 ADK_HOST:=		$(strip $(subst ",, $(ADK_HOST)))
 ADK_VENDOR:=		$(strip $(subst ",, $(ADK_VENDOR)))
+ADK_COMPRESSION_TOOL:=		$(strip $(subst ",, $(ADK_COMPRESSION_TOOL)))
 ADK_TOOLS_ADDPATTERN_ARGS:=	$(strip $(subst ",, $(ADK_TOOLS_ADDPATTERN_ARGS)))
 ADK_KERNEL_VERSION:=		$(strip $(subst ",, $(ADK_KERNEL_VERSION)))
 ADK_PARAMETER_NETCONSOLE_SRC_IP:=	$(strip $(subst ",, $(ADK_PARAMETER_NETCONSOLE_SRC_IP)))
diff --git a/scripts/create-sys b/scripts/create-sys
index c34a6ac3a..d34a0e443 100755
--- a/scripts/create-sys
+++ b/scripts/create-sys
@@ -32,7 +32,7 @@ for i in $systems;do
 	systemu=$(echo $system|tr '[:upper:]' '[:lower:]')
 	system=$(echo $system|tr '[:upper:]_' '[:lower:]-')
 	system=$(echo $system|sed 's#x86-64#x86_64#')
-	if [ "${system%-*}" = "toolchain" -o "${system%-*}" = "qemu" -o "${system%-*}" = "vbox" ];then
+	if [ "${system%-*}" = "toolchain" -o "${system%-*}" = "qemu" -o "${system%-*}" = "vbox" -o "${system%-*}" = "aranym" ];then
 		printf "\tdefault \"${system%-*}\" if ADK_$systemu\n" >> $topdir/target/config/Config.in.system.default
 	else
 		printf "\tdefault \"${system}\" if ADK_$systemu\n" >> $topdir/target/config/Config.in.system.default
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index b9888a4df..f794a8c37 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -104,7 +104,7 @@ if [[ -n $ADK_COMPILE_OPENJDK ]]; then
 fi
 
 if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then
-	NEED_ZIP="$NEED_ZIP openjdk"
+	NEED_ZIP="$NEED_ZIP openjdk7"
 fi
 
 if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then
@@ -133,6 +133,10 @@ if [[ -n $ADK_COMPILE_AUTOMAKE ]]; then
 	NEED_AUTOCONF="$NEED_AUTOCONF automake"
 fi
 
+if [[ -n $ADK_COMPILE_COROSYNC ]]; then
+	NEED_GROFF="$NEED_GROFF corosync"
+fi
+
 if [[ -n $ADK_COMPILE_LIBTOOL ]]; then
 	NEED_AUTOMAKE="$NEED_AUTOMAKE libtool"
 fi
@@ -305,6 +309,13 @@ if [[ -n $NEED_LIBSSLDEV ]]; then
 	fi
 fi
 
+if [[ -n $NEED_GROFF ]]; then
+	if ! which groff >/dev/null 2>&1; then
+		echo >&2 You need groff to build $NEED_GROFF
+		out=1
+	fi
+fi
+
 if [[ -n $NEED_MKFONTDIR ]]; then
 	if ! which mkfontdir >/dev/null 2>&1; then
 		echo >&2 You need mkfontdir to build $NEED_MKFONTDIR
diff --git a/scripts/update-sys b/scripts/update-sys
index 64b56a7dd..6c82dc626 100755
--- a/scripts/update-sys
+++ b/scripts/update-sys
@@ -49,7 +49,7 @@ config $archsym
 	boolean
 EOF
 
-if [ "${system}" = "toolchain" -o "${system}" = "qemu" -o "${system}" = "vbox" ];then
+if [ "${system}" = "toolchain" -o "${system}" = "qemu" -o "${system}" = "vbox" -o "${system}" = "aranym" ];then
 	sys=${system}-$cpuarch
 else
 	sys=$system
diff --git a/target/config/Config.in b/target/config/Config.in
index a14ef5b7a..cd21deeec 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -482,7 +482,8 @@ config ADK_TARGET_CPU_ARCH
 	default "avr32" if ADK_LINUX_AVR32
 	default "sparc" if ADK_LINUX_SPARC
 	default "sparc64" if ADK_LINUX_SPARC64
-	default "sh" if ADK_LINUX_SH
+	default "sh4" if ADK_LINUX_SH && ADK_little
+	default "sh4eb" if ADK_LINUX_SH && ADK_big
 	default "cris" if ADK_CPU_CRIS_V10
 	default "crisv32" if ADK_CPU_CRIS_V32
 	default "ppc" if ADK_CPU_PPC
@@ -542,7 +543,8 @@ config ADK_TARGET_CMDLINE
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	default "console=ttyAMA0 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILE
 	default "console=ttyS0,115200 console=tty0 fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default "console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH
+	default "console=ttySC1 console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH
+	default "console=ttyS0" if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_FOXBOARD_LX
@@ -601,6 +603,7 @@ config ADK_TARGET_LIB_EGLIBC
 		ADK_LINUX_MIPS64EL || \
 		ADK_LINUX_PPC || \
 		ADK_LINUX_PPC64 || \
+		ADK_LINUX_SH || \
 		ADK_LINUX_SPARC || \
 		ADK_LINUX_SPARC64 || \
 		ADK_LINUX_X86 || \
@@ -621,6 +624,7 @@ config ADK_TARGET_LIB_GLIBC
 		ADK_LINUX_MIPS64EL || \
 		ADK_LINUX_PPC || \
 		ADK_LINUX_PPC64 || \
+		ADK_LINUX_SH || \
 		ADK_LINUX_SPARC || \
 		ADK_LINUX_SPARC64 || \
 		ADK_LINUX_X86 || \
@@ -672,6 +676,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS
 	bool "initramfs filesystem"
 	depends on \
 		ADK_HARDWARE_QEMU || \
+		ADK_TARGET_SYSTEM_ARANYM_M68K || \
 		ADK_LINUX_ARM || \
 		ADK_LINUX_MIPS || \
 		ADK_LINUX_PPC || \
@@ -731,7 +736,7 @@ config ADK_TARGET_ROOTFS_NFSROOT
 	select ADK_KERNEL_NFS_COMMON
 	select ADK_KERNEL_IP_PNP
 	select ADK_KERNEL_IP_PNP_DHCP
-	depends on !ADK_HARDWARE_QEMU && !ADK_HARDWARE_VBOX
+	depends on !ADK_HARDWARE_QEMU && !ADK_HARDWARE_VBOX && !ADK_TARGET_SYSTEM_ARANYM_M68K
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	help
 	  Root filesystem mounted via NFS. (DHCP)
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index ddd0e3d2a..cf996368f 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -23,6 +23,7 @@ config ADK_RUNTIME_PASSWORD
 config ADK_RUNTIME_TMPFS_SIZE
 	string "size of /tmp in memory (kB)"
 	default "16384" if ADK_TARGET_SYSTEM_IBM_X40
+	default "16384" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default "2048"
 	help
 	  Size of /tmp in memory in Kilobyte.
@@ -35,8 +36,8 @@ config ADK_RUNTIME_TIMEZONE
 
 choice
 prompt "Console output on embedded system"
-default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI
-default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI
+default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_QEMU_SH4 && !ADK_TARGET_SYSTEM_QEMU_SH4EB
+default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB
 default ADK_RUNTIME_CONSOLE_SERIAL
 
 config ADK_RUNTIME_CONSOLE_VGA
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index dfa31bba7..e35f97ac4 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -20,6 +20,7 @@ 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
 
 config ADK_KERNEL_FONTS
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 3eff14a42..587a7f2c9 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -5,6 +5,8 @@ config ADK_KERNEL_INPUT
 	boolean
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
@@ -19,6 +21,16 @@ config ADK_KERNEL_INPUT
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
+config ADK_KERNEL_KEYBOARD_ATARI
+	boolean
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
+	default n
+
+config ADK_KERNEL_MOUSE_ATARI
+	boolean
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
+	default n
+
 config ADK_KERNEL_KEYBOARD_GPIO
 	boolean
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
@@ -48,6 +60,7 @@ config ADK_KERNEL_INPUT_KEYBOARD
 	boolean
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
@@ -82,6 +95,7 @@ config ADK_KERNEL_INPUT_MOUSE
 	boolean
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
@@ -130,6 +144,7 @@ config ADK_KPACKAGE_KMOD_USB_HID
         depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on ADK_TARGET_WITH_USB
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
 	default n
 
 config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 710e4987e..1459039b6 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -31,6 +31,7 @@ config ADK_KPACKAGE_KMOD_USB
 	select ADK_KERNEL_NLS
 	depends on !ADK_KERNEL_USB
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
 	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
@@ -115,6 +116,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
 	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
 	default n
 	help
 	  The Open Host Controller Interface (OHCI) is a standard for accessing
diff --git a/target/m68k/kernel.config b/target/m68k/kernel.config
index 99a53dd7a..7fa647489 100644
--- a/target/m68k/kernel.config
+++ b/target/m68k/kernel.config
@@ -1,38 +1,34 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/m68k 3.4.4 Kernel Configuration
+# Linux/m68k 3.9.11 Kernel Configuration
 #
 CONFIG_M68K=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_TIME_LOW_RES=y
-CONFIG_ARCH_USES_GETTIMEOFFSET=y
 CONFIG_NO_IOPORT=y
 # CONFIG_NO_DMA is not set
 CONFIG_ZONE_DMA=y
-CONFIG_CPU_HAS_ADDRESS_SPACES=y
-CONFIG_FPU=y
 CONFIG_HZ=100
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_IRQ_WORK=y
 
 #
 # General setup
 #
-CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
+CONFIG_DEFAULT_HOSTNAME="openadk"
+# CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_FHANDLE is not set
-# CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 
@@ -41,12 +37,21 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
 #
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_ARCH_USES_GETTIMEOFFSET=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
 
 #
 # RCU Subsystem
 #
 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=y
 CONFIG_IKCONFIG_PROC=y
@@ -59,6 +64,8 @@ CONFIG_NAMESPACES=y
 # CONFIG_USER_NS is not set
 # CONFIG_PID_NS is not set
 # CONFIG_NET_NS is not set
+CONFIG_UIDGID_CONVERTED=y
+# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
 # CONFIG_SCHED_AUTOGROUP is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
@@ -66,14 +73,15 @@ CONFIG_NAMESPACES=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
-# CONFIG_EXPERT is not set
+CONFIG_EXPERT=y
+CONFIG_HAVE_UID16=y
 CONFIG_UID16=y
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
-CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -82,7 +90,7 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
-# CONFIG_EMBEDDED is not set
+CONFIG_EMBEDDED=y
 
 #
 # Kernel Performance Events And Counters
@@ -92,7 +100,15 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
+# CONFIG_SLOB is not set
 # CONFIG_PROFILING is not set
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OLD_SIGACTION=y
 
 #
 # GCOV-based kernel profiling
@@ -104,9 +120,10 @@ CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
 CONFIG_BLOCK=y
 # CONFIG_LBDAF is not set
 # CONFIG_BLK_DEV_BSG is not set
@@ -117,8 +134,9 @@ CONFIG_BLOCK=y
 # Partition Types
 #
 # CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MAC_PARTITION=y
+CONFIG_ATARI_PARTITION=y
 CONFIG_MSDOS_PARTITION=y
+CONFIG_EFI_PARTITION=y
 
 #
 # IO Schedulers
@@ -128,34 +146,11 @@ CONFIG_IOSCHED_NOOP=y
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_DEFAULT_NOOP=y
 CONFIG_DEFAULT_IOSCHED="noop"
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
 CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
 CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
 # CONFIG_FREEZER is not set
 CONFIG_MMU=y
 CONFIG_MMU_MOTOROLA=y
@@ -169,9 +164,9 @@ CONFIG_MMU_MOTOROLA=y
 #
 CONFIG_M68KCLASSIC=y
 # CONFIG_COLDFIRE i
author	Waldemar Brodkorb <wbx@openadk.org>	2013-10-02 13:06:50 +0200
committer	Waldemar Brodkorb <wbx@openadk.org>	2013-10-02 13:06:50 +0200
commit	984ea37e4ecdc7fb5e277bf5a045af73b5204791 (patch)
tree	ab106aa77066da3ff699b0421ade63d2e15a9dec
parent	9c99c075a925519eb073744d9cbdaee596abb4ab (diff)
parent	771da6d340f447a74dd9306c866219a5e5b85b0d (diff)