diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-17 22:02:40 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-17 22:02:40 +0100 |
commit | 4e434808f57408d58b48e2c9c2fa0401ccb0f967 (patch) | |
tree | 13de16aec026c7494921c9894870699bec20e75b | |
parent | a7398b69f0946733ea2bd7e90176c1cab07376d0 (diff) | |
parent | f9011c1275b13f39e4ab4552173bfb91b2ffae56 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
36 files changed, 68348 insertions, 892 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 361329aa7..41fecf3f2 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -40,13 +40,10 @@ ifneq ($(filter autogen,${AUTOTOOL_STYLE}),) endif ifneq ($(filter autotool,${AUTOTOOL_STYLE}),) cd ${WRKBUILD}; \ - env AUTOCONF_VERSION=2.62 \ - AUTOMAKE_VERSION=1.9 \ autoreconf -vf;libtoolize $(MAKE_TRACE) endif ifneq ($(filter autoconf,${AUTOTOOL_STYLE}),) - cd ${WRKBUILD}; \ - env AUTOCONF_VERSION=2.62 autoconf $(MAKE_TRACE) + cd ${WRKBUILD}; autoconf $(MAKE_TRACE) endif ifneq ($(filter manual,${CONFIG_STYLE}),) env ${CONFIGURE_ENV} ${MAKE} do-configure $(MAKE_TRACE) diff --git a/package/aufs2-util/src/Makefile b/package/aufs2-util/src/Makefile index c7aacfc14..35c5f6645 100644 --- a/package/aufs2-util/src/Makefile +++ b/package/aufs2-util/src/Makefile @@ -34,7 +34,7 @@ LibUtil = libautil.a LibUtilObj = proc_mnt.o br.o plink.o mtab.o LibUtilHdr = au_util.h -all: ${Man} ${Bin} ${Etc} #${LibSo} +all: ${Bin} ${Etc} #${LibSo} ${Bin}: LDFLAGS += -static -s ${Bin}: LDLIBS = -L. -lautil @@ -94,7 +94,7 @@ install_etc: ${File} install -m 644 -o root -g root -p -T ${File} ${Tgt} # do not inlcude install_ulib here -install: install_man install_sbin install_ubin install_etc +install: install_sbin install_ubin install_etc clean: ${RM} ${Man} ${Bin} ${Etc} ${LibUtil} ${LibSo} *~ diff --git a/package/gkrellmd/Makefile b/package/gkrellmd/Makefile index 65b9b9fd8..3718147cc 100644 --- a/package/gkrellmd/Makefile +++ b/package/gkrellmd/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gkrellmd -PKG_VERSION:= 2.3.2 +PKG_VERSION:= 2.3.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= db8a983a60577a6b4886db96d6def011 +PKG_MD5SUM:= 600f4daa395112ed19a3633deb0829ff PKG_DESCR:= The GNU Krell Monitors Server PKG_SECTION:= net PKG_DEPENDS:= glib libpthread diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index 8b88305da..c1b7dd382 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -21,6 +21,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GPSD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoconf + CONFIGURE_ENV+= EGREP="grep -E" \ CPP="$(TARGET_CC) -E" \ ac_cv_func_strlcpy=no \ @@ -39,7 +41,7 @@ TLDFLAGS+= -shared endif post-extract: - @find ${WRKBUILD} -name *.rej -delete + @find ${WRKBUILD} -name *.rej -exec rm {} \; ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y) # add workaround because libtool tries to link libstdc++ diff --git a/package/gpsd/patches/patch-configure_ac b/package/gpsd/patches/patch-configure_ac new file mode 100644 index 000000000..c6b538e08 --- /dev/null +++ b/package/gpsd/patches/patch-configure_ac @@ -0,0 +1,95 @@ +--- gpsd-2.39.orig/configure.ac Wed Mar 18 22:09:27 2009 ++++ gpsd-2.39/configure.ac Tue Feb 16 21:44:35 2010 +@@ -5,84 +5,6 @@ dnl AC_PREFIX_PROGRAM(gcc) + AM_CONFIG_HEADER(gpsd_config.h) + AC_LANG([C]) + +-AC_ARG_ENABLE(python, +- AC_HELP_STRING([--disable-python], +- [disable python scripts and library bindings]), +- [try_python="$enableval"], [try_python="yes"]) +-if test "x$try_python" = "xyes"; then +- AM_PATH_PYTHON +- ac_python=yes +- if test "x$PYTHON" = "x"; then +- AC_PATH_PROG(PYTHON, python, none) +- fi +- +- if test "x$PYTHON" = "xnone"; then +- AC_MSG_WARN([*** Python interpreter not found, Python support disabled.]) +- ac_python=no +- fi +- +- if test "x$ac_python" = "xyes"; then +- AC_MSG_CHECKING(Python version and location) +- PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"` +- PYTHON_VERSION_MAJOR=[`$PYTHON -c "import sys; print '%d' % (sys.version_info[0]);"`] +- PYTHON_VERSION_MINOR=[`$PYTHON -c "import sys; print '%d' % (sys.version_info[1]);"`] +- PYTHON_VERSION="${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" +- AC_MSG_RESULT([$PYTHON, $PYTHON_VERSION, $PYTHON_PREFIX]) +- +- AC_MSG_CHECKING(whether Python is at least 2.4) +- if test $PYTHON_VERSION_MAJOR -lt 2 -o $PYTHON_VERSION_MAJOR -eq 2 -a $PYTHON_VERSION_MINOR -lt 3; then +- AC_MSG_RESULT(no) +- AC_MSG_WARN([*** GPSD requires at least Python 2.3, Python support disabled.]) +- ac_python=no +- fi +- if test "x$ac_python" = "xyes"; then +- AC_MSG_RESULT(yes) +- +- PYTHON_CFLAGS="-DHAVE_PYTHON -I$PYTHON_PREFIX/include/python$PYTHON_VERSION" +- +- OLD_CPPFLAGS="$CPPFLAGS" +- OLD_CXXFLAGS="$CXXFLAGS" +- CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS" +- CXXFLAGS="$CXXFLAGS $PYTHON_CFLAGS" +- +- AC_CHECK_HEADERS([Python.h], +- [], +- [AC_MSG_WARN([*** Python include files not found! You should install the Python development package. Python support disabled]); ac_python=no]) +- CPPFLAGS="$OLD_CPPFLAGS" +- CXXFLAGS="$OLD_CXXFLAGS" +- +- if test "x$ac_python" = "xyes"; then +- AC_SUBST([PYTHON_CFLAGS]) +- +- ac_python=no +- for pylibpath in '/usr/lib' $PYTHON_PREFIX/lib $PYTHON_PREFIX/lib/python$PYTHON_VERSION/config; do +- eval `echo unset ac_cv_lib_python$PYTHON_VERSION'___'Py_Finalize | tr '.' '_'` +- +- save_LIBS=$LIBS +- LIBS="$LIBS -L$pylibpath $PYTHON_LIBS" +- AC_CHECK_LIB(python$PYTHON_VERSION, Py_Finalize, PYTHON_LIBS="-L$pylibpath -lpython$PYTHON_VERSION $PYTHON_DEPS"; ac_python=yes,,$PYTHON_DEPS) +- LIBS=$save_LIBS +- if test "x$ac_python" = "xyes"; then +- break +- fi +- done +- +- if test "x$ac_python" != "xyes"; then +- AC_MSG_WARN(*** Python development libraries required, Python support disabled) +- fi +- AC_SUBST([PYTHON_LIBS]) +- +- AC_SUBST(pkgpythondir) +- if test "x$python_install" = "xyes"; then +- pkgpythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION"/site-packages/gpsd" +- fi +- +- fi +- fi +- fi +-fi +-AM_CONDITIONAL([HAVE_PYTHON], [test x"$ac_python" = xyes]) +- + AC_PROG_LN_S + AC_PROG_MAKE_SET + AC_PROG_INSTALL +@@ -943,7 +865,6 @@ echo " Client Features" + echo " ---------------" + echo "Build ncurses programs : $ac_ncurses" + echo "Enable X11 support : $ac_x" +-echo "Enable Python support : $ac_python" + echo "------------------------------------------" + + if test "xdummy" = "xdummy" -a \ diff --git a/package/gpsd/patches/patch-contrib_motosend_c b/package/gpsd/patches/patch-contrib_motosend_c index c5f1b0162..e2db10a74 100644 --- a/package/gpsd/patches/patch-contrib_motosend_c +++ b/package/gpsd/patches/patch-contrib_motosend_c @@ -1,5 +1,5 @@ ---- gpsd-2.39.orig/contrib/motosend.c 2008-06-26 21:08:36.000000000 +0200 -+++ gpsd-2.39/contrib/motosend.c 2009-06-13 09:12:46.000000000 +0200 +--- gpsd-2.39.orig/contrib/motosend.c Thu Jun 26 21:08:36 2008 ++++ gpsd-2.39/contrib/motosend.c Tue Feb 16 21:33:16 2010 @@ -81,7 +81,7 @@ int main(int argc, char **argv) { t = 0; n = 0; while (1){ @@ -9,7 +9,7 @@ if ((l = read(fd, buf, BSIZ)) == -1) if (!(EINTR == errno || EAGAIN == errno)) err(1, "read"); -@@ -119,7 +119,7 @@ static int moto_send(int fd, char *type, +@@ -119,7 +119,7 @@ static int moto_send(int fd, char *type, char *body ) if ((buf = malloc(l+7)) == NULL) return -1; @@ -18,7 +18,7 @@ buf[0] = '@'; buf[1] = '@'; buf[2] = type[0]; buf[3] = type[1]; -@@ -171,7 +171,7 @@ int gpsd_hexpack(char *src, char *dst, i +@@ -171,7 +171,7 @@ int gpsd_hexpack(char *src, char *dst, int len){ if ((l < 1) || (l > len)) return -1; diff --git a/package/gpsd/patches/patch-driver_garmin_txt_c b/package/gpsd/patches/patch-driver_garmin_txt_c index 604e103b0..64a146e58 100644 --- a/package/gpsd/patches/patch-driver_garmin_txt_c +++ b/package/gpsd/patches/patch-driver_garmin_txt_c @@ -1,6 +1,6 @@ ---- gpsd-2.39.orig/driver_garmin_txt.c 2009-03-03 12:39:57.000000000 +0100 -+++ gpsd-2.39/driver_garmin_txt.c 2009-06-13 09:13:23.000000000 +0200 -@@ -167,7 +167,7 @@ static int gar_decode(const char *data, +--- gpsd-2.39.orig/driver_garmin_txt.c Tue Mar 3 12:39:57 2009 ++++ gpsd-2.39/driver_garmin_txt.c Tue Feb 16 21:33:16 2010 +@@ -167,7 +167,7 @@ static int gar_decode(const char *data, const size_t l return -1; } @@ -9,7 +9,7 @@ (void) strncpy(buf, data, length); gpsd_report(LOG_RAW, "Decoded string: %s\n", buf); -@@ -230,7 +230,7 @@ static int gar_int_decode(const char *da +@@ -230,7 +230,7 @@ static int gar_int_decode(const char *data, const size return -1; } diff --git a/package/gpsd/patches/patch-driver_sirf_c b/package/gpsd/patches/patch-driver_sirf_c index 1e44cee91..2fbdaef1e 100644 --- a/package/gpsd/patches/patch-driver_sirf_c +++ b/package/gpsd/patches/patch-driver_sirf_c @@ -1,6 +1,6 @@ ---- gpsd-2.39.orig/driver_sirf.c 2009-03-07 16:30:58.000000000 +0100 -+++ gpsd-2.39/driver_sirf.c 2009-06-13 09:13:42.000000000 +0200 -@@ -238,7 +238,7 @@ static gps_mask_t sirf_msg_debug(unsigne +--- gpsd-2.39.orig/driver_sirf.c Sat Mar 7 16:30:58 2009 ++++ gpsd-2.39/driver_sirf.c Tue Feb 16 21:33:16 2010 +@@ -238,7 +238,7 @@ static gps_mask_t sirf_msg_debug(unsigned char *buf, s char msgbuf[MAX_PACKET_LENGTH*3 + 2]; int i; diff --git a/package/gpsd/patches/patch-hex_c b/package/gpsd/patches/patch-hex_c index ebb2e1697..ad6b2e981 100644 --- a/package/gpsd/patches/patch-hex_c +++ b/package/gpsd/patches/patch-hex_c @@ -1,6 +1,6 @@ ---- gpsd-2.39.orig/hex.c 2009-03-18 18:37:56.000000000 +0100 -+++ gpsd-2.39/hex.c 2009-06-13 09:13:58.000000000 +0200 -@@ -61,7 +61,7 @@ int gpsd_hexpack(char *src, char *dst, s +--- gpsd-2.39.orig/hex.c Wed Mar 18 18:37:56 2009 ++++ gpsd-2.39/hex.c Tue Feb 16 21:33:16 2010 +@@ -61,7 +61,7 @@ int gpsd_hexpack(char *src, char *dst, size_t len){ if ((l < 1) || ((size_t)l > len)) return -2; diff --git a/package/gpsd/patches/patch-sirfflash_c b/package/gpsd/patches/patch-sirfflash_c index 979793a56..f83306d34 100644 --- a/package/gpsd/patches/patch-sirfflash_c +++ b/package/gpsd/patches/patch-sirfflash_c @@ -1,6 +1,6 @@ ---- gpsd-2.39.orig/sirfflash.c 2009-01-28 21:53:47.000000000 +0100 -+++ gpsd-2.39/sirfflash.c 2010-01-16 09:27:49.000000000 +0100 -@@ -193,7 +193,7 @@ sirfSetProto(int pfd, struct termios *te +--- gpsd-2.39.orig/sirfflash.c Wed Jan 28 21:53:47 2009 ++++ gpsd-2.39/sirfflash.c Tue Feb 16 21:33:16 2010 +@@ -193,7 +193,7 @@ sirfSetProto(int pfd, struct termios *term, unsigned i sirf[7] = sirf[6] = (unsigned char)proto; /*@i@*/i = htonl(speed); /* borrow "i" to put speed into proper byte order */ diff --git a/scripts/autoconf b/scripts/autoconf new file mode 100755 index 000000000..85f9bd0b4 --- /dev/null +++ b/scripts/autoconf @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +ac262=$(which autoconf-2.62) +ac261=$(which autoconf-2.61) + +if [ ! -z "$ac262" -a -x "$ac262" ];then + if [ -x /usr/bin/autoconf ];then + AUTOCONF_VERSION=2.62 /usr/bin/autoconf "$@" + else + AUTOCONF_VERSION=2.62 /usr/local/bin/autoconf "$@" + fi +elif [ ! -z "$ac261" -a -x "$ac261" ];then + if [ -x /usr/bin/autoconf ];then + AUTOCONF_VERSION=2.61 /usr/bin/autoconf "$@" + else + AUTOCONF_VERSION=2.61 /usr/local/bin/autoconf "$@" + fi +fi diff --git a/scripts/autoreconf b/scripts/autoreconf new file mode 100755 index 000000000..ce2aa1120 --- /dev/null +++ b/scripts/autoreconf @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +ac262=$(which autoreconf-2.62) +ac261=$(which autoreconf-2.61) + +if [ ! -z "$ac262" -a -x "$ac262" ];then + if [ -x /usr/bin/autoreconf ];then + env \ + AUTOMAKE_VERSION=1.9 \ + AUTOCONF_VERSION=2.62 \ + /usr/bin/autoreconf "$@" + else + env \ + AUTOMAKE_VERSION=1.9 \ + AUTOCONF_VERSION=2.62 \ + /usr/local/bin/autoreconf "$@" + fi +elif [ ! -z "$ac261" -a -x "$ac261" ];then + if [ -x /usr/bin/autoreconf ];then + env \ + AUTOMAKE_VERSION=1.9 \ + AUTOCONF_VERSION=2.61 \ + /usr/bin/autoreconf "$@" + else + env \ + AUTOMAKE_VERSION=1.9 \ + AUTOCONF_VERSION=2.61 \ + /usr/local/bin/autoreconf "$@" + fi +fi diff --git a/target/Config.in b/target/Config.in index 61d602e4b..b489d52f1 100644 --- a/target/Config.in +++ b/target/Config.in @@ -32,6 +32,9 @@ config ADK_TARGET_WITH_CARDBUS config ADK_TARGET_WITH_WATCHDOG bool +config ADK_TARGET_WITH_DSL + bool + config ADK_TOOLCHAIN_ONLY bool @@ -228,6 +231,10 @@ config ADK_LINUX_ARM_FOXBOARD select ADK_EABI select ADK_KERNEL_NLS select ADK_PACKAGE_KMOD_USB_CONTROLLER + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NET_PCI + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_MII select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_WATCHDOG help @@ -293,6 +300,7 @@ config ADK_LINUX_MIPS_AG241 select ADK_PACKAGE_KMOD_SANGAM_ATM select ADK_KPACKAGE_KMOD_ATM_BR2684 select ADK_PACKAGE_BR2684CTL + select ADK_TARGET_WITH_DSL select ADK_ag241 help Linksys AG241 DSL router. diff --git a/target/foxg20/Makefile b/target/foxg20/Makefile index 8d302a15a..1d07f9db6 100644 --- a/target/foxg20/Makefile +++ b/target/foxg20/Makefile @@ -8,9 +8,15 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk kernel-install: + gzip -v9 < $(LINUX_DIR)/arch/arm/boot/Image > ${BUILD_DIR}/Image.gz + mkimage -A arm -O linux -T kernel -C gzip \ + -a 0x20008000 -e 0x20008000 -d ${BUILD_DIR}/Image.gz \ + -n foxg20 $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel ifeq ($(FS),nfsroot) imageinstall: ${BIN_DIR}/${ROOTFSUSERTARBALL} @echo + @echo 'Type dhcp via u-boot prompt to load kernel' + @echo 'After that type bootm to load the kernel' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/foxg20/kernel.config b/target/foxg20/kernel.config index b99fb3403..646d1342c 100644 --- a/target/foxg20/kernel.config +++ b/target/foxg20/kernel.config @@ -1,21 +1,25 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32 -# Mon Feb 1 19:21:16 2010 -# -CONFIG_MMU=y -CONFIG_ZONE_DMA=y +# Linux kernel version: 2.6.32.2 +# Wed Feb 17 00:21:32 2010 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y -CONFIG_GENERIC_IOMAP=y -# CONFIG_ARCH_HAS_ILOG2_U32 is not set -# CONFIG_ARCH_HAS_ILOG2_U64 is not set -CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_NO_IOPORT=y -CONFIG_FORCE_MAX_ZONEORDER=6 -CONFIG_CRIS=y -CONFIG_HZ=100 +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_VECTORS_BASE=0xffff0000 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_CONSTRUCTORS=y @@ -27,6 +31,12 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set # CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -51,18 +61,23 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set # CONFIG_NAMESPACES is not set -# CONFIG_BLK_DEV_INITRD is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y -# CONFIG_KALLSYMS is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y -# CONFIG_ELF_CORE is not set +CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -70,7 +85,7 @@ CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y -# CONFIG_AIO is not set +CONFIG_AIO=y # # Kernel Performance Events And Counters @@ -81,12 +96,17 @@ CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set # CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_CLK=y # # GCOV-based kernel profiling # # CONFIG_SLOW_WORK is not set -# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 @@ -116,21 +136,147 @@ CONFIG_DEFAULT_IOSCHED="noop" # CONFIG_FREEZER is not set # -# General setup +# System Type # -CONFIG_BINFMT_ELF=y -# CONFIG_HAVE_AOUT is not set -# CONFIG_BINFMT_MISC is not set -CONFIG_GENERIC_HARDIRQS=y -CONFIG_ETRAX_CMDLINE="console=ttyS0,115200" -CONFIG_ETRAX_WATCHDOG=y -# CONFIG_ETRAX_WATCHDOG_NICE_DOGGY is not set -CONFIG_ETRAX_FAST_TIMER=y -# CONFIG_ETRAX_KMALLOCED_MODULES is not set -# CONFIG_OOM_REBOOT is not set +CONFIG_MMU=y +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +CONFIG_ARCH_AT91=y +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_GEMINI is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_STMP3XXX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_NOMADIK is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_MMP is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_W90X900 is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_S5PC1XX is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_U300 is not set +# CONFIG_ARCH_DAVINCI is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_BCMRING is not set + +# +# Atmel AT91 System-on-Chip +# +# CONFIG_ARCH_AT91RM9200 is not set +# CONFIG_ARCH_AT91SAM9260 is not set +# CONFIG_ARCH_AT91SAM9261 is not set +# CONFIG_ARCH_AT91SAM9G10 is not set +# CONFIG_ARCH_AT91SAM9263 is not set +# CONFIG_ARCH_AT91SAM9RL is not set +CONFIG_ARCH_AT91SAM9G20=y +# CONFIG_ARCH_AT91SAM9G45 is not set +# CONFIG_ARCH_AT91CAP9 is not set +# CONFIG_ARCH_AT91X40 is not set +CONFIG_AT91_PMC_UNIT=y + +# +# AT91SAM9G20 Board Type +# +# CONFIG_MACH_AT91SAM9G20EK is not set +# CONFIG_MACH_AT91SAM9G20EK_2MMC is not set +# CONFIG_MACH_CPU9G20 is not set +CONFIG_MACH_FOXG20=y + +# +# AT91 Board Options +# +# CONFIG_MTD_AT91_DATAFLASH_CARD is not set +# CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set + +# +# AT91 Feature Selections +# +CONFIG_AT91_PROGRAMMABLE_CLOCKS=y +CONFIG_AT91_TIMER_HZ=100 +# CONFIG_AT91_EARLY_DBGU is not set +CONFIG_AT91_EARLY_USART0=y +# CONFIG_AT91_EARLY_USART1 is not set +# CONFIG_AT91_EARLY_USART2 is not set +# CONFIG_AT91_EARLY_USART3 is not set +# CONFIG_AT91_EARLY_USART4 is not set +# CONFIG_AT91_EARLY_USART5 is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5TJ=y +CONFIG_CPU_PABRT_LEGACY=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set +CONFIG_ARM_L1_CACHE_SHIFT=5 + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set +CONFIG_HZ=100 +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_HIGHMEM is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y # CONFIG_DISCONTIGMEM_MANUAL is not set @@ -138,67 +284,58 @@ CONFIG_FLATMEM_MANUAL=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_SPLIT_PTLOCK_CPUS=4096 # CONFIG_PHYS_ADDR_T_64BIT is not set -CONFIG_ZONE_DMA_FLAG=1 -CONFIG_BOUNCE=y +CONFIG_ZONE_DMA_FLAG=0 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_LEDS=y +CONFIG_LEDS_CPU=y +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_UACCESS_WITH_MEMCPY is not set # -# Hardware setup -# -# CONFIG_ETRAX100LX is not set -CONFIG_ETRAX100LX_V2=y -# CONFIG_SVINTO_SIM is not set -# CONFIG_ETRAXFS is not set -# CONFIG_CRIS_MACH_ARTPEC3 is not set -# CONFIG_ETRAX_VCS_SIM is not set -CONFIG_ETRAX_ARCH_V10=y -# CONFIG_ETRAX_ARCH_V32 is not set -CONFIG_ETRAX_DRAM_SIZE=16 -CONFIG_ETRAX_MTD_SIZE=0x00800000 -CONFIG_ETRAX_FLASH_BUSWIDTH=2 -CONFIG_ETRAX_NANDFLASH_BUSWIDTH=1 -CONFIG_ETRAX_FLASH1_SIZE=0 -# CONFIG_ETRAX_DEBUG_PORT0 is not set -# CONFIG_ETRAX_DEBUG_PORT1 is not set -# CONFIG_ETRAX_DEBUG_PORT2 is not set -# CONFIG_ETRAX_DEBUG_PORT3 is not set -CONFIG_ETRAX_DEBUG_PORT_NULL=y - -# -# CRIS v10 options -# -CONFIG_ETRAX_DRAM_VIRTUAL_BASE=c0000000 -CONFIG_ETRAX_PA_LEDS=y -# CONFIG_ETRAX_PB_LEDS is not set -# CONFIG_ETRAX_CSP0_LEDS is not set -# CONFIG_ETRAX_NO_LEDS is not set -CONFIG_ETRAX_LED1G=2 -CONFIG_ETRAX_LED1R=2 -CONFIG_ETRAX_LED2G=3 -CONFIG_ETRAX_LED2R=3 -CONFIG_ETRAX_LED3G=2 -CONFIG_ETRAX_LED3R=2 -CONFIG_ETRAX_RESCUE_SER0=y -# CONFIG_ETRAX_RESCUE_SER1 is not set -# CONFIG_ETRAX_RESCUE_SER2 is not set -# CONFIG_ETRAX_RESCUE_SER3 is not set -CONFIG_ETRAX_DEF_R_WAITSTATES=0x95f8 -CONFIG_ETRAX_DEF_R_BUS_CONFIG=0x4 -CONFIG_ETRAX_SDRAM=y -CONFIG_ETRAX_DEF_R_SDRAM_CONFIG=0x09603737 -CONFIG_ETRAX_DEF_R_SDRAM_TIMING=0x80608002 -CONFIG_ETRAX_DEF_R_PORT_PA_DIR=0x1c -CONFIG_ETRAX_DEF_R_PORT_PA_DATA=0xf0 -CONFIG_ETRAX_DEF_R_PORT_PB_CONFIG=0x00 -CONFIG_ETRAX_DEF_R_PORT_PB_DIR=0xce -CONFIG_ETRAX_DEF_R_PORT_PB_DATA=0x03 -# CONFIG_ETRAX_SOFT_SHUTDOWN is not set +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set + +# +# CPU Power Management +# +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +# CONFIG_VFP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +# CONFIG_PM is not set +CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y # @@ -226,7 +363,8 @@ CONFIG_IP_FIB_HASH=y # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" @@ -270,56 +408,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_NET_9P is not set # -# Drivers for built-in interfaces -# -CONFIG_ETRAX_ETHERNET=y -CONFIG_ETRAX_SERIAL=y -# CONFIG_ETRAX_SERIAL_FAST_TIMER is not set -# CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST is not set |