merge of '9390b0535d8e7f267a934a104afb3ec271386743'

     and 'aae8979a7887dab6f01cfba6a590b8e42f51cdc4'

29 files changed, 2087 insertions, 40 deletions

diff --git a/packages/alp/hiker_0.9.1.bb b/packages/alp/hiker_0.9.1.bb
new file mode 100644
index 0000000000..2c6c1d7647
--- /dev/null
+++ b/packages/alp/hiker_0.9.1.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Hiker Application Framework™"
+LICENSE = "MPL"
+
+DEPENDS = "gtk+ sqlite3 gnet dbus-glib openssl"
+
+SRC_URI = "http://www.access-company.com/downloads/${P}.tar.gz"
+
+inherit autotools pkgconfig lib_package
+
+export CFLAGS += "-DALP_BUILD=ALP_BUILD_DEBUG"
+export CXXFLAGS += "-DALP_BUILD=ALP_BUILD_DEBUG"
+
+do_configure_prepend() {
+	sed -i s:unittest::g utils/Makefile.am
+}
+
+PACKAGES =+ "libhiker libsqlfs"
+FILES_libhiker += "${libdir}/libhiker*.so.*"
+FILES_libsqlfs += "${libdir}/libsql*.so.*"
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index 495329457c..35c8f5d3d3 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -9,12 +9,20 @@
 
 DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
-
+RRECOMMENDS_alsa-state = "alsa-states"
 PV = "0.0.4"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "file://asound.state \
-	   file://alsa-state"
+           file://alsa-state "
+
+SRC_URI_append_fic-gta01 = " \
+  file://capturehandset.state \
+  file://captureheadset.state \
+  file://gsmbluetooth.state \
+  file://gsmhandset.state \
+  file://gsmheadset.state \
+  file://stereoout.state"
 
 inherit update-rc.d
 
@@ -22,13 +30,17 @@ INITSCRIPT_NAME = "alsa-state"
 INITSCRIPT_PARAMS = "defaults 10"
 
 do_install() {
-	install -d ${D}${sysconfdir}/init.d
+    install -d ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d
 	
-	install -m 0644 ${WORKDIR}/asound.state ${D}${sysconfdir}
-	install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d
+	install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir}
 }
 
-FILES_${PN} = "${sysconfdir}/*"
+PACKAGES += "alsa-states"
+FILES_${PN} = "${sysconfdir}/init.d"
+FILES_alsa-states = "${sysconfdir}/*.state"
+PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_alsa-states = "${MACHINE}"
 
 pkg_postinst_${PN}() {
 	if test -z "$D"
diff --git a/packages/alsa/alsa-states/fic-gta01/capturehandset.state b/packages/alsa/alsa-state/fic-gta01/capturehandset.state
index 4a55f09035..4a55f09035 100644
--- a/packages/alsa/alsa-states/fic-gta01/capturehandset.state
+++ b/packages/alsa/alsa-state/fic-gta01/capturehandset.state
diff --git a/packages/alsa/alsa-states/fic-gta01/captureheadset.state b/packages/alsa/alsa-state/fic-gta01/captureheadset.state
index 3a27323b25..3a27323b25 100644
--- a/packages/alsa/alsa-states/fic-gta01/captureheadset.state
+++ b/packages/alsa/alsa-state/fic-gta01/captureheadset.state
diff --git a/packages/alsa/alsa-states/fic-gta01/gsmbluetooth.state b/packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state
index a0c0c95ea6..a0c0c95ea6 100644
--- a/packages/alsa/alsa-states/fic-gta01/gsmbluetooth.state
+++ b/packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state
diff --git a/packages/alsa/alsa-states/fic-gta01/gsmhandset.state b/packages/alsa/alsa-state/fic-gta01/gsmhandset.state
index a83141fcbb..a83141fcbb 100644
--- a/packages/alsa/alsa-states/fic-gta01/gsmhandset.state
+++ b/packages/alsa/alsa-state/fic-gta01/gsmhandset.state
diff --git a/packages/alsa/alsa-states/fic-gta01/gsmheadset.state b/packages/alsa/alsa-state/fic-gta01/gsmheadset.state
index e732b77db8..e732b77db8 100644
--- a/packages/alsa/alsa-states/fic-gta01/gsmheadset.state
+++ b/packages/alsa/alsa-state/fic-gta01/gsmheadset.state
diff --git a/packages/alsa/alsa-states/fic-gta01/stereoout.state b/packages/alsa/alsa-state/fic-gta01/stereoout.state
index c27b78bb27..c27b78bb27 100644
--- a/packages/alsa/alsa-states/fic-gta01/stereoout.state
+++ b/packages/alsa/alsa-state/fic-gta01/stereoout.state
diff --git a/packages/alsa/alsa-states/fic-gta01/.mtn2git_empty b/packages/alsa/alsa-states/fic-gta01/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/alsa/alsa-states/fic-gta01/.mtn2git_empty
+++ /dev/null
diff --git a/packages/alsa/alsa-states_0.0.0.bb b/packages/alsa/alsa-states_0.0.0.bb
deleted file mode 100644
index 28c40b3fea..0000000000
--- a/packages/alsa/alsa-states_0.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Machine specific alsa state files"
-SECTION = "base"
-LICENSE = "MIT"
-PR = "r0"
-
-SRC_URI = "file://*.state"
-
-do_install () {
-    install -d ${D}${sysconfdir}/alsa
-    install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir}/alsa
-}
-
-FILES_${PN} += "${sysconfdir}/alsa/*"
diff --git a/packages/efl1/ecore-native_0.9.9.038.bb b/packages/efl1/ecore-native_0.9.9.038.bb
index 7b3212dc1a..8026adb49c 100644
--- a/packages/efl1/ecore-native_0.9.9.038.bb
+++ b/packages/efl1/ecore-native_0.9.9.038.bb
@@ -1,11 +1,12 @@
 require ecore.inc
 inherit native
 DEPENDS = "eet-native evas-native"
+PR = "r1"
 
 EXTRA_OECONF = "\
                 --enable-ecore-txt \
                 --disable-ecore-x-xcb \
-                --enable-ecore-x \
+                --disable-ecore-x \
                 --enable-ecore-job \
                 --enable-ecore-directfb \
                 --enable-ecore-fb \
diff --git a/packages/evince/evince_0.9.2.bb b/packages/evince/evince_0.9.2.bb
new file mode 100644
index 0000000000..64e2e41275
--- /dev/null
+++ b/packages/evince/evince_0.9.2.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu."
+LICENSE = "GPL"
+SECTION = "x11/office"
+DEPENDS = "tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
+RDEPENDS = "espgs "
+RRECOMMENDS = "gnome-vfs-plugin-file"
+PR = "r1"
+
+inherit gnome pkgconfig gtk-icon-cache
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.9/${PN}-${PV}.tar.bz2 \
+           file://no-icon-theme.diff;patch=1;pnum=0 \
+           file://no-help-dir.patch;patch=1"
+
+EXTRA_OECONF = "--without-libgnome --disable-thumbnailer --disable-scrollkeeper"
+
diff --git a/packages/file/file-native_4.20.bb b/packages/file/file-native_4.21.bb
index b797cff8ad..59535dd518 100644
--- a/packages/file/file-native_4.20.bb
+++ b/packages/file/file-native_4.21.bb
@@ -1,7 +1,5 @@
 require file_${PV}.bb
 inherit native
-
-# avoid dependency loop
 DEPENDS = ""
 PR = "r0"
 
diff --git a/packages/file/file_4.20.bb b/packages/file/file_4.21.bb
index 2b37d2515c..758f7f36fa 100644
--- a/packages/file/file_4.20.bb
+++ b/packages/file/file_4.21.bb
@@ -4,7 +4,7 @@ SECTION = "console/utils"
 LICENSE = "BSD-ADV"
 DEPENDS = "file-native"
 
-SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz" 
+SRC_URI = "ftp://ftp.fi.debian.org/pub/gentoo/distfiles/file-${PV}.tar.gz"
 S = "${WORKDIR}/file-${PV}"
 
 inherit autotools
diff --git a/packages/gnet/gnet_svn.bb b/packages/gnet/gnet_svn.bb
new file mode 100644
index 0000000000..c09b7f8b9c
--- /dev/null
+++ b/packages/gnet/gnet_svn.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "GNet is a simple network library. It is written in C, object-oriented, and built upon GLib."
+LICENSE = "LGPL"
+SECTION = "libs/network"
+HOMEPAGE = "http://www.gnetlibrary.org"
+DEPENDS = "glib-2.0"
+PV = "2.0.7+svn${SRCDATE}"
+
+SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk \
+           file://buildfix.patch;patch=1"
+
+S = "${WORKDIR}/trunk"
+
+EXTRA_OECONF =	"--disable-pthreads"
+
+FILES_${PN}-dev += "${libdir}/gnet-2.0"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/gpephone/gpe-session-scripts-phone/phonesession b/packages/gpephone/gpe-session-scripts-phone/phonesession
index 6f6d9d59ae..2dacc4c4c9 100755
--- a/packages/gpephone/gpe-session-scripts-phone/phonesession
+++ b/packages/gpephone/gpe-session-scripts-phone/phonesession
@@ -31,7 +31,12 @@ export	TINYMAIL_CACHE_DIR=$APP_PATH/share/tinymail.cache
 export	CAL_RES_PATH=$APP_PATH/share/res
 
 # For GTK input engine
-export PTIM_PATH=/usr/lib/gtk-2.0/2.4.0/immodules/ptim
+if [ -d /usr/lib/gtk-2.0/2.10.0 ]; then
+	export PTIM_PATH=/usr/lib/gtk-2.0/2.10.0/immodules/ptim
+else
+	export PTIM_PATH=/usr/lib/gtk-2.0/2.4.0/immodules/ptim
+fi
+
 export PTIM_PIXMAPS_PATH=$PTIM_PATH/pixmaps
 export PTIM_CONFIG_FILE=$PTIM_PATH/imconfig 
 export PTIM_HELPER_PATH=$PTIM_PATH/helper
@@ -43,6 +48,9 @@ gpe-phonepanel&
 gpe-applauncher&
 matchbox-window-manager -use_titlebar no&
 
+# start device support daemon
+machined
+
 # Start E-Sound Server
 esd -nobeeps -as 2&
 esdplay /mnt/sd/sounds/startup.wav
diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
index 00031ac546..730a549aef 100644
--- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb
+++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
@@ -14,7 +14,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \
 	   file://disable-composite.xsettings \
            file://standard-apps.patch;patch=1"
 
-PR = "r6"
+PR = "r7"
 
 S = "${WORKDIR}/gpe-session-scripts-${PV}"
 
diff --git a/packages/gpephone/machined_svn.bb b/packages/gpephone/machined_svn.bb
new file mode 100644
index 0000000000..549071fdb0
--- /dev/null
+++ b/packages/gpephone/machined_svn.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Device abstraction and support daemon"
+SECTION = "gpephone"
+PRIORITY = "required"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0"
+PV = "0.1+svn-${SRCDATE}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=${PN}"
+
+S = "${WORKDIR}/${PN}"
+
+#FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps"
+
diff --git a/packages/gpephone/ptim-engine_svn.bb b/packages/gpephone/ptim-engine_svn.bb
index 286a1edf8d..a2a38a0e2e 100644
--- a/packages/gpephone/ptim-engine_svn.bb
+++ b/packages/gpephone/ptim-engine_svn.bb
@@ -4,13 +4,13 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
 PV = "0.1+svn-${SRCDATE}"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
 inherit gpephone pkgconfig autotools
 
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imengine \
-           file://gtkmodule-location.patch;patch=1;pnum=0"
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imengine"
 
 S = "${WORKDIR}/imengine"
 
diff --git a/packages/gpephone/ptim-helper_svn.bb b/packages/gpephone/ptim-helper_svn.bb
index 0d0ac653b5..4aa308ccbf 100644
--- a/packages/gpephone/ptim-helper_svn.bb
+++ b/packages/gpephone/ptim-helper_svn.bb
@@ -4,13 +4,13 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
 PV = "0.1+svn-${SRCDATE}"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
 inherit gpephone pkgconfig autotools
 
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imhelper \
-           file://gtkmodule-location.patch;patch=1;pnum=0"
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imhelper"
 
 S = "${WORKDIR}/imhelper"
 
diff --git a/packages/alsa/alsa-states/.mtn2git_empty b/packages/libsigc++-2.0/libsigc++-2.0-2.0.17/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/alsa/alsa-states/.mtn2git_empty
+++ b/packages/libsigc++-2.0/libsigc++-2.0-2.0.17/.mtn2git_empty
diff --git a/packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch b/packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch
new file mode 100644
index 0000000000..ba17293733
--- /dev/null
+++ b/packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch
@@ -0,0 +1,15 @@
+Index: libsigc++-2.0.17/configure.ac
+===================================================================
+--- libsigc++-2.0.17.orig/configure.ac	2005-12-20 08:41:21.000000000 +0000
++++ libsigc++-2.0.17/configure.ac	2007-07-11 11:33:55.000000000 +0100
+@@ -105,6 +105,10 @@
+ SIGC_CXX_HAS_NAMESPACE_STD()
+ SIGC_CXX_HAS_SUN_REVERSE_ITERATOR()
+ 
++dnl FIXME Define this here since it does not seem to be defined elsewhere
++AC_DEFINE(SIGC_API, [], [Empty specifier])
++AC_DEFINE(SIGC_USING_STD(Symbol), [], [Empty specifier])
++
+ if test "X$config_error" = "Xyes" ; then
+   AC_ERROR(
+ [One or more of the required compiler features is missing.
diff --git a/packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb b/packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb
new file mode 100644
index 0000000000..cc122993bc
--- /dev/null
+++ b/packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb
@@ -0,0 +1,45 @@
+DESCRIPTION = "A library for loose coupling of C++ method calls"
+SECTION = "libs"
+PRIORITY = "optional"
+PR = "r1"
+LICENSE = "GPL LGPL"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-${PV}.tar.gz \
+           file://define_sigc_api.patch;patch=1 "
+S = "${WORKDIR}/libsigc++-${PV}"
+
+inherit autotools pkgconfig
+
+FILES_${PN}-dev += "${libdir}/sigc++-*/"
+
+# acpaths = ""
+
+do_stage() {
+	install -d ${STAGING_LIBDIR}/sigc++-2.0/include
+	install -m 0644 sigc++config.h ${STAGING_LIBDIR}/sigc++-2.0/include/
+	oe_libinstall -so -C sigc++ libsigc-2.0 ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++
+	for f in sigc++/*.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/
+	done
+	install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++/functors
+	for f in sigc++/functors/*.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/functors
+	done
+
+	install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors
+	for f in sigc++/adaptors/*.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors
+	done
+	install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors/lambda
+	for f in sigc++/adaptors/lambda/*.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors/lambda
+	done
+
+
+}
+
diff --git a/packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01 b/packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01
new file mode 100644
index 0000000000..90fc136986
--- /dev/null
+++ b/packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01
@@ -0,0 +1,1857 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.21.3
+# Mon Jun 11 18:32:32 2007
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_MMU=y
+CONFIG_NO_IOPORT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION="-moko10"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS 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
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=m
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_AS is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+
+#
+# System Type
+#
+# 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 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+CONFIG_ARCH_S3C2410=y
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+CONFIG_PLAT_S3C24XX=y
+CONFIG_CPU_S3C244X=y
+# CONFIG_S3C2410_BOOT_WATCHDOG is not set
+CONFIG_S3C2410_BOOT_ERROR_RESET=y
+CONFIG_S3C2410_PM_DEBUG=y
+# CONFIG_S3C2410_PM_CHECK is not set
+CONFIG_S3C2410_LOWLEVEL_UART_PORT=0
+CONFIG_S3C2410_DMA=y
+# CONFIG_S3C2410_DMA_DEBUG is not set
+CONFIG_MACH_SMDK=y
+
+#
+# S3C2400 Machines
+#
+CONFIG_CPU_S3C2410=y
+CONFIG_CPU_S3C2410_DMA=y
+CONFIG_S3C2410_PM=y
+CONFIG_S3C2410_GPIO=y
+CONFIG_S3C2410_CLOCK=y
+
+#
+# S3C2410 Machines
+#
+# CONFIG_ARCH_SMDK2410 is not set
+# CONFIG_ARCH_H1940 is not set
+# CONFIG_MACH_N30 is not set
+# CONFIG_ARCH_BAST is not set
+# CONFIG_MACH_OTOM is not set
+# CONFIG_MACH_AML_M5900 is not set
+# CONFIG_MACH_VR1000 is not set
+CONFIG_MACH_QT2410=y
+CONFIG_MACH_NEO1973_GTA01=y
+
+#
+# S3C2412 Machines
+#
+# CONFIG_MACH_SMDK2413 is not set
+# CONFIG_MACH_VSTMS is not set
+CONFIG_CPU_S3C2440=y
+CONFIG_S3C2440_DMA=y
+
+#
+# S3C2440 Machines
+#
+# CONFIG_MACH_ANUBIS is not set
+# CONFIG_MACH_OSIRIS is not set
+# CONFIG_MACH_RX3715 is not set
+CONFIG_ARCH_S3C2440=y
+# CONFIG_MACH_NEXCODER_2440 is not set
+CONFIG_SMDK2440_CPU2440=y
+CONFIG_MACH_HXD8=y
+# CONFIG_MACH_NEO1973_GTA02 is not set
+
+#
+# S3C2442 Machines
+#
+# CONFIG_SMDK2440_CPU2442 is not set
+
+#
+# S3C2443 Machines
+#
+# CONFIG_MACH_SMDK2443 is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM920T=y
+CONFIG_CPU_32v4T=y
+CONFIG_CPU_ABRT_EV4T=y
+CONFIG_CPU_CACHE_V4WT=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_OUTER_CACHE is not set
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+CONFIG_PREEMPT=y
+CONFIG_NO_IDLE_HZ=y
+CONFIG_HZ=200
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="console=ttySAC0,115200n8  ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off   debug"
+# CONFIG_XIP_KERNEL is not set
+CONFIG_KEXEC=y
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+# CONFIG_FPE_NWFPE is not set
+CONFIG_FPE_FASTFPE=y
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+CONFIG_PM_DEBUG=y
+CONFIG_DISABLE_CONSOLE_SUSPEND=y
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+CONFIG_APM_EMULATION=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=m
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_MIGRATE=y
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+# CONFIG_NET_IPGRE_BROADCAST is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+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"
+CONFIG_TCP_MD5SIG=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK_ENABLED=m
+CONFIG_NF_CONNTRACK_SUPPORT=y
+# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m