[oe-commits] org.oe.dev merge of '709567d645f4e7cbcb5c96f0cf8b99276d2e9318'
rwhitby commit
openembedded-commits at lists.openembedded.org
Mon Sep 24 09:19:32 UTC 2007
merge of '709567d645f4e7cbcb5c96f0cf8b99276d2e9318'
and 'bbea886577d16293379de278796e667a3ca5aac3'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 4c5ddb91cef08efd90fb4c65979c1ab998e523d9
ViewMTN: http://monotone.openembedded.org/revision/info/4c5ddb91cef08efd90fb4c65979c1ab998e523d9
Files:
1
packages/meta/slugos-packages.bb
packages/redboot-utils/fis_1.0.bb
packages/pointercal/files/nokia800/pointercal
packages/pointercal/files/nokia800/pointercal.broken
packages/pimlico/tasks-0.12
packages/linux/linux-davinci/binutils-buildid-arm.patch
packages/pimlico/tasks-0.12/tasks-owl.diff
conf/distro/include/sane-srcrevs.inc
packages/abiword/abiword-2.5.inc
packages/abiword/abiword_2.5.1.bb
packages/abiword/abiword_2.5.2.bb
packages/ezx/ezxd_svn.bb
packages/gtk-webcore/osb-jscore_svn.bb
packages/gtk-webcore/osb-nrcit_svn.bb
packages/gtk-webcore/osb-nrcore_svn.bb
packages/linux/linux-davinci/davinci-dvevm/defconfig
packages/linux/linux-davinci_2.6.x+git-davinci.bb
packages/linux/linux-ezx-2.6.21/a1200/defconfig
packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch
packages/linux/linux-ezx-2.6.21/patches/pxa27x-udc-fix-a1200.patch
packages/linux/linux-ezx-2.6.21/rokre6/defconfig
packages/linux/linux-ezx_2.6.21.bb
packages/pimlico/tasks_svn.bb
packages/pointercal/pointercal_0.0.bb
Diffs:
#
# mt diff -r709567d645f4e7cbcb5c96f0cf8b99276d2e9318 -r4c5ddb91cef08efd90fb4c65979c1ab998e523d9
#
#
#
# patch "packages/meta/slugos-packages.bb"
# from [738a66a4cd05dd74381dce0949ddcd547be2497f]
# to [3e624519aa3c29fb9c243930483b6363f1b191b9]
#
# patch "packages/redboot-utils/fis_1.0.bb"
# from [423fde1a30e871e390b48542349b88efb3a07ac9]
# to [16fa3c9f589d8b24e84de8555dad50affd97b735]
#
============================================================
--- packages/meta/slugos-packages.bb 738a66a4cd05dd74381dce0949ddcd547be2497f
+++ packages/meta/slugos-packages.bb 3e624519aa3c29fb9c243930483b6363f1b191b9
@@ -5,7 +5,7 @@ LICENSE = "MIT"
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r35"
+PR = "r36"
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2"
@@ -37,6 +37,7 @@ SLUGOS_PACKAGES = "\
binutils \
bison \
bluez-utils \
+ bluez-hcidump \
bogofilter \
boost \
bridge-utils \
============================================================
--- packages/redboot-utils/fis_1.0.bb 423fde1a30e871e390b48542349b88efb3a07ac9
+++ packages/redboot-utils/fis_1.0.bb 16fa3c9f589d8b24e84de8555dad50affd97b735
@@ -1,7 +1,7 @@ DESCRIPTION = "Tool to edit the Redboot
DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace"
-PR = "r4"
+PR = "r5"
-SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http"
+SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http;rev=6"
S="${WORKDIR}/trunk"
export CFLAGS += "--std=c99"
#
# mt diff -rbbea886577d16293379de278796e667a3ca5aac3 -r4c5ddb91cef08efd90fb4c65979c1ab998e523d9
#
#
#
# rename "packages/pointercal/files/nokia800/pointercal"
# to "packages/pointercal/files/nokia800/pointercal.broken"
#
# add_dir "packages/pimlico/tasks-0.12"
#
# add_file "packages/linux/linux-davinci/binutils-buildid-arm.patch"
# content [450eaeee5ad06f6a335498a5d3c8cf6a0d6465d1]
#
# add_file "packages/pimlico/tasks-0.12/tasks-owl.diff"
# content [6d8a6a6ced01ab3acb9930399830fb021446e9fd]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [ddaac7ee320dd8ad4baff5a250bd943c0a5c9e96]
# to [514bd631097bb91cffd2b7ec4aa8019b8993d3f0]
#
# patch "packages/abiword/abiword-2.5.inc"
# from [e523d1c593851bbd008dc514dd17073707fc961a]
# to [6306c0ee364ca356a51f977e4df1f5fc309610a7]
#
# patch "packages/abiword/abiword_2.5.1.bb"
# from [a3d8ed34e897eaee21387d1b1b4a9899feba167e]
# to [1146ebe526b93b0c25021b93dc4fcf01077dea2b]
#
# patch "packages/abiword/abiword_2.5.2.bb"
# from [c6c5fd771ef0b03717df37cac565bd8ff8d4c2f1]
# to [a3d8ed34e897eaee21387d1b1b4a9899feba167e]
#
# patch "packages/ezx/ezxd_svn.bb"
# from [b56176292b0c3556aa88055dc138488378e86453]
# to [da9cb81d38e8d11e3e0ab84d48abfb9575ddf6aa]
#
# patch "packages/gtk-webcore/osb-jscore_svn.bb"
# from [b9e84c178b8314578103df9fe9f70faa86e25b62]
# to [08f95478338a78dcf9ef0956930f2d682324b32f]
#
# patch "packages/gtk-webcore/osb-nrcit_svn.bb"
# from [d2946241f9a427b0631ba309b8c8408ff33bebf7]
# to [e20892177009024e3e4fe7bf662ff4c3a5dab077]
#
# patch "packages/gtk-webcore/osb-nrcore_svn.bb"
# from [8a2e36e22d6546437b3ebec3bc6df6aa17c82174]
# to [f0272ef1ec3ef2b2fac6ec34f6c9398aff1b4974]
#
# patch "packages/linux/linux-davinci/davinci-dvevm/defconfig"
# from [700f7637aad2ceed20402bf3f304dd821c9c3584]
# to [e3c93d6a955ae965000ed3c42dfed0f5c5683ad8]
#
# patch "packages/linux/linux-davinci_2.6.x+git-davinci.bb"
# from [a2e2d6cadc00a708a4cd317c62d1ff26b75131fc]
# to [f614af9ca537b37ba933022bb6296aad44872583]
#
# patch "packages/linux/linux-ezx-2.6.21/a1200/defconfig"
# from [cbd74a97e0ff2c2a00cbd2111d4cb5ffd564fd6d]
# to [fddca45c3c4d0ac194de7c1de4883a7324bc04b7]
#
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch"
# from [385081750e254e3e68c9e42d96e0ea03ec1ae356]
# to [abdddce8584aa8035eeacc9956b7a3c28e066379]
#
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch"
# from [08a4e592d7b7f3c689b3e8366522a8364be174a7]
# to [6e82f1f852bda74b86e74926f3f99bf90d00a041]
#
# patch "packages/linux/linux-ezx-2.6.21/patches/pxa27x-udc-fix-a1200.patch"
# from [ddc0a46af51fb941a7c75ad20385ff9471c649d2]
# to [089118fa3197fc6b29442d89458fb49d89449165]
#
# patch "packages/linux/linux-ezx-2.6.21/rokre6/defconfig"
# from [2fcdbfacbc7633f1338125153055119f08e7d52b]
# to [8da1a6604826ab49b5cc93a4a419b9f35ad201b6]
#
# patch "packages/linux/linux-ezx_2.6.21.bb"
# from [2ea2f1e711b98603012a3a8f2a2b5d673859fad6]
# to [0bcc7e4483c58e1b1b9d9ad233c7c60004a18dad]
#
# patch "packages/pimlico/tasks_svn.bb"
# from [6b25011b2bc6be784f63ec8ea00efbc736b7298c]
# to [6f444d0caa32c1ef1f193f39ed7a93f4bd1c5eae]
#
# patch "packages/pointercal/pointercal_0.0.bb"
# from [b8790bb4f4ba0f5d19f857367be5e221745356d0]
# to [a8a3e606c0d9cb9d7156407a1729b9d398ff5545]
#
============================================================
--- packages/linux/linux-davinci/binutils-buildid-arm.patch 450eaeee5ad06f6a335498a5d3c8cf6a0d6465d1
+++ packages/linux/linux-davinci/binutils-buildid-arm.patch 450eaeee5ad06f6a335498a5d3c8cf6a0d6465d1
@@ -0,0 +1,12 @@
+diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
+index 5ff5406..538fcb5 100644
+--- a/arch/arm/kernel/vmlinux.lds.S
++++ b/arch/arm/kernel/vmlinux.lds.S
+@@ -94,6 +94,7 @@ SECTIONS
+ TEXT_TEXT
+ SCHED_TEXT
+ LOCK_TEXT
++ *(.note.*)
+ #ifdef CONFIG_MMU
+ *(.fixup)
+ #endif
============================================================
--- packages/pimlico/tasks-0.12/tasks-owl.diff 6d8a6a6ced01ab3acb9930399830fb021446e9fd
+++ packages/pimlico/tasks-0.12/tasks-owl.diff 6d8a6a6ced01ab3acb9930399830fb021446e9fd
@@ -0,0 +1,62 @@
+Index: src/gtk/tasks-ui.xml
+===================================================================
+--- src/gtk/tasks-ui.xml (revision 338)
++++ src/gtk/tasks-ui.xml (working copy)
+@@ -7,17 +7,14 @@
+ <menuitem action="EditTask"/>
+ <menuitem action="CompleteTask"/>
+ <separator/>
++ <menuitem action="Undo"/>
++ <menuitem action="Redo"/>
++ <separator/>
+ <menuitem action="DeleteTask"/>
+ <menuitem action="PurgeTasks"/>
+ <separator/>
++ <menuitem action="About"/>
+ <menuitem action="Quit"/>
+ </menu>
+- <menu action="EditMenu">
+- <menuitem action="Undo"/>
+- <menuitem action="Redo"/>
+- </menu>
+- <menu action="HelpMenu">
+- <menuitem action="About"/>
+- </menu>
+ </menubar>
+ </ui>
+Index: src/gtk/main.c
+===================================================================
+--- src/gtk/main.c (revision 338)
++++ src/gtk/main.c (working copy)
+@@ -21,6 +21,7 @@
+ #include <libecal/e-cal.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
++#include <owlwindowmenu.h>
+
+ #include <libkoto/ical-util.h>
+ #include <libkoto/koto-actions.h>
+@@ -564,8 +565,8 @@
+ gtk_window_add_accel_group (GTK_WINDOW (window), gtk_ui_manager_get_accel_group (ui_manager));
+ gtk_ui_manager_ensure_update (ui_manager);
+
+- menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar");
+- gtk_box_pack_start (GTK_BOX (top_box), menu, FALSE, FALSE, 0);
++ menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar/TasksMenu");
++ owl_set_window_menu_item (GTK_WINDOW (window), GTK_MENU_ITEM (menu));
+
+ box = gtk_vbox_new (FALSE, 4);
+ gtk_container_set_border_width (GTK_CONTAINER (box), 4);
+Index: src/gtk/Makefile.am
+===================================================================
+--- src/gtk/Makefile.am (revision 338)
++++ src/gtk/Makefile.am (working copy)
+@@ -4,7 +4,7 @@
+ bin_PROGRAMS = tasks
+ tasks_CPPFLAGS = -I$(top_srcdir)/
+ tasks_CFLAGS = $(WARN_CFLAGS) $(GTK_CFLAGS) $(ECAL_CFLAGS) $(SEXY_CFLAGS)
+-tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS)
++tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) -lowl
+
+ tasks_SOURCES = \
+ main.c \
============================================================
--- conf/distro/include/sane-srcrevs.inc ddaac7ee320dd8ad4baff5a250bd943c0a5c9e96
+++ conf/distro/include/sane-srcrevs.inc 514bd631097bb91cffd2b7ec4aa8019b8993d3f0
@@ -36,6 +36,10 @@ SRCREV_pn-oh-puzzles ?= "22"
SRCREV_moko-gtk-engine ?= "3029"
SRCREV_pn-neod ?= "2956"
SRCREV_pn-oh-puzzles ?= "22"
+SRCREV_pn-osb-browser ?= "125"
+SRCREV_pn-osb-jscore ?= "117"
+SRCREV_pn-osb-nrcit ?= "125"
+SRCREV_pn-osb-nrcore ?= "126"
SRCREV_pn-openmoko-appmanager ?= "1851"
SRCREV_pn-openmoko-browser2 ?= "3031"
SRCREV_pn-openmoko-calculator ?= "2404"
============================================================
--- packages/abiword/abiword-2.5.inc e523d1c593851bbd008dc514dd17073707fc961a
+++ packages/abiword/abiword-2.5.inc 6306c0ee364ca356a51f977e4df1f5fc309610a7
@@ -13,10 +13,10 @@ FILES_${PN} += " \
FILES_${PN} += " \
${datadir}/icons/* \
- ${datadir}/abiword-${SHRT_VER}/AbiWord/glade \
- ${datadir}/abiword-${SHRT_VER}/AbiWord/scripts \
- ${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile-en \
- ${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile-en_GB \
+ ${datadir}/abiword-${SHRT_VER}/glade \
+ ${datadir}/abiword-${SHRT_VER}/scripts \
+ ${datadir}/abiword-${SHRT_VER}/system.profile-en \
+ ${datadir}/abiword-${SHRT_VER}/system.profile-en_GB \
# ${datadir}/abiword-${SHRT_VER}/templates/A4.awt \
# ${datadir}/abiword-${SHRT_VER}/templates/US-Letter.awt \
${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
============================================================
--- packages/abiword/abiword_2.5.1.bb a3d8ed34e897eaee21387d1b1b4a9899feba167e
+++ packages/abiword/abiword_2.5.1.bb 1146ebe526b93b0c25021b93dc4fcf01077dea2b
@@ -1,7 +1,7 @@ DEFAULT_PREFERENCE = "-1"
require abiword-2.5.inc
DEFAULT_PREFERENCE = "-1"
-PR = "r1"
+PR = "r2"
RCONFLICTS = "abiword-embedded"
============================================================
--- packages/abiword/abiword_2.5.2.bb c6c5fd771ef0b03717df37cac565bd8ff8d4c2f1
+++ packages/abiword/abiword_2.5.2.bb a3d8ed34e897eaee21387d1b1b4a9899feba167e
@@ -1,7 +1,7 @@ DEFAULT_PREFERENCE = "-1"
require abiword-2.5.inc
DEFAULT_PREFERENCE = "-1"
-PR = "r0"
+PR = "r1"
RCONFLICTS = "abiword-embedded"
============================================================
--- packages/ezx/ezxd_svn.bb b56176292b0c3556aa88055dc138488378e86453
+++ packages/ezx/ezxd_svn.bb da9cb81d38e8d11e3e0ab84d48abfb9575ddf6aa
@@ -1,10 +1,10 @@ PV = "0.0+svnr${SRCREV}"
DESCRIPTION = "Open implementation of motorola's tapisrv, replaces opentapi"
LICENSE = "GPLv2"
SECTION = "devel"
AUTHOR = "Daniel Ribeiro"
PV = "0.0+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=ezxd;proto=http \
file://ezxd.init \
@@ -21,8 +21,11 @@ do_configure() {
sed -i -e s:CROSS:CC:g Makefile
}
-do_install() {
- install -d ${D}${bindir}
+fakeroot do_install() {
+ install -d ${D}/dev/input
+ mknod ${D}/dev/input/uinput c 10 223
+
+ install -d ${D}${bindir}
install -m 755 ezxd ${D}${bindir}
install -d ${D}${libdir}/ezxd
@@ -33,3 +36,5 @@ do_install() {
install -m 0755 ${WORKDIR}/ezxd.init ${D}${sysconfdir}/init.d/ezxd
}
+FILES_${PN} += "/dev"
+
============================================================
--- packages/gtk-webcore/osb-jscore_svn.bb b9e84c178b8314578103df9fe9f70faa86e25b62
+++ packages/gtk-webcore/osb-jscore_svn.bb 08f95478338a78dcf9ef0956930f2d682324b32f
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE = "-1"
-PV = "0.5.2+svnr${SRCREV}"
+PV = "0.5.2+svnr${SRCDATE}"
PR = "r1"
SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \
============================================================
--- packages/gtk-webcore/osb-nrcit_svn.bb d2946241f9a427b0631ba309b8c8408ff33bebf7
+++ packages/gtk-webcore/osb-nrcit_svn.bb e20892177009024e3e4fe7bf662ff4c3a5dab077
@@ -1,10 +1,10 @@ SECTION = "gpe"
DESCRIPTION = "Gtk+ WebCore - NRCit embeddable browser component"
HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
LICENSE = "nokia"
PRIORITY = "optional"
SECTION = "gpe"
-PV = "0.5.2+svnr${SRCREV}"
+PV = "0.5.2+svnr${SRCDATE}"
PR = "r0"
DEPENDS = "curl librsvg osb-nrcore pango"
============================================================
--- packages/gtk-webcore/osb-nrcore_svn.bb 8a2e36e22d6546437b3ebec3bc6df6aa17c82174
+++ packages/gtk-webcore/osb-nrcore_svn.bb f0272ef1ec3ef2b2fac6ec34f6c9398aff1b4974
@@ -1,8 +1,8 @@ DEFAULT_PREFERENCE = "-1"
require osb-nrcore.inc
DEFAULT_PREFERENCE = "-1"
-PV = "0.5.2+svnr${SRCREV}"
+PV = "0.5.2+svnr${SRCDATE}"
PR = "r1"
SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \
============================================================
--- packages/linux/linux-davinci/davinci-dvevm/defconfig 700f7637aad2ceed20402bf3f304dd821c9c3584
+++ packages/linux/linux-davinci/davinci-dvevm/defconfig e3c93d6a955ae965000ed3c42dfed0f5c5683ad8
@@ -1,13 +1,13 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-omap1
-# Sun Aug 12 17:15:12 2007
+# Linux kernel version: 2.6.23-rc2-davinci1
+# Fri Aug 17 20:43:45 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_GENERIC_GPIO=y
-# CONFIG_GENERIC_TIME is not set
-# CONFIG_GENERIC_CLOCKEVENTS is not set
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_MMU=y
# CONFIG_NO_IOPORT is not set
CONFIG_GENERIC_HARDIRQS=y
@@ -26,26 +26,20 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNA
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
-# Code maturity level options
+# General setup
#
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
CONFIG_LOCALVERSION=""
CONFIG_LOCALVERSION_AUTO=y
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
# CONFIG_AUDIT is not set
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
@@ -67,34 +61,30 @@ CONFIG_FUTEX=y
CONFIG_ELF_CORE=y
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
CONFIG_SHMEM=y
CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
CONFIG_SLAB=y
# CONFIG_SLUB is not set
# CONFIG_SLOB is not set
CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y
# 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
+# CONFIG_BLK_DEV_BSG is not set
#
# IO Schedulers
@@ -126,14 +116,16 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
# CONFIG_ARCH_NETX is not set
# CONFIG_ARCH_H720X is not set
# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
# CONFIG_ARCH_IOP32X is not set
# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 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_KS8695 is not set
# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_MXC is not set
# CONFIG_ARCH_PNX4008 is not set
# CONFIG_ARCH_PXA is not set
# CONFIG_ARCH_RPC is not set
@@ -141,10 +133,19 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
# CONFIG_ARCH_S3C2410 is not set
# CONFIG_ARCH_SHARK is not set
# CONFIG_ARCH_LH7A40X is not set
+CONFIG_ARCH_DAVINCI=y
# CONFIG_ARCH_OMAP is not set
-CONFIG_ARCH_DAVINCI=y
+# CONFIG_MACH_OMAP_APOLLON_PLUS is not set
#
+# Boot options
+#
+
+#
+# Power management
+#
+
+#
# TI DaVinci Implementations
#
@@ -172,6 +173,7 @@ CONFIG_CPU_ABRT_EV5TJ=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_PABRT_NOIFAR=y
CONFIG_CPU_CACHE_VIVT=y
CONFIG_CPU_COPY_V4WB=y
CONFIG_CPU_TLB_V4WBI=y
@@ -191,6 +193,7 @@ CONFIG_ARM_THUMB=y
#
# Bus support
#
+# CONFIG_PCI_SYSCALL is not set
# CONFIG_ARCH_SUPPORTS_MSI is not set
#
@@ -202,11 +205,11 @@ CONFIG_ARM_THUMB=y
# Kernel Features
#
# CONFIG_TICK_ONESHOT is not set
-CONFIG_PREEMPT=y
-# CONFIG_NO_IDLE_HZ is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+# CONFIG_PREEMPT is not set
CONFIG_HZ=100
-CONFIG_AEABI=y
-CONFIG_OABI_COMPAT=y
+# CONFIG_AEABI is not set
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
@@ -218,8 +221,9 @@ CONFIG_ZONE_DMA_FLAG=1
CONFIG_SPLIT_PTLOCK_CPUS=4096
# CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
CONFIG_LEDS=y
-# CONFIG_LEDS_TIMER is not set
# CONFIG_LEDS_CPU is not set
CONFIG_ALIGNMENT_TRAP=y
@@ -239,8 +243,7 @@ CONFIG_CMDLINE=""
#
# At least one emulation must be selected
#
-CONFIG_FPE_NWFPE=y
-# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_NWFPE is not set
# CONFIG_FPE_FASTFPE is not set
# CONFIG_VFP is not set
@@ -250,6 +253,7 @@ CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_AOUT is not set
# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
#
# Power management options
@@ -298,10 +302,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
CONFIG_TCP_CONG_CUBIC=y
CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set
-
-#
-# IP: Virtual Server Configuration
-#
# CONFIG_IP_VS is not set
CONFIG_IPV6=m
# CONFIG_IPV6_PRIVACY is not set
@@ -344,20 +344,8 @@ CONFIG_NETFILTER=y
#
# CONFIG_IP6_NF_QUEUE is not set
# CONFIG_IP6_NF_IPTABLES is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
# CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
# CONFIG_IP_SCTP is not set
-
-#
-# TIPC Config%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list