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

16 files changed, 273 insertions, 71 deletions

diff --git a/TODO b/TODO
index 41f72a999..bada0fdbd 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,6 @@
+- fix ARM OABI support
+- fix watchdog for alix1c (mfgpt timers problem)
 - convert global ipv6 to flavours
 - add support for brcm 2.6
 - macos x build
 - help text for config/ needs adoption
-- fix watchdog for alix1c (mfgpt timers problem)
diff --git a/mk/modules.mk b/mk/modules.mk
index 23f76df11..54c1deda0 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1530,3 +1530,23 @@ $(eval $(call KMOD_template,PARPORT,parport,\
 $(eval $(call KMOD_template,PLIP,plip,\
 	$(MODULES_DIR)/kernel/drivers/net/plip \
 ,51))
+
+#
+# Profiling
+#
+$(eval $(call KMOD_template,OPROFILE,oprofile,\
+	$(MODULES_DIR)/kernel/arch/x86/oprofile/oprofile \
+,10))
+
+#
+# I2C
+#
+$(eval $(call KMOD_template,I2C,i2c,\
+	$(MODULES_DIR)/kernel/drivers/i2c/i2c-core \
+	$(MODULES_DIR)/kernel/drivers/i2c/i2c-dev \
+,20))
+
+$(eval $(call KMOD_template,SCx200_ACB,scx200-acb,\
+	$(MODULES_DIR)/kernel/drivers/i2c/busses/scx200_acb \
+,25))
+
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 37b2c82ad..cd33d5ac7 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -6,11 +6,18 @@ include ${TOPDIR}/toolchain/binutils/Makefile.inc
 
 PKG_DESCR:=		binary utilities (nm, objdump, as, ..)
 PKG_SECTION:=		lang
+
+# subpackage
+PKG_NAME_LIBBFD:=	libbfd
+PKG_DESCR_LIBBFD:=	bfd library
+PKG_SECTION_LIBBFD:=	libs
+
 PKG_HOST_DEPENDS:=      !cygwin
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBBFD,${PKG_NAME_LIBBFD},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LIBBFD},${PKG_SECTION_LIBBFD}))
 
 TCFLAGS+=		-fPIC
 CONFIGURE_ARGS+=	--disable-werror \
@@ -18,18 +25,12 @@ CONFIGURE_ARGS+=	--disable-werror \
 			--target=$(REAL_GNU_TARGET_NAME)
 
 post-install:
-	${INSTALL_DIR} ${IDIR_BINUTILS}/usr/lib
-	$(CP) ${WRKINST}/usr/lib/*.so ${IDIR_BINUTILS}/usr/lib
+	${INSTALL_DIR} ${IDIR_LIBBFD}/usr/lib
+	$(CP) ${WRKINST}/usr/lib/*.so ${IDIR_LIBBFD}/usr/lib
 	${INSTALL_DIR} ${IDIR_BINUTILS}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/nm ${IDIR_BINUTILS}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/size ${IDIR_BINUTILS}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/ar ${IDIR_BINUTILS}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/as ${IDIR_BINUTILS}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/ld ${IDIR_BINUTILS}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/strip ${IDIR_BINUTILS}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/objdump ${IDIR_BINUTILS}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/objcopy ${IDIR_BINUTILS}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/ranlib ${IDIR_BINUTILS}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/readelf ${IDIR_BINUTILS}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/{ar,as,ld,strip,size,nm} \
+		${IDIR_BINUTILS}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/{objcopy,ranlib,readelf,objdump} \
+		 ${IDIR_BINUTILS}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/busybox/config/console-tools/Config.in b/package/busybox/config/console-tools/Config.in
index 671cc32a2..7b1d3ac2e 100644
--- a/package/busybox/config/console-tools/Config.in
+++ b/package/busybox/config/console-tools/Config.in
@@ -12,6 +12,12 @@ config BUSYBOX_CHVT
 	  This program is used to change to another terminal.
 	  Example: chvt 4 (change to terminal /dev/tty4)
 
+config BUSYBOX_FGCONSOLE
+	bool "fgconsole"
+	default n
+	help
+	  This program prints active (foreground) console number.
+
 config BUSYBOX_CLEAR
 	bool "clear"
 	default y
diff --git a/package/busybox/config/init/Config.in b/package/busybox/config/init/Config.in
index 9ca5b2885..cabe6b046 100644
--- a/package/busybox/config/init/Config.in
+++ b/package/busybox/config/init/Config.in
@@ -5,6 +5,45 @@
 
 menu "Init Utilities"
 
+config BUSYBOX_BOOTCHARTD
+	bool "bootchartd"
+	default n
+	help
+	  bootchartd is commonly used to profile the boot process
+	  for the purpose of speeding it up. In this case, it is started
+	  by the kernel as the init process. This is configured by adding
+	  the init=/sbin/bootchartd option to the kernel command line.
+
+	  It can also be used to monitor the resource usage of a specific
+	  application or the running system in general. In this case,
+	  bootchartd is started interactively by running bootchartd start
+	  and stopped using bootchartd stop.
+
+config BUSYBOX_FEATURE_BOOTCHARTD_BLOATED_HEADER
+	bool "bootchartd"
+	default y
+	depends on BOOTCHARTD
+	help
+	  Create extended header file compatible with "big" bootchartd.
+	  "Big" bootchartd is a shell script and it dumps some
+	  "convenient" info int the header, such as:
+	    title = Boot chart for `hostname` (`date`)
+	    system.uname = `uname -srvm`
+	    system.release = `cat /etc/DISTRO-release`
+	    system.cpu = `grep '^model name' /proc/cpuinfo | head -1` ($cpucount)
+	    system.kernel.options = `cat /proc/cmdline`
+	  This data is not mandatory for bootchart graph generation,
+	  and is considered bloat. Nevertheless, this option
+	  makes bootchartd applet to dump a subset of it.
+
+config BUSYBOX_FEATURE_BOOTCHARTD_CONFIG_FILE
+	bool "bootchartd"
+	default y
+	depends on BOOTCHARTD
+	help
+	  Enable reading and parsing of $PWD/bootchartd.conf
+	  and /etc/bootchartd.conf files.
+
 config BUSYBOX_INIT
 	bool "init"
 	default y
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index d24a02843..6fe8f7d33 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -191,6 +191,12 @@ config BUSYBOX_FINDFS
 	  WARNING:
 	  With all submodules selected, it will add ~8k to busybox.
 
+config BUSYBOX_FLOCK
+	bool "flock"
+	default n
+	help
+	  Manage locks from shell scripts
+
 config BUSYBOX_FREERAMDISK
 	bool "freeramdisk"
 	default n
diff --git a/package/exmap/Makefile b/package/exmap/Makefile
index e34a8a070..acb6feb88 100644
--- a/package/exmap/Makefile
+++ b/package/exmap/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		55aec784e214037e61400287a55b5426
 PKG_DESCR:=		memory analysing client tool
 PKG_SECTION:=		debug
-PKG_DEPENDS:=		kmod-exmap libreadline glib
+PKG_DEPENDS:=		exmap-kmod libreadline glib
 PKG_BUILDDEP+=		glib readline
 PKG_SITES:=		http://labs.o-hand.com/sources/exmap-console/
 
@@ -18,15 +18,15 @@ WRKDIST=		${WRKDIR}/${PKG_NAME}-console-${PKG_VERSION}
 
 PKG_DESCR_EXMAPD:=	memory analysing daemon
 PKG_DESCR_EXMAPSERVER:=	memory analysing server
-PKG_DESCR_KMOD_EXMAP:=	memory analysing kernel module
-PKG_SECTION_KMOD_EXMAP:=kernel
+PKG_DESCR_EXMAP_KMOD:=	memory analysing kernel module
+PKG_SECTION_EXMAP_KMOD:=kernel
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_EXMAPD},${PKG_SECTION}))
 $(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_EXMAPSERVER},${PKG_SECTION}))
-$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR_KMOD_EXMAP},${PKG_SECTION_KMOD_EXMAP}))
+$(eval $(call PKG_template,EXMAP_KMOD,exmap-kmod,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR_EXMAP_KMOD},${PKG_SECTION_EXMAP_KMOD}))
 
 CONFIGURE_ARGS+=	--disable-doc
 CONFIGURE_ENV+=		LIBS="-lncurses"
@@ -39,11 +39,11 @@ pre-build:
 	$(MAKE) -C ${WRKBUILD}/kernel
 
 post-install:
-	${INSTALL_DIR} ${IDIR_KMOD_EXMAP}/etc/modules.d/
-	echo "exmap" > ${IDIR_KMOD_EXMAP}/etc/modules.d/90-exmap
-	${INSTALL_DIR} ${IDIR_KMOD_EXMAP}/lib/modules/${KERNEL_VERSION}/
+	${INSTALL_DIR} ${IDIR_EXMAP_KMOD}/etc/modules.d/
+	echo "exmap" > ${IDIR_EXMAP_KMOD}/etc/modules.d/90-exmap
+	${INSTALL_DIR} ${IDIR_EXMAP_KMOD}/lib/modules/${KERNEL_VERSION}/
 	${INSTALL_DATA} ${WRKBUILD}/kernel/exmap.ko \
-		${IDIR_KMOD_EXMAP}/lib/modules/${KERNEL_VERSION}
+		${IDIR_EXMAP_KMOD}/lib/modules/${KERNEL_VERSION}
 	${INSTALL_DIR} ${IDIR_EXMAP}/usr/sbin
 	${INSTALL_BIN} ${WRKBUILD}/src/exmap ${IDIR_EXMAP}/usr/sbin
 	${INSTALL_DIR} ${IDIR_EXMAPD}/usr/sbin
diff --git a/package/i2c-tools/Makefile b/package/i2c-tools/Makefile
new file mode 100644
index 000000000..2e59b09ff
--- /dev/null
+++ b/package/i2c-tools/Makefile
@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		i2c-tools
+PKG_VERSION:=		3.0.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		b546345ac19db56719dea6b8199f11e0
+PKG_DESCR:=		I2C tools for Linux
+PKG_SECTION:=		misc
+PKG_URL:=		http://www.lm-sensors.org/wiki/I2CTools
+PKG_SITES:=		http://dl.lm-sensors.org/i2c-tools/releases/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,I2C_TOOLS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_I2C_TOOLS)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/i2c* \
+		$(IDIR_I2C_TOOLS)/usr/sbin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/i2c-tools/patches/patch-Makefile b/package/i2c-tools/patches/patch-Makefile
new file mode 100644
index 000000000..6997b4de1
--- /dev/null
+++ b/package/i2c-tools/patches/patch-Makefile
@@ -0,0 +1,24 @@
+--- i2c-tools-3.0.2.orig/Makefile	2007-11-01 18:54:57.000000000 +0100
++++ i2c-tools-3.0.2/Makefile	2010-07-13 21:44:41.807074577 +0200
+@@ -4,8 +4,8 @@
+ #
+ # Licensed under the GNU General Public License.
+ 
+-DESTDIR	=
+-prefix	= /usr/local
++DESTDIR	?=
++prefix	= /usr
+ bindir	= $(prefix)/bin
+ sbindir	= $(prefix)/sbin
+ mandir	= $(prefix)/share/man
+@@ -18,8 +18,8 @@ INSTALL_DIR	:= $(INSTALL) -m 755 -d
+ INSTALL_PROGRAM	:= $(INSTALL) -m 755
+ RM		:= rm -f
+ 
+-CC	:= gcc
+-CFLAGS	:= -Wall
++CC	?= gcc
++CFLAGS	?= -Wall
+ 
+ CFLAGS	+= -O2
+ # When debugging, use the following instead
diff --git a/package/lua/Makefile b/package/lua/Makefile
index c21483754..59e50bbd8 100644
--- a/package/lua/Makefile
+++ b/package/lua/Makefile
@@ -5,44 +5,35 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		lua
 PKG_VERSION:=		5.1.4
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		d0870f2de55d59c1c8419f36e8fac150
-PKG_DESCR:=		LUA programming language
+PKG_DESCR:=		LUA programming language interpreter
 PKG_SECTION:=		lang
-PKG_URL:=		http://www.lua.org
-PKG_SITES:=		http://www.lua.org/ftp/ \
-			http://ftp.gwdg.de/pub/languages/lua/ \
-			http://mirrors.dotsrc.org/lua/ \
-			http://www.tecgraf.puc-rio.br/lua/ftp/
+PKG_BUILDDEP:=		readline
+PKG_DEPENDS:=		libreadline
+PKG_MULTI:=		1
+PKG_URL:=		http://www.lua.org/
+PKG_SITES:=		http://www.lua.org/ftp/
+
+PKG_DESCR_LUAC:=	LUA bytecode compiler
+PKG_DESCR_LUAEX:=	LUA script examples
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBLUA,liblua,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LUA,lua,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LUAC,luac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LUAC,luac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LUAC},${PKG_SECTION}))
+$(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LUAEX},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-do-build:
-	${MAKE} -C ${WRKBUILD} \
-		CC="${TARGET_CC}" \
-		LD="${TARGET_CROSS}ld" \
-		AR="${TARGET_CROSS}ar rcu" \
-		RANLIB="${TARGET_CROSS}ranlib" \
-		INSTALL_TOP=/usr \
-		CFLAGS="${TCFLAGS} ${TCPPFLAGS} -DLUA_USE_LINUX -fPIC" \
-		MYLDFLAGS="${TLDFLAGS}" \
-		linux
-	${MAKE} -C ${WRKBUILD} \
-		INSTALL_TOP="${WRKINST}/usr" \
-		install
-
-do-install:
-	${INSTALL_DIR} ${IDIR_LIBLUA}/usr/lib
-	${CP} ${WRKINST}/usr/lib/liblua.a ${IDIR_LIBLUA}/usr/lib/
+MAKE_FLAGS+=		CFLAGS="${TCFLAGS} ${TCPPFLAGS} -DLUA_USE_LINUX -fPIC" \
+			MYLDFLAGS="${TLDFLAGS}" \
+			CC="${TARGET_CC}" LD="${TARGET_CROSS}ld" \
+			AR="${TARGET_CROSS}ar rcu" \
+			RANLIB="${TARGET_CROSS}ranlib"
+XAKE_FLAGS+=		INSTALL_TOP="${WRKINST}/usr"
+ALL_TARGET:=		linux
+
+post-install:
 	${INSTALL_DIR} ${IDIR_LUA}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/lua ${IDIR_LUA}/usr/bin/
 	${INSTALL_DIR} ${IDIR_LUAC}/usr/bin
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index bd0a702f3..06e53c8d2 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -15,6 +15,7 @@ PKG_SITES:=		ftp://sources.redhat.com/pub/lvm2/
 
 PKG_DESCR_DM:=		device-mapper utility
 PKG_DESCR_LIBDM:=	device-mapper library
+PKG_SECTION_LIBDM:=	libs
 DISTFILES:=		LVM2.${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/LVM2.${PKG_VERSION}
 
@@ -22,7 +23,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_DM},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIBDM},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIBDM},${PKG_SECTION_LIBDM}))
 
 CONFIGURE_ARGS+=	--with-user="" --with-group="" \
 			--with-optimisation="" \
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile
index c54ef06e1..c7373642e 100644
--- a/package/oprofile/Makefile
+++ b/package/oprofile/Makefile
@@ -4,27 +4,29 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		oprofile
-PKG_VERSION:=		0.9.4
+PKG_VERSION:=		0.9.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		82b059379895cf125261d7d773465915
+PKG_MD5SUM:=		4e407093ac06200185d5a5e6437d7242
 PKG_DESCR:=		system-wide profiles
 PKG_SECTION:=		debug
-PKG_DEPENDS:=		libpopt
-PKG_BUILDDEP+=		popt
+PKG_DEPENDS:=		libpopt kmod-oprofile libbfd libstdcxx
+PKG_BUILDDEP+=		popt binutils
 PKG_URL:=		http://oprofile.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=oprofile/}
 
+CFLINE_OPROFILE:=	select BUSYBOX_EXPR
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,OPROFILE,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TLDFLAGS+=		-shared
-TCFLAGS+=		-fPIC
-TCXXFLAGS+=		-fPIC
-CONFIGURE_ARGS+=	--with-kernel-support --with-linux=${LINUX_DIR}
+CONFIGURE_ARGS+=	--with-kernel-support
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_OPROFILE)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/opcontrol $(IDIR_OPROFILE)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/ophelp $(IDIR_OPROFILE)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/opreport $(IDIR_OPROFILE)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/oprofiled $(IDIR_OPROFILE)/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/oprofile/patches/patch-daemon_liblegacy_opd_kernel_c b/package/oprofile/patches/patch-daemon_liblegacy_opd_kernel_c
new file mode 100644
index 000000000..226522e40
--- /dev/null
+++ b/package/oprofile/patches/patch-daemon_liblegacy_opd_kernel_c
@@ -0,0 +1,34 @@
+--- oprofile-0.9.6.orig/daemon/liblegacy/opd_kernel.c	2009-11-24 16:25:17.000000000 +0100
++++ oprofile-0.9.6/daemon/liblegacy/opd_kernel.c	2010-07-13 18:20:26.727084854 +0200
+@@ -148,6 +148,7 @@ void opd_clear_module_info(void)
+  */
+ static void opd_get_module_info(void)
+ {
++#if 0
+ 	char * line;
+ 	char * cp, * cp2, * cp3;
+ 	FILE * fp;
+@@ -252,6 +253,7 @@ static void opd_get_module_info(void)
+ 	if (line)
+ 		free(line);
+ 	op_close_file(fp);
++#endif
+ }
+  
+ 
+@@ -270,6 +272,7 @@ static void opd_get_module_info(void)
+  */
+ static void opd_drop_module_sample(unsigned long eip)
+ {
++#if 0
+ 	char * module_names;
+ 	char * name;
+ 	size_t size = 1024;
+@@ -307,6 +310,7 @@ static void opd_drop_module_sample(unsig
+ 
+ 	if (module_names)
+ 		free(module_names);
++#endif
+ }
+ 
+ 
diff --git a/package/oprofile/patches/patch-doc_oprofile_1 b/package/oprofile/patches/patch-doc_oprofile_1
new file mode 100644
index 000000000..2694725cd
--- /dev/null
+++ b/package/oprofile/patches/patch-doc_oprofile_1
@@ -0,0 +1,26 @@
+--- oprofile-0.9.6.orig/doc/oprofile.1	2009-11-24 16:26:33.000000000 +0100
++++ oprofile-0.9.6/doc/oprofile.1	2010-07-13 17:55:07.343074887 +0200
+@@ -1,4 +1,4 @@
+-.TH OPROFILE 1 "Tue 24 November 2009" "oprofile 0.9.6"
++.TH OPROFILE 1 "Tue 13 July 2010" "oprofile 0.9.6"
+ .UC 4
+ .SH NAME
+ oprofile \- a system-wide profiler
+@@ -153,7 +153,7 @@ Configuration files
+ .I /root/.oprofile/daemonrc
+ Configuration file for opcontrol
+ .TP
+-.I /usr/local/share/oprofile/
++.I /usr/share/oprofile/
+ Event description files used by OProfile.
+ .TP
+ .I /var/lib/oprofile/samples/oprofiled.log
+@@ -173,7 +173,7 @@ The location of the generated sample fil
+ This man page is current for oprofile-0.9.6.
+ 
+ .SH SEE ALSO
+-.BR /usr/local/share/doc/oprofile/,
++.BR /usr/share/doc/oprofile/,
+ .BR opcontrol(1),
+ .BR opreport(1),
+ .BR opannotate(1),
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index 87fc57052..eedb9a97c 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -1,5 +1,9 @@
 menu "Kernel debugging"
 
+config ADK_KERNEL_PROFILING
+	boolean
+	default n
+
 config ADK_KERNEL_DEBUG_KERNEL
 	boolean
 	default n
@@ -51,4 +55,12 @@ config ADK_KERNEL_DEBUG_WITH_KGDB
 	select ADK_KERNEL_KGDB_SERIAL_CONSOLE
 	select ADK_KERNEL_FRAME_POINTER
 
+config ADK_KPACKAGE_KMOD_OPROFILE
+	tristate
+	prompt "kernel support for oprofile"
+	select ADK_KERNEL_PROFILING
+	default n
+	help
+	 use oprofile package to make use of the kernel support.
+
 endmenu
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index bf62a5df7..987fe40cc 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -8,13 +8,33 @@ config ADK_KERNEL_RFKILL
 	boolean
 	default n
 
-menu "Miscellaneous devices support"
-
 config ADK_KERNEL_WATCHDOG
 	boolean
 	default y if ADK_TARGET_WITH_WATCHDOG
 	default n
 
+config ADK_KERNEL_I2C_CHARDEV
+	boolean
+	default n
+
+menu "Miscellaneous devices support"
+	
+config ADK_KPACKAGE_KMOD_I2C
+	prompt "kmod-i2c.......................... I2C support"
+	tristate
+	select ADK_KERNEL_I2C_CHARDEV
+	default n
+	help
+	  I2C support
+
+config ADK_KPACKAGE_KMOD_SCx200_ACB
+	prompt "kmod-i2c-geode.................... I2C driver for Geode"
+	tristate
+	depends on ADK_KPACKAGE_KMOD_I2C
+	default n
+	help
+	  I2C driver for Geode boards.
+
 config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG
 	prompt "kmod-softdog...................... Software watchdog"
 	tristate
@@ -25,15 +45,6 @@ config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG
 	  from some situations that the hardware watchdog will recover
 	  from. Equally it's a lot cheaper to install.
 
-#config ADK_KPACKAGE_KMOD_WD1100
-#	prompt "kmod-wd1100....................... Soekris net4801 watchdog"
-#	tristate
-#	select ADK_KERNEL_WATCHDOG
-#	default n
-#	help
-#	  Driver for the NatSemi SC1x00 series Watchdog
-#	  found on Soekris net4801 boards
-
 config ADK_KPACKAGE_KMOD_PARPORT
 	prompt "kmod-parport...................... generic parallel port support"
 	tristate