[oe-commits] org.oe.dev merge of '8e186034e744815050d62541776a4d037e5d320a'
rpurdie commit
openembedded-commits at lists.openembedded.org
Mon Jan 21 01:49:05 UTC 2008
merge of '8e186034e744815050d62541776a4d037e5d320a'
and 'eed8e44709b0135c476bb86fd537e46917805a76'
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 68a230b60662c9a02fcec5ffaa9a90510e7b14f4
ViewMTN: http://monotone.openembedded.org/revision/info/68a230b60662c9a02fcec5ffaa9a90510e7b14f4
Files:
1
packages/qt4/qtopia-core_4.2.0.bb
packages/cacao/files/cacao-0.98+hg-arm-cacheflush-fix.patch
packages/linux/chumby-kernel/disable-fbchanging.patch
packages/qt4/qtopia-core-4.3.3/allow-configure-plugins.patch
packages/qt4/qtopia-core-4.3.3/qconfig-oe.h
packages/cacao/cacao_0.98+hg20071001.bb
packages/qt4/qtopia-core.inc
packages/qt4/qtopia-core_4.3.3.bb
packages/linux/linux-rp-2.6.23+2.6.24-rc8/arm_pxa_20070923.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-tosa
packages/linux/linux-rp-2.6.23/defconfig-poodle
packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-akita
packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-bootcdx86
packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-c7x0
packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie
packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-htcuniversal
packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-hx2000
packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-poodle
packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-qemuarm
packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-qemux86
packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-spitz
packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-zylonite
packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni-acx.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni.patch
packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb
Diffs:
#
# mt diff -r8e186034e744815050d62541776a4d037e5d320a -r68a230b60662c9a02fcec5ffaa9a90510e7b14f4
#
#
#
# delete "packages/qt4/qtopia-core_4.2.0.bb"
#
# add_file "packages/cacao/files/cacao-0.98+hg-arm-cacheflush-fix.patch"
# content [125e26e26224355531392be2ba7990afaadd8f15]
#
# add_file "packages/linux/chumby-kernel/disable-fbchanging.patch"
# content [6989932c3ba1d4765bf015baa0dfd527a732eb2d]
#
# add_file "packages/qt4/qtopia-core-4.3.3/allow-configure-plugins.patch"
# content [c3b316fee55e5f2f5eecd54f37cdc88af92b9956]
#
# add_file "packages/qt4/qtopia-core-4.3.3/qconfig-oe.h"
# content [b03c0cf1186234b787173c4ebb4d6ee12103b1b6]
#
# patch "packages/cacao/cacao_0.98+hg20071001.bb"
# from [ab5bff912c3f54f9c37573994562c9a793c71e6f]
# to [6b579068c4284eea4bb711e240a0e1ff839a8583]
#
# patch "packages/qt4/qtopia-core.inc"
# from [afdef9632312a739952146a0359c30d1fc64c12f]
# to [3fc8e29466adb68cfe7d5609ee964d7ba4951bbe]
#
# patch "packages/qt4/qtopia-core_4.3.3.bb"
# from [9272f8ac29a03d2b11a73f4636b20468b3c281ec]
# to [3e76409cf2b8fa339a9084bfc41b1a6714e46b88]
#
============================================================
--- packages/cacao/files/cacao-0.98+hg-arm-cacheflush-fix.patch 125e26e26224355531392be2ba7990afaadd8f15
+++ packages/cacao/files/cacao-0.98+hg-arm-cacheflush-fix.patch 125e26e26224355531392be2ba7990afaadd8f15
@@ -0,0 +1,18 @@
+diff -r df1b780317c3 src/vm/jit/arm/asmpart.S
+--- a/src/vm/jit/arm/asmpart.S Thu Jan 17 01:01:35 2008 +0100
++++ b/src/vm/jit/arm/asmpart.S Mon Jan 21 00:14:41 2008 +0100
+@@ -323,10 +323,11 @@ asm_cacheflush:
+ mov a1, #0xff000000
+ #endif
+
++#if defined(__ARM_EABI__)
++ swi 0x0
++ ldmfd sp!, {r7}
++#else
+ swi sys_cacheflush
+-
+-#if defined(__ARM_EABI__)
+- ldmfd sp!, {r7}
+ #endif
+
+ mov pc, lr
============================================================
--- packages/linux/chumby-kernel/disable-fbchanging.patch 6989932c3ba1d4765bf015baa0dfd527a732eb2d
+++ packages/linux/chumby-kernel/disable-fbchanging.patch 6989932c3ba1d4765bf015baa0dfd527a732eb2d
@@ -0,0 +1,10 @@
+--- linux/drivers/video/imxfb.c.old 2008-01-20 08:21:57.000000000 +0100
++++ linux/drivers/video/imxfb.c 2008-01-20 08:40:12.000000000 +0100
+@@ -291,6 +291,7 @@
+
+ static int imxfb_set_par(struct fb_info *info)
+ {
++ return 0; //FIXME: Repair modesetting code!!
+ struct imxfb_info *fbi = info->par;
+ struct fb_var_screeninfo *var = &info->var;
+
============================================================
--- packages/qt4/qtopia-core-4.3.3/allow-configure-plugins.patch c3b316fee55e5f2f5eecd54f37cdc88af92b9956
+++ packages/qt4/qtopia-core-4.3.3/allow-configure-plugins.patch c3b316fee55e5f2f5eecd54f37cdc88af92b9956
@@ -0,0 +1,62 @@
+Index: qtopia-core-opensource-src-4.3.3/configure
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/configure 2008-01-20 11:42:07.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/configure 2008-01-20 22:31:37.000000000 +0100
+@@ -639,10 +639,10 @@
+
+ CFG_SQL_AVAILABLE=
+ if [ -d "$relpath/src/plugins/sqldrivers" ]; then
+- for a in "$relpath/src/plugins/sqldrivers/"*; do
+- if [ -d "$a" ]; then
+- base_a=`basename $a`
+- CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${base_a}"
++ for a in `ls $relpath/src/plugins/sqldrivers/`; do
++ dir="$relpath/src/plugins/sqldrivers/$a"
++ if [ -d "$dir" ]; then
++ CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${a}"
+ eval "CFG_SQL_${base_a}=auto"
+ fi
+ done
+@@ -650,30 +650,30 @@
+
+ CFG_DECORATION_PLUGIN_AVAILABLE=
+ if [ -d "$relpath/src/plugins/decorations" ]; then
+- for a in "$relpath/src/plugins/decorations/"*; do
+- if [ -d "$a" ]; then
+- base_a=`basename $a`
+- CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${base_a}"
++ for a in `ls $relpath/src/plugins/decorations/`; do
++ dir="$relpath/src/plugins/decorations/$a"
++ if [ -d "$dir" ]; then
++ CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${a}"
+ fi
+ done
+ fi
+
+ CFG_MOUSE_PLUGIN_AVAILABLE=
+ if [ -d "$relpath/src/plugins/mousedrivers" ]; then
+- for a in "$relpath/src/plugins/mousedrivers/"*; do
+- if [ -d "$a" ]; then
+- base_a=`basename $a`
+- CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${base_a}"
++ for a in `ls $relpath/src/plugins/mousedrivers/`; do
++ dir="$relpath/src/plugins/mousedrivers/$a"
++ if [ -d "$dir" ]; then
++ CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${a}"
+ fi
+ done
+ fi
+
+ CFG_GFX_PLUGIN_AVAILABLE=
+ if [ -d "$relpath/src/plugins/gfxdrivers" ]; then
+- for a in "$relpath/src/plugins/gfxdrivers/"*; do
+- if [ -d "$a" ]; then
+- base_a=`basename $a`
+- CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${base_a}"
++ for a in `ls $relpath/src/plugins/gfxdrivers/`; do
++ dir="$relpath/src/plugins/gfxdrivers/$a"
++ if [ -d "$dir" ]; then
++ CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${a}"
+ fi
+ done
+ CFG_GFX_OFF="$CFG_GFX_AVAILABLE" # assume all off
============================================================
--- packages/qt4/qtopia-core-4.3.3/qconfig-oe.h b03c0cf1186234b787173c4ebb4d6ee12103b1b6
+++ packages/qt4/qtopia-core-4.3.3/qconfig-oe.h b03c0cf1186234b787173c4ebb4d6ee12103b1b6
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 1992-2007 Trolltech ASA. All rights reserved.
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file. Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/
+**
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales at trolltech.com.
+**
+** In addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.0, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** In addition, as a special exception, Trolltech, as the sole copyright
+** holder for Qt Designer, grants users of the Qt/Eclipse Integration
+** plug-in the right for the Qt/Eclipse Integration to link to
+** functionality provided by Qt Designer and its related libraries.
+**
+** Trolltech reserves all rights not expressly granted herein.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+
+/*
+ Empty leaves all features enabled. See doc/html/emb-features.html for choices.
+
+ Note that disabling some features will produce a libqt that is not
+ compatible with other libqt builds. Such modifications are only
+ supported on Qtopia Core where reducing the library size is important
+ and where the application-suite is often a fixed set.
+*/
============================================================
--- packages/cacao/cacao_0.98+hg20071001.bb ab5bff912c3f54f9c37573994562c9a793c71e6f
+++ packages/cacao/cacao_0.98+hg20071001.bb 6b579068c4284eea4bb711e240a0e1ff839a8583
@@ -1,12 +1,12 @@ require cacao.inc
require cacao.inc
-PR = "r6"
+PR = "r7"
SRC_URI = "\
http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518 \
file://cacao-0.98+svn-libdir.diff;patch=1 \
file://cacao-0.98+svn-classpath_var.patch;patch=1 \
- file://cacao-0.98+hg-arm-cacheflush-workaround.patch;patch=1 \
+ file://cacao-0.98+hg-arm-cacheflush-fix.patch;patch=1 \
file://cacao-0.98+hg-attachthread.patch;patch=1 \
"
============================================================
--- packages/qt4/qtopia-core.inc afdef9632312a739952146a0359c30d1fc64c12f
+++ packages/qt4/qtopia-core.inc 3fc8e29466adb68cfe7d5609ee964d7ba4951bbe
@@ -7,6 +7,7 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/so
PR = "r1"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
+ file://qconfig-oe.h \
file://0001-cross-compile.patch;patch=1 \
file://0003-no-tools.patch;patch=1 \
file://0004-no-qmake.patch;patch=1 \
@@ -17,7 +18,19 @@ QT_CONFIG_FLAGS += " \
QT_CONFIG_FLAGS += " \
-nomake demos -nomake examples -nomake tools -qtlibinfix E\
- -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}"
+ -embedded ${QT_ARCH} \
+ -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \
+ -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc\
+ -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb\
+ -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb\
+ ${QT_QCONFIG} \
+ "
+
+do_configure_prepend() {
+ cp ${WORKDIR}/qconfig-oe.h ${S}/src/corelib/global
+}
+
+QT_QCONFIG = ""
QT_BASE_NAME = "qtopiacore"
QT_BASE_LIB = "libqtopiacore"
QT_DIR_NAME = "qtopia"
============================================================
--- packages/qt4/qtopia-core_4.3.3.bb 9272f8ac29a03d2b11a73f4636b20468b3c281ec
+++ packages/qt4/qtopia-core_4.3.3.bb 3e76409cf2b8fa339a9084bfc41b1a6714e46b88
@@ -1,5 +1,6 @@ SRC_URI += " \
require qtopia-core.inc
SRC_URI += " \
file://0006-freetype-host-includes.patch;patch=1 \
file://0007-openssl-host-includes.patch;patch=1 \
+ file://0008-backport-qt-lib-infix.patch;patch=1 \
+ file://allow-configure-plugins.patch;patch=1 "
- file://0008-backport-qt-lib-infix.patch;patch=1"
#
# mt diff -reed8e44709b0135c476bb86fd537e46917805a76 -r68a230b60662c9a02fcec5ffaa9a90510e7b14f4
#
#
#
# delete "packages/linux/linux-rp-2.6.23+2.6.24-rc8/arm_pxa_20070923.patch"
#
# delete "packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-tosa"
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-poodle"
# from [542bb67edbec944a39852833936a90dd679f8f4d]
# to [8c6270099668f834e1afa2c5dfbc6920c8217d1a]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-akita"
# from [828611f21dd3772a9db45569a4333a5e08e90a87]
# to [20880796f6d37c41919d94210d4cec37513e8037]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-bootcdx86"
# from [5558cdd18f447599d6ba549819dae3d99d919cbb]
# to [50f448589468760dfe313e73861a5ccb109e3daa]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-c7x0"
# from [76de453dac80746ab730d22aaf3f526cd2a99f26]
# to [065bb6d75b03d9f6a68b221a2685a71ff805ef9f]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie"
# from [de80ee68423529a4709a5d47badd9a1e383768fc]
# to [c4ddf6f7a69b40a2cc6aec21cd1f07f72af013dd]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-htcuniversal"
# from [c15ceaf3e170f40ee7b76bf8bd498450551060ad]
# to [943ee7f53879cb58396f60772a00aafa00bbc600]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-hx2000"
# from [ca400be76cfeca2feb187a33538407a633e15bc5]
# to [457c072098886ea7095efe2dbf704229e0f91cf4]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-poodle"
# from [17c355fed953e68652a97c9e41af957bfa52f4f2]
# to [5791f656a9e4b6e1a1c2d9bc26103c30a4e8f65c]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-qemuarm"
# from [677d6694b1fa93712c468b324b1cda3ba60d1787]
# to [b0c39a7dd448e15267b5d8eb8213076aee2b0fc0]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-qemux86"
# from [13ba6932d390681dfa74465511435d21ed675514]
# to [a701f027b6ca9b09fc56475f9b10dbf5876694e9]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-spitz"
# from [a4c61e81d4db69a81a8ad36c0e7dc5aeafd0bc6a]
# to [3185452b56fb85c7386d0e19aed36206f1cd2b2d]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-zylonite"
# from [3a9d67a339675e9dee9874ffed84dc3ba368eb0a]
# to [90e899b07063a4c84f59a5956b2cbb9e46e86816]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni-acx.patch"
# from [7c721d8962ce5c8541249861ae9ebb9fe132077c]
# to [12ac6d8ef90c4bbd6b06a294889b80e6e53aa996]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni.patch"
# from [b8eed485715621374cc2d1bada1c3ccf60e9ec7e]
# to [bc4b4931552f9d278a8f8c3f98c5acd4092a511c]
#
# patch "packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb"
# from [dddd1b2aba27480ec53022fce6ce6a6802552530]
# to [91c8f73922532616261250e9409b344de817d50d]
#
============================================================
--- packages/linux/linux-rp-2.6.23/defconfig-poodle 542bb67edbec944a39852833936a90dd679f8f4d
+++ packages/linux/linux-rp-2.6.23/defconfig-poodle 8c6270099668f834e1afa2c5dfbc6920c8217d1a
@@ -523,11 +523,9 @@ CONFIG_BT_HCIVHCI=m
#
# Wireless
#
-CONFIG_CFG80211=m
+# CONFIG_CFG80211 is not set
CONFIG_WIRELESS_EXT=y
-CONFIG_MAC80211=m
-# CONFIG_MAC80211_LEDS is not set
-# CONFIG_MAC80211_DEBUG is not set
+# CONFIG_MAC80211 is not set
CONFIG_IEEE80211=m
# CONFIG_IEEE80211_DEBUG is not set
CONFIG_IEEE80211_CRYPT_WEP=m
============================================================
--- packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-akita 828611f21dd3772a9db45569a4333a5e08e90a87
+++ packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-akita 20880796f6d37c41919d94210d4cec37513e8037
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23
-# Tue Oct 16 13:20:27 2007
+# Linux kernel version: 2.6.24-rc8
+# Sun Jan 20 18:29:33 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -43,9 +43,14 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_BSD_PROCESS_ACCT_V3=y
# CONFIG_TASKSTATS is not set
# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
# CONFIG_AUDIT is not set
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
# CONFIG_BLK_DEV_INITRD is not set
@@ -72,6 +77,7 @@ CONFIG_SLAB=y
CONFIG_SLAB=y
# CONFIG_SLUB is not set
# CONFIG_SLOB is not set
+CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
@@ -138,7 +144,7 @@ CONFIG_ARCH_PXA=y
# CONFIG_ARCH_OMAP is not set
#
-# Intel PXA2xx Implementations
+# Intel PXA2xx/PXA3xx Implementations
#
# CONFIG_ARCH_LUBBOCK is not set
# CONFIG_MACH_LOGICPD_PXA270 is not set
@@ -147,10 +153,11 @@ CONFIG_PXA_SHARPSL=y
CONFIG_PXA_SHARPSL=y
# CONFIG_MACH_TRIZEPS4 is not set
# CONFIG_MACH_EM_X270 is not set
-# CONFIG_MACH_HX2750 is not set
-# CONFIG_MACH_HTCUNIVERSAL is not set
+# CONFIG_MACH_ZYLONITE is not set
+# CONFIG_MACH_ARMCORE is not set
# CONFIG_PXA_SHARPSL_25x is not set
CONFIG_PXA_SHARPSL_27x=y
+# CONFIG_MACH_HX2750 is not set
CONFIG_MACH_AKITA=y
CONFIG_MACH_SPITZ=y
CONFIG_MACH_BORZOI=y
@@ -196,10 +203,6 @@ CONFIG_SHARP_SCOOP=y
#
# CONFIG_PCI_SYSCALL is not set
# CONFIG_ARCH_SUPPORTS_MSI is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
CONFIG_PCCARD=m
# CONFIG_PCMCIA_DEBUG is not set
CONFIG_PCMCIA=m
@@ -214,9 +217,10 @@ CONFIG_PCMCIA_PXA2XX=m
#
# Kernel Features
#
-# CONFIG_TICK_ONESHOT is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_PREEMPT=y
CONFIG_HZ=100
CONFIG_AEABI=y
@@ -229,6 +233,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
CONFIG_SPLIT_PTLOCK_CPUS=4096
# CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
@@ -241,9 +246,10 @@ CONFIG_ZBOOT_ROM_BSS=0x0
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 dyntick=enable quiet"
+CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 dyntick=enable debug"
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
#
# CPU Frequency scaling
@@ -287,11 +293,11 @@ CONFIG_NET=y
#
# Networking options
#
-CONFIG_PACKET=y
+CONFIG_PACKET=m
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
+CONFIG_XFRM_USER=m
# CONFIG_XFRM_SUB_POLICY is not set
# CONFIG_XFRM_MIGRATE is not set
# CONFIG_NET_KEY is not set
@@ -312,6 +318,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
CONFIG_INET_XFRM_MODE_TRANSPORT=m
CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_LRO is not set
CONFIG_INET_DIAG=m
CONFIG_INET_TCP_DIAG=m
# CONFIG_TCP_CONG_ADVANCED is not set
@@ -346,14 +353,60 @@ CONFIG_NETFILTER=y
# CONFIG_NETFILTER_NETLINK is not set
# CONFIG_NF_CONNTRACK_ENABLED is not set
# CONFIG_NF_CONNTRACK is not set
-# CONFIG_NETFILTER_XTABLES is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
#
# IP: Netfilter Configuration
#
CONFIG_IP_NF_QUEUE=m
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_ARPTABLES is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
#
# IPv6: Netfilter Configuration (EXPERIMENTAL)
@@ -374,10 +427,6 @@ CONFIG_IP_NF_QUEUE=m
# CONFIG_LAPB is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
# CONFIG_NET_SCHED is not set
#
@@ -415,6 +464,8 @@ CONFIG_IRCOMM=m
# Dongle support
#
# CONFIG_KINGSUN_DONGLE is not set
+# CONFIG_KSDAZZLE_DONGLE is not set
+# CONFIG_KS959_DONGLE is not set
#
# Old SIR device drivers
@@ -447,9 +498,11 @@ CONFIG_BT_HCIUSB=m
#
CONFIG_BT_HCIUSB=m
# CONFIG_BT_HCIUSB_SCO is not set
+# CONFIG_BT_HCIBTSDIO is not set
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIUART_LL is not set
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
@@ -471,7 +524,8 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
CONFIG_IEEE80211_CRYPT_WEP=m
CONFIG_IEEE80211_CRYPT_CCMP=m
CONFIG_IEEE80211_CRYPT_TKIP=m
-# CONFIG_IEEE80211_SOFTMAC is not set
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
# CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set
@@ -482,6 +536,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
#
# Generic Driver Options
#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
@@ -508,6 +563,7 @@ CONFIG_MTD_BLOCK=y
# CONFIG_INFTL is not set
# CONFIG_RFD_FTL is not set
# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
#
# RAM/ROM/Flash chip drivers
@@ -560,6 +616,7 @@ CONFIG_MTD_NAND_SHARPSL=y
CONFIG_MTD_NAND_SHARPSL=y
# CONFIG_MTD_NAND_NANDSIM is not set
# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ALAUDA is not set
# CONFIG_MTD_ONENAND is not set
#
@@ -576,6 +633,8 @@ CONFIG_BLK_DEV_LOOP=y
# CONFIG_BLK_DEV_RAM is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
CONFIG_IDE=y
CONFIG_IDE_MAX_HWIFS=4
CONFIG_BLK_DEV_IDE=y
@@ -598,9 +657,10 @@ CONFIG_IDE_GENERIC=y
# IDE chipset support/bugfixes
#
CONFIG_IDE_GENERIC=y
-# CONFIG_IDEPCI_PCIBUS_ORDER is not set
+# CONFIG_BLK_DEV_PLATFORM is not set
# CONFIG_IDE_ARM is not set
# CONFIG_BLK_DEV_IDEDMA is not set
+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
# CONFIG_BLK_DEV_HD is not set
#
@@ -640,6 +700,7 @@ CONFIG_SCSI_WAIT_SCAN=m
# CONFIG_SCSI_FC_ATTRS is not set
# CONFIG_SCSI_ISCSI_ATTRS is not set
# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
CONFIG_SCSI_LOWLEVEL=y
# CONFIG_ISCSI_TCP is not set
# CONFIG_SCSI_DEBUG is not set
@@ -656,7 +717,9 @@ CONFIG_DM_MULTIPATH_EMC=m
CONFIG_DM_MULTIPATH=m
CONFIG_DM_MULTIPATH_EMC=m
# CONFIG_DM_MULTIPATH_RDAC is not set
+# CONFIG_DM_MULTIPATH_HP is not set
# CONFIG_DM_DELAY is not set
+# CONFIG_DM_UEVENT is not set
CONFIG_NETDEVICES=y
# CONFIG_NETDEVICES_MULTIQUEUE is not set
# CONFIG_DUMMY is not set
@@ -664,6 +727,7 @@ CONFIG_TUN=m
# CONFIG_MACVLAN is not set
# CONFIG_EQUALIZER is not set
CONFIG_TUN=m
+# CONFIG_VETH is not set
# CONFIG_PHYLIB is not set
CONFIG_NET_ETHERNET=y
CONFIG_MII=m
@@ -671,23 +735,25 @@ CONFIG_MII=m
# CONFIG_SMC91X is not set
# CONFIG_DM9000 is not set
# CONFIG_SMC911X is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_B44 is not set
# CONFIG_NETDEV_1000 is not set
# CONFIG_NETDEV_10000 is not set
#
# Wireless LAN
#
-CONFIG_WLAN_PRE80211=y
-# CONFIG_STRIP is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_NETWAVE is not set
+# CONFIG_WLAN_PRE80211 is not set
CONFIG_WLAN_80211=y
# CONFIG_PCMCIA_RAYCS is not set
# CONFIG_LIBERTAS is not set
CONFIG_HERMES=m
-# CONFIG_ATMEL is not set
CONFIG_PCMCIA_HERMES=m
CONFIG_PCMCIA_SPECTRUM=m
+# CONFIG_ATMEL is not set
CONFIG_AIRO_CS=m
# CONFIG_PCMCIA_WL3501 is not set
# CONFIG_USB_ZD1201 is not set
@@ -703,7 +769,6 @@ CONFIG_USB_RTL8150=m
CONFIG_USB_KAWETH=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET_MII=m
CONFIG_USB_USBNET=m
CONFIG_USB_NET_AX8817X=m
CONFIG_USB_NET_CDCETHER=m
@@ -758,7 +823,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_EVBUG is not set
CONFIG_INPUT_POWER=y
@@ -834,7 +898,6 @@ CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTYS=y
# CONFIG_LEGACY_PTYS is not set
# CONFIG_IPMI_HANDLER is not set
-# CONFIG_WATCHDOG is not set
CONFIG_HW_RANDOM=m
# CONFIG_NVRAM is not set
# CONFIG_R3964 is not set
@@ -854,7 +917,7 @@ CONFIG_I2C_BOARDINFO=y
#
# I2C Algorithms
#
-# CONFIG_I2C_ALGOBIT is not set
+CONFIG_I2C_ALGOBIT=y
# CONFIG_I2C_ALGOPCF is not set
# CONFIG_I2C_ALGOPCA is not set
@@ -896,10 +959,15 @@ CONFIG_I2C_PXA=y
# CONFIG_W1 is not set
# CONFIG_POWER_SUPPLY is not set
# CONFIG_HWMON is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_WATCHDOG is not set
#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
# Multifunction device drivers
#
# CONFIG_MFD_SM501 is not set
@@ -907,27 +975,6 @@ CONFIG_MISC_DEVICES=y
# CONFIG_HTC_ASIC3_DS1WM is not set
#
-# Multi-Function Devices
-#
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-CONFIG_LEDS_SPITZ=y
-# CONFIG_LEDS_TOSA is not set
-# CONFIG_LEDS_GPIO is not set
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
-# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-
-#
# Multimedia devices
#
CONFIG_VIDEO_DEV=m
@@ -937,32 +984,33 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+# CONFIG_VIDEO_VIVI is not set
# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_CPIA2 is not set
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
# CONFIG_TUNER_3036 is not set
-# CONFIG_TUNER_TEA5761 is not set
CONFIG_V4L_USB_DRIVERS=y
# CONFIG_VIDEO_PVRUSB2 is not set
# CONFIG_VIDEO_EM28XX is not set
# CONFIG_VIDEO_USBVISION is not set
-# CONFIG_USB_VICAM is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_KONICAWC is not set
+CONFIG_VIDEO_USBVIDEO=m
+CONFIG_USB_VICAM=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_KONICAWC=m
# CONFIG_USB_QUICKCAM_MESSENGER is not set
# CONFIG_USB_ET61X251 is not set
# CONFIG_VIDEO_OVCAMCHIP is not set
# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_SE401 is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_STV680 is not set
+CONFIG_USB_OV511=m
+CONFIG_USB_SE401=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_STV680=m
# CONFIG_USB_ZC0301 is not set
# CONFIG_USB_PWC is not set
# CONFIG_USB_ZR364XX is not set
CONFIG_RADIO_ADAPTERS=y
-# CONFIG_USB_DSBR is not set
+CONFIG_USB_DSBR=m
# CONFIG_DVB_CORE is not set
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -970,23 +1018,15 @@ CONFIG_USB_DABUSB=m
#
# Graphics support
#
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CORGI=y
-
-#
-# Display device support
-#
-# CONFIG_DISPLAY_SUPPORT is not set
# CONFIG_VGASTATE is not se%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list