[oe-commits] org.oe.dev merge of '610425fd34abfbbedaf9b3792ed2d884bdda9fd3'
crofton commit
openembedded-commits at lists.openembedded.org
Mon Aug 27 21:40:20 UTC 2007
merge of '610425fd34abfbbedaf9b3792ed2d884bdda9fd3'
and '9b318dc0ed758bbc0cbe978a0ff4471831b1df53'
Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 9e3f287c579cb592207f2e225ab8735174982867
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9e3f287c579cb592207f2e225ab8735174982867
Files:
1
packages/xserver-common/xserver-common_1.10.bb
packages/xserver-common/xserver-common_1.3.bb
packages/xserver-common/xserver-common_1.8.bb
packages/xserver-common/xserver-common_1.9.bb
packages/xserver-common/xserver-common_1.17.bb
packages/xserver-common/xserver-common_1.18.bb
packages/portmap/portmap-6.0
packages/alsa/alsa-lib/unbreak_plugindir.patch
packages/alsa/alsa-lib_1.0.14.bb
packages/alsa/alsa-oss_1.0.14.bb
packages/alsa/alsa-utils_1.0.14.bb
packages/linux/linux/alix/geode-mfgpt-clock-event-device-support.patch
packages/linux/linux/alix/geode-mfgpt-support-for-geode-class-machines.patch
packages/openssl/openssl-0.9.7g/armeb.patch.lock
packages/openssl/openssl-0.9.7g/debian.patch.lock
packages/openssl/openssl-0.9.7g/gnueabi-arm.patch.lock
packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch.lock
packages/openssl/openssl-0.9.7g/uclibcgnueabi.patch
packages/portmap/portmap-6.0/destdir-no-strip.patch
packages/portmap/portmap-6.0/no-libwrap.patch
packages/portmap/portmap-6.0/no-tcpd-support.patch
packages/portmap/portmap_6.0.bb
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom.inc
conf/machine/include/tune-arm1136jf-s.conf
conf/machine/include/tune-arm920t.conf
conf/machine/include/tune-arm926ejs.conf
conf/machine/include/tune-xscale.conf
packages/avahi/avahi-python_0.6.21.bb
packages/avahi/avahi.inc
packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch
packages/fbreader/fbreader_0.8.2a.bb
packages/linux/linux/alix/defconfig
packages/linux/linux-handhelds-2.6/h2200/defconfig
packages/linux/linux_2.6.22+2.6.23-rc3.bb
packages/linux/linux_2.6.22.bb
packages/openssl/openssl_0.9.7g.bb
packages/portmap/portmap.inc
packages/base-files/base-files/gumstix-connex
packages/base-files/base-files/gumstix-verdex
packages/base-files/base-files/gumstix-connex/fstab
packages/base-files/base-files/gumstix-verdex/fstab
conf/machine/gumstix-connex.conf
conf/machine/gumstix-verdex.conf
conf/machine/include/gumstix.inc
conf/machine/omap5912osk.conf
packages/base-files/base-files/omap5912osk/fstab
Diffs:
#
# mt diff -r610425fd34abfbbedaf9b3792ed2d884bdda9fd3 -r9e3f287c579cb592207f2e225ab8735174982867
#
#
#
# delete "packages/xserver-common/xserver-common_1.10.bb"
#
# delete "packages/xserver-common/xserver-common_1.3.bb"
#
# delete "packages/xserver-common/xserver-common_1.8.bb"
#
# delete "packages/xserver-common/xserver-common_1.9.bb"
#
# rename "packages/xserver-common/xserver-common_1.17.bb"
# to "packages/xserver-common/xserver-common_1.18.bb"
#
# add_dir "packages/portmap/portmap-6.0"
#
# add_file "packages/alsa/alsa-lib/unbreak_plugindir.patch"
# content [a16e20ebbbcde514ae86abd3664bf70c4279e5e3]
#
# add_file "packages/alsa/alsa-lib_1.0.14.bb"
# content [60431b66fbe642b84eebb662e02f977ce4cf8e9d]
#
# add_file "packages/alsa/alsa-oss_1.0.14.bb"
# content [7ca8c991dd2976fe24201983328f2b96c073e203]
#
# add_file "packages/alsa/alsa-utils_1.0.14.bb"
# content [a96036a12ca994ce724e4448bb897a719e94a500]
#
# add_file "packages/linux/linux/alix/geode-mfgpt-clock-event-device-support.patch"
# content [d0e230915059acdf6b19ea60e86d9936b545c098]
#
# add_file "packages/linux/linux/alix/geode-mfgpt-support-for-geode-class-machines.patch"
# content [c55a38ac6a13fc66730cc600ffa2effc475670a6]
#
# add_file "packages/openssl/openssl-0.9.7g/armeb.patch.lock"
# content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
#
# add_file "packages/openssl/openssl-0.9.7g/debian.patch.lock"
# content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
#
# add_file "packages/openssl/openssl-0.9.7g/gnueabi-arm.patch.lock"
# content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
#
# add_file "packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch.lock"
# content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
#
# add_file "packages/openssl/openssl-0.9.7g/uclibcgnueabi.patch"
# content [bd1bc954b5c2e8539a39128f09661d686716eba9]
#
# add_file "packages/portmap/portmap-6.0/destdir-no-strip.patch"
# content [f8c1fc10af211a706c2d9e98872ddaaeef1c165e]
#
# add_file "packages/portmap/portmap-6.0/no-libwrap.patch"
# content [fc32321b7bf0534d84414d6f1aac381c2ff2475f]
#
# add_file "packages/portmap/portmap-6.0/no-tcpd-support.patch"
# content [e0c8679553ae5264003fc7b888634771ed4c4f3d]
#
# add_file "packages/portmap/portmap_6.0.bb"
# content [ca392f1e64fd7197d9e3a2fda7b4573b8ca5f289]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [4d18aa56eca5e569ebbf0b616734cb7b5ca678fe]
# to [854daa8fca5bd432a53da00b9cfe542bb9051a48]
#
# patch "conf/distro/include/angstrom.inc"
# from [cd8e6ee81497e36eceda2ade49b5706c6f03d464]
# to [bc404e4b107f132331ca124ae5f643298bdf3840]
#
# patch "conf/machine/include/tune-arm1136jf-s.conf"
# from [5a3e5932acd2c4060744b80a29575afe2d4371c9]
# to [eb16d920f5e4b5c23d60ef7eeb3c4dc30ba84f11]
#
# patch "conf/machine/include/tune-arm920t.conf"
# from [207e404a30f6a151d53f88ddffbff128b41d77b3]
# to [90b20a2b9db56011eaade4f5842ba8b4a8584126]
#
# patch "conf/machine/include/tune-arm926ejs.conf"
# from [e966494e533757a3d1a62411aad183ba18be3ea3]
# to [c76a174d9339a3b351d5f39e293bf9321cac008f]
#
# patch "conf/machine/include/tune-xscale.conf"
# from [32838c82d74894c143d5d6c15c5202f982358479]
# to [8823c4bff3c359eb9700b6eafb600e2820f129a3]
#
# patch "packages/avahi/avahi-python_0.6.21.bb"
# from [3d4b1b5c3ed23ff0bab2bd72c1cdb67561178a56]
# to [91ec6e3aec765ad2c28ed09baa8424126d0b5baa]
#
# patch "packages/avahi/avahi.inc"
# from [8b9c1e9f1c3c321d890f95dad3f772fd5e727b12]
# to [caffb4223742bd86a6d49f717b86d9172d22e5e6]
#
# patch "packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch"
# from [fc88b8e91f46ae81818e65b7ee832fc7b3db915f]
# to [8b922bc76887bc8127d62d1af083f6868a493c90]
#
# patch "packages/fbreader/fbreader_0.8.2a.bb"
# from [bfe9fc8a8216d59eb9cfb3b1456b94f3ee163ef2]
# to [d21eeca9a1bb496e84541d55957587838aaa33e9]
#
# patch "packages/linux/linux/alix/defconfig"
# from [ae7429017290047c958a445063d17fcfbc5e4133]
# to [a71cc6d35024db907629ab4665daee048393e9fc]
#
# patch "packages/linux/linux-handhelds-2.6/h2200/defconfig"
# from [5567dff5dd14cc8563bdc9ccd4f03ae945e4c1d2]
# to [09af962af20bc3d0a2a4b656f06577e664c2ec7c]
#
# patch "packages/linux/linux_2.6.22+2.6.23-rc3.bb"
# from [077937f15108c34d551011de6665dfaddab3a820]
# to [f63ff8e509848ae02d7ff9d16a56f9b200db0082]
#
# patch "packages/linux/linux_2.6.22.bb"
# from [a7c4f5a30592c11bb5188d028c5c20b6ee98188e]
# to [75d1a2f2d12313c50fdfb2b412412a7b675c00d0]
#
# patch "packages/openssl/openssl_0.9.7g.bb"
# from [68560d0bda19a0b32c7f514bdb9cf445479e7406]
# to [145744ceb1c1d90a5eb05ddcd4947d5f569402ab]
#
# patch "packages/portmap/portmap.inc"
# from [fe3c7fd20199a597bf47cca11fec9bcafa5bc049]
# to [03a075d623238bc9402ae2882f8f05d638c80ab6]
#
============================================================
--- packages/alsa/alsa-lib/unbreak_plugindir.patch a16e20ebbbcde514ae86abd3664bf70c4279e5e3
+++ packages/alsa/alsa-lib/unbreak_plugindir.patch a16e20ebbbcde514ae86abd3664bf70c4279e5e3
@@ -0,0 +1,12 @@
+diff -Nur alsa-lib-1.0.14.orig/configure.in alsa-lib-1.0.14/configure.in
+--- alsa-lib-1.0.14.orig/configure.in 2007-05-31 03:05:13.000000000 -0500
++++ alsa-lib-1.0.14/configure.in 2007-08-18 13:05:49.000000000 -0500
+@@ -93,7 +93,7 @@
+ esac
+ plugindir="$dir/$PACKAGE"
+ fi
+-AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules])
++AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "${plugindir}", [directory containing ALSA add-on modules])
+ ALSA_PLUGIN_DIR="$plugindir"
+ AC_SUBST(ALSA_PLUGIN_DIR)
+
============================================================
--- packages/alsa/alsa-lib_1.0.14.bb 60431b66fbe642b84eebb662e02f977ce4cf8e9d
+++ packages/alsa/alsa-lib_1.0.14.bb 60431b66fbe642b84eebb662e02f977ce4cf8e9d
@@ -0,0 +1,44 @@
+DESCRIPTION = "Alsa sound library"
+HOMEPAGE = "http://www.alsa-project.org"
+SECTION = "libs/multimedia"
+LICENSE = "GPL"
+
+PR = "r1"
+
+# configure.in sets -D__arm__ on the command line for any arm system
+# (not just those with the ARM instruction set), this should be removed,
+# (or replaced by a permitted #define).
+#FIXME: remove the following
+ARM_INSTRUCTION_SET = "arm"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
+ file://fix-tstamp-declaration.patch;patch=1 \
+ file://unbreak_plugindir.patch;patch=1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes"
+
+do_stage () {
+ oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
+ install -d ${STAGING_INCDIR}/alsa/sound
+ install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/
+ install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/
+ install -d ${STAGING_DATADIR}/aclocal
+ install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev"
+FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
+FILES_libasound = "${libdir}/libasound.so.*"
+FILES_alsa-server = "${bindir}/*"
+FILES_alsa-conf = "${datadir}/alsa/"
+FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
+FILES_alsa-conf-base = "\
+${datadir}/alsa/alsa.conf \
+${datadir}/alsa/cards/aliases.conf \
+${datadir}/alsa/pcm/default.conf \
+${datadir}/alsa/pcm/dmix.conf \
+${datadir}/alsa/pcm/dsnoop.conf"
+
+RDEPENDS_libasound = "alsa-conf-base"
============================================================
--- packages/alsa/alsa-oss_1.0.14.bb 7ca8c991dd2976fe24201983328f2b96c073e203
+++ packages/alsa/alsa-oss_1.0.14.bb 7ca8c991dd2976fe24201983328f2b96c073e203
@@ -0,0 +1,17 @@
+DESCRIPTION = "Alsa OSS Compatibility Package"
+SECTION = "libs/multimedia"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2"
+
+inherit autotools
+
+do_configure_prepend () {
+ touch NEWS README AUTHORS ChangeLog
+}
+
+do_stage () {
+ oe_libinstall -C alsa -a -so libaoss ${STAGING_LIBDIR}
+ oe_libinstall -C alsa -a -so libalsatoss ${STAGING_LIBDIR}
+}
============================================================
--- packages/alsa/alsa-utils_1.0.14.bb a96036a12ca994ce724e4448bb897a719e94a500
+++ packages/alsa/alsa-utils_1.0.14.bb a96036a12ca994ce724e4448bb897a719e94a500
@@ -0,0 +1,61 @@
+DESCRIPTION = "ALSA Utilities"
+HOMEPAGE = "http://www.alsa-project.org"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib ncurses"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
+
+# lazy hack. needs proper fixing in gettext.m4, see
+# http://bugs.openembedded.org/show_bug.cgi?id=2348
+# please close bug and remove this comment when properly fixed
+#
+EXTRA_OECONF_linux-uclibc = "--disable-nls"
+EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls"
+
+inherit autotools
+
+# This are all packages that we need to make. Also, the now empty alsa-utils
+# ipk depend on them.
+
+PACKAGES += "\
+ alsa-utils-alsamixer \
+ alsa-utils-midi \
+ alsa-utils-aplay \
+ alsa-utils-amixer \
+ alsa-utils-aconnect \
+ alsa-utils-iecset \
+ alsa-utils-speakertest \
+ alsa-utils-aseqnet \
+ alsa-utils-aseqdump \
+ alsa-utils-alsaconf \
+ alsa-utils-alsactl "
+
+# We omit alsaconf, because
+# a) this is a bash script
+# b) it creates config files not suitable for OE-based distros
+
+FILES_${PN} = ""
+FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord"
+FILES_alsa-utils-amixer = "${bindir}/amixer"
+FILES_alsa-utils-alsamixer = "${bindir}/alsamixer"
+FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/"
+FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
+FILES_alsa-utils-aconnect = "${bindir}/aconnect"
+FILES_alsa-utils-aseqnet = "${bindir}/aseqnet"
+FILES_alsa-utils-iecset = "${bindir}/iecset"
+FILES_alsa-utils-alsactl = "${sbindir}/alsactl"
+FILES_alsa-utils-aseqdump = "${bindir}/aseqdump"
+FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf"
+
+DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA"
+DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings"
+DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings"
+DESCRIPTION_alsa-utils-speakertest = "ALSA surround speaker test utility"
+DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA"
+DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager"
+DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer"
+DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state"
+DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files"
+
+ALLOW_EMPTY_alsa-utils = "1"
============================================================
--- packages/linux/linux/alix/geode-mfgpt-clock-event-device-support.patch d0e230915059acdf6b19ea60e86d9936b545c098
+++ packages/linux/linux/alix/geode-mfgpt-clock-event-device-support.patch d0e230915059acdf6b19ea60e86d9936b545c098
@@ -0,0 +1,237 @@
+From: Andres Salomon <dilinger at queued.net>
+
+Add support for an MFGPT clock event device; this allows us to use MFGPTs as
+the basis for high-resolution timers.
+
+Signed-off-by: Jordan Crouse <jordan.crouse at amd.com>
+Signed-off-by: Andres Salomon <dilinger at debian.org>
+Cc: Andi Kleen <ak at suse.de>
+Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
+Cc: john stultz <johnstul at us.ibm.com>
+Cc: Thomas Gleixner <tglx at linutronix.de>
+Cc: Ingo Molnar <mingo at elte.hu>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+---
+
+ Documentation/kernel-parameters.txt | 4
+ arch/i386/Kconfig | 10 +
+ arch/i386/kernel/mfgpt.c | 165 ++++++++++++++++++++++++++
+ 3 files changed, 179 insertions(+)
+
+--- linux-2.6.22.orig/Documentation/kernel-parameters.txt
++++ linux-2.6.22/Documentation/kernel-parameters.txt
+@@ -1012,6 +1012,10 @@
+ meye.*= [HW] Set MotionEye Camera parameters
+ See Documentation/video4linux/meye.txt.
+
++ mfgpt_irq= [IA-32] Specify the IRQ to use for the
++ Multi-Function General Purpose Timers on AMD Geode
++ platforms.
++
+ mga= [HW,DRM]
+
+ migration_cost=
+--- linux-2.6.22.orig/arch/i386/Kconfig
++++ linux-2.6.22/arch/i386/Kconfig
+@@ -1190,6 +1190,16 @@
+ processor goes idle (as is done by the scheduler). The
+ other workaround is idle=poll boot option.
+
++config GEODE_MFGPT_TIMER
++ bool "Geode Multi-Function General Purpose Timer (MFGPT) events"
++ depends on MGEODE_LX && GENERIC_TIME && GENERIC_CLOCKEVENTS
++ default y
++ help
++ This driver provides a clock event source based on the MFGPT
++ timer(s) in the CS5535 and CS5536 companion chip for the geode.
++ MFGPTs have a better resolution and max interval than the
++ generic PIT, and are suitable for use as high-res timers.
++
+ config K8_NB
+ def_bool y
+ depends on AGP_AMD64
+--- linux-2.6.22.orig/arch/i386/kernel/mfgpt.c
++++ linux-2.6.22/arch/i386/kernel/mfgpt.c
+@@ -48,6 +48,12 @@
+ #define MFGPT_HZ (32000 / MFGPT_DIVISOR)
+ #define MFGPT_PERIODIC (MFGPT_HZ / HZ)
+
++#ifdef CONFIG_GEODE_MFGPT_TIMER
++static int __init mfgpt_timer_setup(void);
++#else
++#define mfgpt_timer_setup() (0)
++#endif
++
+ /* Allow for disabling of MFGPTs */
+ static int disable;
+ static int __init mfgpt_disable(char *s)
+@@ -82,6 +88,9 @@
+ }
+ }
+
++ /* set up clock event device, if desired */
++ i = mfgpt_timer_setup();
++
+ return count;
+ }
+
+@@ -197,3 +206,159 @@
+ return -1;
+ }
+ EXPORT_SYMBOL(geode_mfgpt_alloc_timer);
++
++#ifdef CONFIG_GEODE_MFGPT_TIMER
++
++/*
++ * The MFPGT timers on the CS5536 provide us with suitable timers to use
++ * as clock event sources - not as good as a HPET or APIC, but certainly
++ * better then the PIT. This isn't a general purpose MFGPT driver, but
++ * a simplified one designed specifically to act as a clock event source.
++ * For full details about the MFGPT, please consult the CS5536 data sheet.
++ */
++
++#include <linux/clocksource.h>
++#include <linux/clockchips.h>
++
++static unsigned int mfgpt_tick_mode = CLOCK_EVT_MODE_SHUTDOWN;
++static u16 mfgpt_event_clock;
++
++static int irq = 7;
++static int __init mfgpt_setup(char *str)
++{
++ get_option(&str, &irq);
++ return 1;
++}
++__setup("mfgpt_irq=", mfgpt_setup);
++
++static inline void mfgpt_disable_timer(u16 clock)
++{
++ u16 val = geode_mfgpt_read(clock, MFGPT_REG_SETUP);
++ geode_mfgpt_write(clock, MFGPT_REG_SETUP, val & ~MFGPT_SETUP_CNTEN);
++}
++
++static int mfgpt_next_event(unsigned long, struct clock_event_device *);
++static void mfgpt_set_mode(enum clock_event_mode, struct clock_event_device *);
++
++static struct clock_event_device mfgpt_clockevent = {
++ .name = "mfgpt-timer",
++ .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
++ .set_mode = mfgpt_set_mode,
++ .set_next_event = mfgpt_next_event,
++ .rating = 250,
++ .cpumask = CPU_MASK_ALL,
++ .shift = 32
++};
++
++static inline void mfgpt_start_timer(u16 clock, u16 delta)
++{
++ geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_CMP2, (u16) delta);
++ geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_COUNTER, 0);
++
++ geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_SETUP,
++ MFGPT_SETUP_CNTEN | MFGPT_SETUP_CMP2);
++}
++
++static void mfgpt_set_mode(enum clock_event_mode mode,
++ struct clock_event_device *evt)
++{
++ mfgpt_disable_timer(mfgpt_event_clock);
++
++ if (mode == CLOCK_EVT_MODE_PERIODIC)
++ mfgpt_start_timer(mfgpt_event_clock, MFGPT_PERIODIC);
++
++ mfgpt_tick_mode = mode;
++}
++
++static int mfgpt_next_event(unsigned long delta, struct clock_event_device *evt)
++{
++ mfgpt_start_timer(mfgpt_event_clock, delta);
++ return 0;
++}
++
++/* Assume (foolishly?), that this interrupt was due to our tick */
++
++static irqreturn_t mfgpt_tick(int irq, void *dev_id)
++{
++ if (mfgpt_tick_mode == CLOCK_EVT_MODE_SHUTDOWN)
++ return IRQ_HANDLED;
++
++ /* Turn off the clock */
++ mfgpt_disable_timer(mfgpt_event_clock);
++
++ /* Clear the counter */
++ geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_COUNTER, 0);
++
++ /* Restart the clock in periodic mode */
++
++ if (mfgpt_tick_mode == CLOCK_EVT_MODE_PERIODIC) {
++ geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_SETUP,
++ MFGPT_SETUP_CNTEN | MFGPT_SETUP_CMP2);
++ }
++
++ mfgpt_clockevent.event_handler(&mfgpt_clockevent);
++ %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r9b318dc0ed758bbc0cbe978a0ff4471831b1df53 -r9e3f287c579cb592207f2e225ab8735174982867
#
#
#
# add_dir "packages/base-files/base-files/gumstix-connex"
#
# add_dir "packages/base-files/base-files/gumstix-verdex"
#
# add_file "packages/base-files/base-files/gumstix-connex/fstab"
# content [41dbd341dd76afdef10b78b4333320b8ed4752ca]
#
# add_file "packages/base-files/base-files/gumstix-verdex/fstab"
# content [60ebb29ec9fb9e06dc20abd4fd3b49d9c21f277c]
#
# patch "conf/machine/gumstix-connex.conf"
# from [40931b717032f2f77d845644dd98f36188404e43]
# to [0903ecc3169560cf41fbd2d7ac041fe5500bae63]
#
# patch "conf/machine/gumstix-verdex.conf"
# from [634247a26215a0709ef800ab53ad7f65b87b5342]
# to [04af755da5ac1ae0a6ca0357f3ebd3488923d7ba]
#
# patch "conf/machine/include/gumstix.inc"
# from [a650e6c9c2788b0d9289abdda0b9ed9e3e8ded38]
# to [8cece65d17833204e5ccdd15bd8c7c456a999ebd]
#
# patch "conf/machine/omap5912osk.conf"
# from [ee00da09140e71d024034162717e88ea68d14d11]
# to [86e7eca5b6d5f581a0d4cfe3327b0782cbb54d26]
#
# patch "packages/base-files/base-files/omap5912osk/fstab"
# from [2e8d39b7b7fcf8fc007b1e25a9cab4b21e409ff9]
# to [b1424544f95fef68b0973f843d84ed26a12f2fc0]
#
============================================================
--- packages/base-files/base-files/gumstix-connex/fstab 41dbd341dd76afdef10b78b4333320b8ed4752ca
+++ packages/base-files/base-files/gumstix-connex/fstab 41dbd341dd76afdef10b78b4333320b8ed4752ca
@@ -0,0 +1,11 @@
+# fstab for gumstix-connex
+
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+sysfs /sys sysfs defaults 0 0
+tmpfs /dev tmpfs defaults 0 0
+devpts /dev/pts devpts gid=5,mode=620 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /media/ram tmpfs defaults 0 0
+
============================================================
--- packages/base-files/base-files/gumstix-verdex/fstab 60ebb29ec9fb9e06dc20abd4fd3b49d9c21f277c
+++ packages/base-files/base-files/gumstix-verdex/fstab 60ebb29ec9fb9e06dc20abd4fd3b49d9c21f277c
@@ -0,0 +1,11 @@
+# fstab for gumstix-verdex
+
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+sysfs /sys sysfs defaults 0 0
+tmpfs /dev tmpfs defaults 0 0
+devpts /dev/pts devpts gid=5,mode=620 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /media/ram tmpfs defaults 0 0
+
============================================================
--- conf/machine/gumstix-connex.conf 40931b717032f2f77d845644dd98f36188404e43
+++ conf/machine/gumstix-connex.conf 0903ecc3169560cf41fbd2d7ac041fe5500bae63
@@ -1,2 +1,6 @@ require conf/machine/include/gumstix.inc
require conf/machine/include/gumstix.inc
+MACHINE_FEATURES += " usbgadget "
+
+GUMSTIX_400MHZ = "y"
+
============================================================
--- conf/machine/gumstix-verdex.conf 634247a26215a0709ef800ab53ad7f65b87b5342
+++ conf/machine/gumstix-verdex.conf 04af755da5ac1ae0a6ca0357f3ebd3488923d7ba
@@ -1,4 +1,6 @@ PACKAGE_EXTRA_ARCHS += " iwmmxt "
require conf/machine/include/gumstix.inc
PACKAGE_EXTRA_ARCHS += " iwmmxt "
+MACHINE_FEATURES += " usbhost "
+
============================================================
--- conf/machine/include/gumstix.inc a650e6c9c2788b0d9289abdda0b9ed9e3e8ded38
+++ conf/machine/include/gumstix.inc 8cece65d17833204e5ccdd15bd8c7c456a999ebd
@@ -13,17 +13,13 @@ module_autoload_g_ether = "g_ether"
module_autoload_gumstix_gadget = "gumstix_gadget"
module_autoload_g_ether = "g_ether"
-OLDEST_KERNEL = "2.6.15"
-
UBOOT_ENTRYPOINT = "a0008000"
#Assume people have some gumstix extension boards
-MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget bluetooth"
+MACHINE_FEATURES = "kernel26 alsa ext2 bluetooth"
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash"
-GUMSTIX_400MHZ = "y"
-
MACHINE_EXTRA_RRECOMMENDS = "kernel-module-unix \
kernel-module-rtc-core \
kernel-module-rtc-dev \
============================================================
--- conf/machine/omap5912osk.conf ee00da09140e71d024034162717e88ea68d14d11
+++ conf/machine/omap5912osk.conf 86e7eca5b6d5f581a0d4cfe3327b0782cbb54d26
@@ -1,15 +1,12 @@ TARGET_ARCH = "arm"
#@TYPE: Machine
#@NAME: OMAP5912 cpu on an OSK board
#@DESCRIPTION: Machine configuration for the OMAP Starter Kit with a 5912 processor
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
-HOTPLUG = "udev"
-
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
# PREFERRED_VERSION_u-boot = "1.1.6"
@@ -30,24 +27,3 @@ require conf/machine/include/tune-arm926
require conf/machine/include/tune-arm926ejs.conf
-# old modules setup - partially need to be added into MACHINE_EXTRA_RRECOMMENDS
-
-# PCMCIA Modules
-##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia"
-##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-omap-cf"
-
-# IDE modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-cs kernel-module-ide-disk"
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-core"
-
-# DOS and VFAT modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-msdos kernel-module-nls-iso8859-1"
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nls-cp437 kernel-module-nls-base"
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-vfat kernel-module-fat"
-
-# Video er LCD Driver
-##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-fb kernel-module-cfbimgblt kernel-module-cfbcopyarea"
-##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kernel-module-softcursor"
-
-# DSP Interface
-##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp"
============================================================
--- packages/base-files/base-files/omap5912osk/fstab 2e8d39b7b7fcf8fc007b1e25a9cab4b21e409ff9
+++ packages/base-files/base-files/omap5912osk/fstab b1424544f95fef68b0973f843d84ed26a12f2fc0
@@ -1,9 +1,10 @@ proc /proc
# fstab for omap5912osk
rootfs / auto defaults 1 1
proc /proc proc defaults 0 0
-sysfs /sysfs sysfs defaults 0 0
+sysfs /sys sysfs defaults 0 0
tmpfs /dev tmpfs defaults 0 0
+devpts /dev/pts devpts gid=5,mode=620 0 0
tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /media/ram tmpfs defaults 0 0
More information about the Openembedded-commits
mailing list