diff options
| author | Khem Raj <raj.khem@gmail.com> | 2009-04-14 16:31:48 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-04-14 16:31:48 -0700 |
| commit | 3189734f8d6b1287c757cb9664d7e045ab3c57d7 (patch) | |
| tree | 5c3d50c45086d94994eb5c750f3c3d9ae9b5c924 /recipes | |
| parent | 9396869c27c4f4cbf093c356a8df20965ee929ad (diff) | |
| parent | 06b6c395daf1cc41c95f8e2f094ea3b1e97d6d7b (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes')
99 files changed, 3144 insertions, 824 deletions
diff --git a/recipes/angstrom/angstrom-gpe-task-base.bb b/recipes/angstrom/angstrom-gpe-task-base.bb index 656180d4b3..f2c897dfb7 100644 --- a/recipes/angstrom/angstrom-gpe-task-base.bb +++ b/recipes/angstrom/angstrom-gpe-task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r36" +PR = "r37" inherit task @@ -36,7 +36,6 @@ RDEPENDS_${PN} = "\ gdk-pixbuf-loader-jpeg \ pango-module-basic-x \ pango-module-basic-fc \ - ${@base_contains("COMBINED_FEATURES", "bluetooth", "gpe-bluetooth", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "bluetooth", "bluez-gnome", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "bluetooth", "gnome-bluetooth", "",d)} \ " diff --git a/recipes/asterisk/asterisk-1.4.23.1/Makefile.patch b/recipes/asterisk/asterisk-1.4.23.1/Makefile.patch new file mode 100644 index 0000000000..98345f4dce --- /dev/null +++ b/recipes/asterisk/asterisk-1.4.23.1/Makefile.patch @@ -0,0 +1,21 @@ +diff -Nurd asterisk-1.4.23.1.orig/Makefile asterisk-1.4.23.1/Makefile +--- asterisk-1.4.23.1.orig/Makefile 2008-11-29 17:58:29.000000000 +0100 ++++ asterisk-1.4.23.1/Makefile 2009-02-25 11:17:22.000000000 +0100 +@@ -125,7 +125,7 @@ + ASTSBINDIR=$(sbindir) + ASTSPOOLDIR=$(localstatedir)/spool/asterisk + ASTLOGDIR=$(localstatedir)/log/asterisk +- ASTVARRUNDIR=$(localstatedir)/run ++ ASTVARRUNDIR=$(localstatedir)/run/asterisk + ASTMANDIR=$(mandir) + ifneq ($(findstring BSD,$(OSARCH)),) + ASTVARLIBDIR=$(prefix)/share/asterisk +@@ -513,7 +513,7 @@ + @exit 1 + endif + +-install: badshell datafiles bininstall ++install: badshell datafiles bininstall samples + @if [ -x /usr/sbin/asterisk-post-install ]; then \ + /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ + fi diff --git a/recipes/asterisk/asterisk-1.4.23.1/init b/recipes/asterisk/asterisk-1.4.23.1/init new file mode 100644 index 0000000000..d53a9a1e5e --- /dev/null +++ b/recipes/asterisk/asterisk-1.4.23.1/init @@ -0,0 +1,77 @@ +#! /bin/sh +# +# This is an init script for openembedded +# Copy it to /etc/init.d/callweaver and type +# > update-rc.d asterisk defaults 60 +# +asterisk=/usr/sbin/asterisk +pidfile=/var/run/asterisk/asterisk.pid +asterisk_args="-npqT -U asterisk -G asterisk" + +test -x "$asterisk" || exit 0 + +case "$1" in + start) + echo -n "Starting Asterisk" + start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args + echo "." + ;; + stop) + echo -n "Stopping Asterisk" + $asterisk -rx "stop gracefully" + sleep 4 + if [ -f $pidfile ]; then + start-stop-daemon --stop --quiet --pidfile $pidfile + fi + echo "." + ;; + force-stop) + echo -n "Stopping Asterisk" + $asterisk -rx "stop now" + sleep 2 + if [ -f $pidfile ]; then + start-stop-daemon --stop --quiet --pidfile $pidfile + fi + echo "." + ;; + restart) + echo -n "Restarting Asterisk" + if [ -f $pidfile ]; then + $asterisk -rx "restart gracefully" + sleep 2 + else + start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args + fi + echo "." + ;; + force-restart) + echo -n "Forcibly Restarting Asterisk" + if [ -f $pidfile ]; then + $asterisk -rx "restart now" + sleep 2 + else + start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args + fi + echo "." + ;; + reload) + echo -n "Reloading Asterisk Configuration" + if [ -f $pidfile ]; then + $asterisk -rx "reload" + else + start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args + fi + echo "." + ;; + logger-reload) + if [ -f $pidfile ]; then + $asterisk -rx "logger reload" + fi + ;; + *) + echo "Usage: /etc/init.d/asterisk {start|stop|force-stop|restart|force-restart|reload|logger-reload}" + exit 1 +esac + +exit 0 + diff --git a/recipes/asterisk/asterisk-1.4.23.1/logrotate b/recipes/asterisk/asterisk-1.4.23.1/logrotate new file mode 100644 index 0000000000..dfd25ee55c --- /dev/null +++ b/recipes/asterisk/asterisk-1.4.23.1/logrotate @@ -0,0 +1,12 @@ +/var/log/asterisk/cdr-csv/Master.csv /var/log/asterisk/cdr-custom/Master.csv /var/log/asterisk/queue_log /var/log/asterisk/event_log /var/log/asterisk/messages { + daily + missingok + compress + delaycompress + rotate 30 + sharedscripts + postrotate + /etc/init.d/asterisk logger-reload + endscript +} + diff --git a/recipes/asterisk/asterisk-1.4.23.1/sounds.xml.patch b/recipes/asterisk/asterisk-1.4.23.1/sounds.xml.patch new file mode 100644 index 0000000000..2a02bf6b38 --- /dev/null +++ b/recipes/asterisk/asterisk-1.4.23.1/sounds.xml.patch @@ -0,0 +1,19 @@ +diff -Nurd asterisk-1.4.23.1.orig/sounds/sounds.xml asterisk-1.4.23.1/sounds/sounds.xml +--- asterisk-1.4.23.1.orig/sounds/sounds.xml 2006-10-25 19:08:58.000000000 +0200 ++++ asterisk-1.4.23.1/sounds/sounds.xml 2009-02-25 11:19:13.000000000 +0100 +@@ -6,7 +6,6 @@ + <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format"> + </member> + <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" > +- <defaultenabled>yes</defaultenabled> + </member> + <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format"> + </member> +@@ -39,7 +38,6 @@ + </category> + <category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes"> + <member name="MOH-FREEPLAY-WAV" displayname="FreePlay Music On Hold Files, WAV format" > +- <defaultenabled>yes</defaultenabled> + </member> + <member name="MOH-FREEPLAY-ULAW" displayname="FreePlay Music On Hold Files, mu-Law format" > + </member> diff --git a/recipes/asterisk/asterisk-1.4.23.1/volatiles b/recipes/asterisk/asterisk-1.4.23.1/volatiles new file mode 100644 index 0000000000..c68e786c90 --- /dev/null +++ b/recipes/asterisk/asterisk-1.4.23.1/volatiles @@ -0,0 +1,7 @@ +d asterisk asterisk 0775 /var/run/asterisk none +d asterisk asterisk 0775 /var/lib/asterisk none +d asterisk asterisk 0775 /var/log/asterisk none +d asterisk asterisk 0775 /var/log/asterisk/cdr-csv none +d asterisk asterisk 0775 /var/log/asterisk/cdr-custom none +d asterisk asterisk 0775 /var/spool/asterisk/outgoing none +d asterisk asterisk 0775 /var/spool/asterisk/voicemail none diff --git a/recipes/asterisk/asterisk_1.4.23.1.bb b/recipes/asterisk/asterisk_1.4.23.1.bb new file mode 100644 index 0000000000..f9f8399021 --- /dev/null +++ b/recipes/asterisk/asterisk_1.4.23.1.bb @@ -0,0 +1,165 @@ +# Copyright (C) 2007-2008, Stelios Koroneos - Digital OPSiS, All Rights Reserved +# Released under the MIT license (see packages/COPYING) +DESCRIPTION = "The Asterisk open source software PBX" +HOMEPAGE = "http://www.asterisk.org" +LICENSE = "GPLv2" +PRIORITY = "optional" +SECTION = "console/telephony" +DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis" +#RRECOMMENDS_${PN} = "logrotate" + +SRC_URI="http://downloads.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ + file://sounds.xml.patch;patch=1 \ + file://Makefile.patch;patch=1 \ + file://logrotate \ + file://volatiles \ + file://init" + +ARCH_efika="powerpc" +ARCH_dht-walnut="powerpc" +ARCH_magicbox="powerpc" +ARCH_sequoia="powerpc" + +INITSCRIPT_NAME = "asterisk" +INITSCRIPT_PARAMS = "defaults 60" + +inherit autotools update-rc.d + +EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR} \ + --with-z=${STAGING_EXECPREFIXDIR} \ + --with-curl=${STAGING_EXECPREFIXDIR} \ + --with-termcap=${STAGING_EXECPREFIXDIR} \ + --with-ogg=${STAGING_EXECPREFIXDIR} \ + --with-vorbis=${STAGING_EXECPREFIXDIR} \ + --with-sqlite=${STAGING_EXECPREFIXDIR} \ + --with-popt=${STAGING_EXECPREFIXDIR} \ + --with-gnutls=${STAGING_EXECPREFIXDIR} \ + --without-curses\ + --with-ncurses=${STAGING_EXECPREFIXDIR} \ + --without-imap\ + --without-netsnmp\ + --without-odbc\ + --without-osptk\ + --without-nbs\ + --without-pwlib\ + --without-radius\ + --without-tds\ + --without-postgres\ + --without-zaptel\ + " + +#export NOISY_BUILD=yes + +export ASTCFLAGS = "-fsigned-char -I${STAGING_INCDIR} -DPATH_MAX=4096" +export ASTLDFLAGS="${LDFLAGS} -lpthread -ldl -lresolv " +export PROC="${ARCH}" + +do_configure_prepend () { + sed -i 's:/var:${localstatedir}:' ${WORKDIR}/logrotate + sed -i 's:/etc/init.d:${sysconfdir}/init.d:' ${WORKDIR}/logrotate + sed -i 's:/var:${localstatedir}:' ${WORKDIR}/volatiles +} + +do_configure () { + # Looks like rebuilding configure doesn't work, so we are skipping + # that and are just using the shipped one + # gnu-configize + # libtoolize --force + oe_runconf +} + + +do_compile() { + ( + #make sure that menuselect gets build using host toolchain + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS RANLIB + cd menuselect + ./configure + oe_runmake + cd ../ + ) || exit 1 + oe_runmake +} + +do_install_append() { + install -d ${D}${sysconfdir}/init.d/ + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/asterisk + install -c -D -m 644 ${WORKDIR}/logrotate ${D}${sysconfdir}/logrotate.d/asterisk + install -c -D -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/asterisk +} + +pkg_postinst_prepend() { + grep -q asterisk ${sysconfdir}/group || addgroup --system asterisk + grep -q asterisk ${sysconfdir}/passwd || adduser --system --home ${localstatedir}/run/asterisk --no-create-home --disabled-password --ingroup asterisk -s ${base_bindir}/false asterisk + chown -R asterisk:asterisk ${libdir}/asterisk ${localstatedir}/lib/asterisk ${localstatedir}/spool/asterisk ${localstatedir}/log/asterisk ${localstatedir}/run/asterisk ${sysconfdir}/asterisk +} + +do_stage() { + autotools_stage_all +} + +FILES_${PN} += "${libdir}/asterisk/modules/*" +FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug \ + ${localstatedir}/lib/asterisk/*/.debug" + +CONFFILES_${PN} += "${sysconfdir}/asterisk/adsi.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/adtranvofr.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/agents.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/alarmreceiver.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/alsa.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/amd.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/asterisk.adsi" +CONFFILES_${PN} += "${sysconfdir}/asterisk/asterisk.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_custom.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_manager.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_odbc.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_pgsql.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_tds.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/codecs.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/dnsmgr.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/dundi.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/enum.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/extconfig.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/extensions.ael" +CONFFILES_${PN} += "${sysconfdir}/asterisk/extensions.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/features.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/festival.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/followme.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/func_odbc.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/gtalk.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/h323.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/http.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/iax.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/iaxprov.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/indications.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/jabber.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/logger.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/manager.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/meetme.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/mgcp.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/misdn.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/modules.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/musiconhold.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/muted.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/osp.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/oss.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/phone.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/privacy.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/queues.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/res_odbc.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/res_snmp.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/rpt.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/rtp.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/say.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/sip.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/sip_notify.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/skinny.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/sla.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/smdi.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/telcordia-1.adsi" +CONFFILES_${PN} += "${sysconfdir}/asterisk/udptl.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/users.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/voicemail.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/vpb.conf" +CONFFILES_${PN} += "${sysconfdir}/logrotate.d/asterisk" diff --git a/recipes/bluez/bluez4_4.35.bb b/recipes/bluez/bluez4_4.35.bb new file mode 100644 index 0000000000..fec1411d00 --- /dev/null +++ b/recipes/bluez/bluez4_4.35.bb @@ -0,0 +1,66 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland V4" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "gst-plugins-base alsa-lib libusb-compat dbus-glib" +HOMEPAGE = "http://www.bluez.org" +LICENSE = "GPL" + +# For angstrom we want this to replace at least bluez-libs +PROVIDES_append_angstrom = " bluez-libs" + +PR = "r1" + +SRC_URI = "\ + http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \ + file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \ + file://sbc-thumb.patch;patch=1 \ + file://bluetooth.conf \ +" +S = "${WORKDIR}/bluez-${PV}" + +inherit autotools_stage +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +EXTRA_OECONF = "\ + --enable-gstreamer \ + --enable-alsa \ + --enable-usb \ + --enable-netlink \ + --enable-tools \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-dfutool \ + --enable-hidd \ + --enable-pandd \ + --enable-dund \ + --disable-cups \ + --enable-test \ + --enable-manpages \ + --enable-configfiles \ + --enable-initscripts \ + --disable-pcmciarules \ +" + +do_install_append() { + install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/ + install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/ + install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/ + # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT + install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/ +} + +PACKAGES =+ "gst-plugin-bluez libasound-module-bluez" + +FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so" +FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so" +FILES_${PN} += "${libdir}/bluetooth/plugins/*.so" +FILES_${PN}-dev += "\ + ${libdir}/bluetooth/plugins/*.la \ + ${libdir}/alsa-lib/*.la \ + ${libdir}/gstreamer-0.10/*.la \ +" + +FILES_${PN}-dbg += "\ + ${libdir}/bluetooth/plugins/.debug \ + ${libdir}/*/.debug \ +" diff --git a/recipes/bluez/obexd_0.10.bb b/recipes/bluez/obexd_0.10.bb new file mode 100644 index 0000000000..e1cc6ce8ff --- /dev/null +++ b/recipes/bluez/obexd_0.10.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "OBEX Server and Client" +DEPENDS = "openobex glib-2.0 dbus bluez4" + +LICENSE = "GPLv2" + +SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/obexd-${PV}.tar.gz" + +inherit autotools_stage + +FILES_${PN} += "${datadir}/dbus-1/" diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch new file mode 100644 index 0000000000..0a5e6806dd --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch @@ -0,0 +1,46 @@ +diff -urpN busybox-1.13.2/editors/awk.c busybox-1.13.2-awk/editors/awk.c +--- busybox-1.13.2/editors/awk.c 2008-11-09 18:28:21.000000000 +0100 ++++ busybox-1.13.2-awk/editors/awk.c 2009-02-26 12:17:05.000000000 +0100 +@@ -392,8 +392,12 @@ static const uint16_t PRIMES[] ALIGN2 = + + + /* Globals. Split in two parts so that first one is addressed +- * with (mostly short) negative offsets */ ++ * with (mostly short) negative offsets. ++ * NB: it's unsafe to put members of type "double" ++ * into globals2 (gcc may fail to align them). ++ */ + struct globals { ++ double t_double; + chain beginseq, mainseq, endseq; + chain *seq; + node *break_ptr, *continue_ptr; +@@ -442,16 +446,16 @@ struct globals2 { + tsplitter exec_builtin__tspl; + + /* biggest and least used members go last */ +- double t_double; + tsplitter fsplitter, rsplitter; + }; + #define G1 (ptr_to_globals[-1]) + #define G (*(struct globals2 *)ptr_to_globals) + /* For debug. nm --size-sort awk.o | grep -vi ' [tr] ' */ +-/* char G1size[sizeof(G1)]; - 0x6c */ +-/* char Gsize[sizeof(G)]; - 0x1cc */ ++/*char G1size[sizeof(G1)]; - 0x74 */ ++/*char Gsize[sizeof(G)]; - 0x1c4 */ + /* Trying to keep most of members accessible with short offsets: */ +-/* char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */ ++/*char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */ ++#define t_double (G1.t_double ) + #define beginseq (G1.beginseq ) + #define mainseq (G1.mainseq ) + #define endseq (G1.endseq ) +@@ -479,7 +483,6 @@ struct globals2 { + #define t_info (G.t_info ) + #define t_tclass (G.t_tclass ) + #define t_string (G.t_string ) +-#define t_double (G.t_double ) + #define t_lineno (G.t_lineno ) + #define t_rollback (G.t_rollback ) + #define intvar (G.intvar ) diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch new file mode 100644 index 0000000000..9524f5281a --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch @@ -0,0 +1,17 @@ +--- busybox-1.13.2/include/libbb.h Wed Dec 31 04:06:45 2008 ++++ busybox-1.13.2-killall/include/libbb.h Sat Feb 14 02:41:18 2009 +@@ -1275,7 +1275,13 @@ + PSSCAN_UTIME = 1 << 13, + PSSCAN_TTY = 1 << 14, + PSSCAN_SMAPS = (1 << 15) * ENABLE_FEATURE_TOPMEM, +- PSSCAN_ARGVN = (1 << 16) * (ENABLE_PGREP || ENABLE_PKILL || ENABLE_PIDOF), ++ /* NB: used by find_pid_by_name(). Any applet using it ++ * needs to be mentioned here. */ ++ PSSCAN_ARGVN = (1 << 16) * (ENABLE_KILLALL ++ || ENABLE_PGREP || ENABLE_PKILL ++ || ENABLE_PIDOF ++ || ENABLE_SESTATUS ++ ), + USE_SELINUX(PSSCAN_CONTEXT = 1 << 17,) + PSSCAN_START_TIME = 1 << 18, + PSSCAN_CPU = 1 << 19, diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch new file mode 100644 index 0000000000..281d457065 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch @@ -0,0 +1,21 @@ +diff -urpN busybox-1.13.2/coreutils/printf.c busybox-1.13.2-printf/coreutils/printf.c +--- busybox-1.13.2/coreutils/printf.c 2008-12-31 04:06:45.000000000 +0100 ++++ busybox-1.13.2-printf/coreutils/printf.c 2009-03-03 15:13:12.000000000 +0100 +@@ -139,14 +139,14 @@ static void print_direc(char *format, un + char saved; + char *have_prec, *have_width; + ++ saved = format[fmt_length]; ++ format[fmt_length] = '\0'; ++ + have_prec = strstr(format, ".*"); + have_width = strchr(format, '*'); + if (have_width - 1 == have_prec) + have_width = NULL; + +- saved = format[fmt_length]; +- format[fmt_length] = '\0'; +- + switch (format[fmt_length - 1]) { + case 'c': + printf(format, *argument); diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch new file mode 100644 index 0000000000..1c24cdcc55 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch @@ -0,0 +1,30 @@ +diff -urpN busybox-1.13.2/sysklogd/syslogd.c busybox-1.13.2-syslogd/sysklogd/syslogd.c +--- busybox-1.13.2/sysklogd/syslogd.c 2008-11-09 18:28:03.000000000 +0100 ++++ busybox-1.13.2-syslogd/sysklogd/syslogd.c 2009-03-08 02:03:24.000000000 +0100 +@@ -301,17 +301,23 @@ static void log_locally(time_t now, char + } + #endif + if (G.logFD >= 0) { ++ /* Reopen log file every second. This allows admin ++ * to delete the file and not worry about restarting us. ++ * This costs almost nothing since it happens ++ * _at most_ once a second. ++ */ + if (!now) + now = time(NULL); + if (G.last_log_time != now) { +- G.last_log_time = now; /* reopen log file every second */ ++ G.last_log_time = now; + close(G.logFD); + goto reopen; + } + } else { + reopen: +- G.logFD = device_open(G.logFilePath, O_WRONLY | O_CREAT +- | O_NOCTTY | O_APPEND | O_NONBLOCK); ++ G.logFD = open(G.logFilePath, O_WRONLY | O_CREAT ++ | O_NOCTTY | O_APPEND | O_NONBLOCK, ++ 0666); + if (G.logFD < 0) { + /* cannot open logfile? - print to /dev/console then */ + int fd = device_open(DEV_CONSOLE, O_WRONLY | O_NOCTTY | O_NONBLOCK); diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch new file mode 100644 index 0000000000..25ee861593 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch @@ -0,0 +1,12 @@ +diff -urpN busybox-1.13.2/procps/top.c busybox-1.13.2-top24/procps/top.c +--- busybox-1.13.2/procps/top.c 2008-11-09 18:28:20.000000000 +0100 ++++ busybox-1.13.2-top24/procps/top.c 2009-03-02 22:24:31.000000000 +0100 +@@ -200,7 +200,7 @@ static NOINLINE int read_cpu_jiffy(FILE + &p_jif->usr, &p_jif->nic, &p_jif->sys, &p_jif->idle, + &p_jif->iowait, &p_jif->irq, &p_jif->softirq, + &p_jif->steal); +- if (ret > 4) { ++ if (ret >= 4) { + p_jif->total = p_jif->usr + p_jif->nic + p_jif->sys + p_jif->idle + + p_jif->iowait + p_jif->irq + p_jif->softirq + p_jif->steal; + /* procps 2.x does not count iowait as busy time */ diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch new file mode 100644 index 0000000000..6b3f713ac5 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch @@ -0,0 +1,12 @@ +diff -urpN busybox-1.13.2/archival/unzip.c busybox-1.13.2-unzip/archival/unzip.c +--- busybox-1.13.2/archival/unzip.c 2008-11-09 18:28:02.000000000 +0100 ++++ busybox-1.13.2-unzip/archival/unzip.c 2009-02-26 12:17:21.000000000 +0100 +@@ -140,7 +140,7 @@ struct BUG_cde_header_must_be_16_bytes { + }; + + #define FIX_ENDIANNESS_CDE(cde_header) do { \ +- (cde_header).formatted.cds_offset = SWAP_LE16((cde_header).formatted.cds_offset); \ ++ (cde_header).formatted.cds_offset = SWAP_LE32((cde_header).formatted.cds_offset); \ + } while (0) + + enum { zip_fd = 3 }; diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch new file mode 100644 index 0000000000..862467fd68 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch @@ -0,0 +1,41 @@ +diff -urpN busybox-1.13.2/networking/wget.c busybox-1.13.2-wget/networking/wget.c +--- busybox-1.13.2/networking/wget.c 2008-11-09 18:27:59.000000000 +0100 ++++ busybox-1.13.2-wget/networking/wget.c 2009-03-02 16:07:12.000000000 +0100 +@@ -417,15 +417,17 @@ int wget_main(int argc UNUSED_PARAM, cha + KEY_content_length = 1, KEY_transfer_encoding, KEY_chunked, KEY_location + }; + enum { +- WGET_OPT_CONTINUE = 0x1, +- WGET_OPT_SPIDER = 0x2, +- WGET_OPT_QUIET = 0x4, +- WGET_OPT_OUTNAME = 0x8, +- WGET_OPT_PREFIX = 0x10, +- WGET_OPT_PROXY = 0x20, +- WGET_OPT_USER_AGENT = 0x40, +- WGET_OPT_PASSIVE = 0x80, +- WGET_OPT_HEADER = 0x100, ++ WGET_OPT_CONTINUE = (1 << 0), ++ WGET_OPT_SPIDER = (1 << 1), ++ WGET_OPT_QUIET = (1 << 2), ++ WGET_OPT_OUTNAME = (1 << 3), ++ WGET_OPT_PREFIX = (1 << 4), ++ WGET_OPT_PROXY = (1 << 5), ++ WGET_OPT_USER_AGENT = (1 << 6), ++ WGET_OPT_RETRIES = (1 << 7), ++ WGET_OPT_NETWORK_READ_TIMEOUT = (1 << 8), ++ WGET_OPT_PASSIVE = (1 << 9), ++ WGET_OPT_HEADER = (1 << 10), + }; + #if ENABLE_FEATURE_WGET_LONG_OPTIONS + static const char wget_longopts[] ALIGN1 = +@@ -437,6 +439,10 @@ int wget_main(int argc UNUSED_PARAM, cha + "directory-prefix\0" Required_argument "P" + "proxy\0" Required_argument "Y" + "user-agent\0" Required_argument "U" ++ /* Ignored: */ ++ // "tries\0" Required_argument "t" ++ // "timeout\0" Required_argument "T" ++ /* Ignored (we always use PASV): */ + "passive-ftp\0" No_argument "\xff" + "header\0" Required_argument "\xfe" + ; diff --git a/recipes/busybox/busybox_1.13.2.bb b/recipes/busybox/busybox_1.13.2.bb index 8ecbc1e0e8..602e782d4d 100644 --- a/recipes/busybox/busybox_1.13.2.bb +++ b/recipes/busybox/busybox_1.13.2.bb @@ -1,13 +1,20 @@ require busybox.inc -PR = "r17" +PR = "r18" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + file://busybox-1.13.2-awk.patch;patch=1 \ file://busybox-1.13.2-depmod.patch;patch=1 \ file://busybox-1.13.2-init.patch;patch=1 \ + file://busybox-1.13.2-killall.patch;patch=1 \ file://busybox-1.13.2-mdev.patch;patch=1 \ file://busybox-1.13.2-modprobe.patch;patch=1 \ + file://busybox-1.13.2-printf.patch;patch=1 \ + file://busybox-1.13.2-syslogd.patch;patch=1 \ file://busybox-1.13.2-tar.patch;patch=1 \ + file://busybox-1.13.2-top24.patch;patch=1 \ + file://busybox-1.13.2-unzip.patch;patch=1 \ + file://busybox-1.13.2-wget.patch;patch=1 \ \ file://udhcpscript.patch;patch=1 \ file://udhcpc-fix-nfsroot.patch;patch=1 \ diff --git a/recipes/dsplink/gstreamer-ti_svn.bb b/recipes/dsplink/gstreamer-ti_svn.bb index 6944ad59b8..f3eb7dd01b 100644 --- a/recipes/dsplink/gstreamer-ti_svn.bb +++ b/recipes/dsplink/gstreamer-ti_svn.bb @@ -2,7 +2,7 @@ DEPENDS = "ti-codec-engine ti-dmai gstreamer gst-plugins-base gst-plugins-good g SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https;user=anonymous;pswd='' \ " -SRCREV = "160" +SRCREV = "177" PR = "${MACHINE_KERNEL_PR}" diff --git a/recipes/dsplink/ti-codec-engine_2.21.bb b/recipes/dsplink/ti-codec-engine_2.21.bb index f0b0d7e1ce..d0cd18e8e9 100644 --- a/recipes/dsplink/ti-codec-engine_2.21.bb +++ b/recipes/dsplink/ti-codec-engine_2.21.bb @@ -1,5 +1,9 @@ require dsplink.inc +INSANE_SKIP_ti-codec-engine-apps = True +INSANE_SKIP_ti-dsplink-apps = True +INSANE_SKIP_${PN} = True + DESCRIPTION = "Codec Engine for TI ARM/DSP processors" DEPENDS = "virtual/kernel perl-native" diff --git a/recipes/dsplink/ti-codec-engine_2.23.bb b/recipes/dsplink/ti-codec-engine_2.23.bb index bbf54d4ff9..842dfa0846 100644 --- a/recipes/dsplink/ti-codec-engine_2.23.bb +++ b/recipes/dsplink/ti-codec-engine_2.23.bb @@ -3,6 +3,10 @@ DESCRIPTION = "Codec Engine for TI ARM/DSP processors" DEPENDS = "virtual/kernel perl-native" RDEPENDS = "update-modules" +INSANE_SKIP_ti-codec-engine-apps = True +INSANE_SKIP_ti-dsplink-apps = True +INSANE_SKIP_${PN} = True + inherit module # disable this package for now, while we're in test mode diff --git a/recipes/dsplink/ti-dmai_svn.bb b/recipes/dsplink/ti-dmai_svn.bb index ed9cc01a50..9b0919ef82 100644 --- a/recipes/dsplink/ti-dmai_svn.bb +++ b/recipes/dsplink/ti-dmai_svn.bb @@ -6,6 +6,9 @@ inherit module-base require ti-paths.inc +INSANE_SKIP_${PN} = True +INSANE_SKIP_${PN}-apps = True + SRC_URI = "svn://gforge.ti.com/svn/dmai/branches;module=BRIJESH_GIT_022309;proto=https;user=anonymous;pswd='' \ file://dmai-built-with-angstrom.patch;patch=1 \ file://loadmodules-ti-dmai-apps.sh \ diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb index e61bce88d3..7eba8e29ed 100644 --- a/recipes/e17/e-wm_svn.bb +++ b/recipes/e17/e-wm_svn.bb @@ -64,6 +64,7 @@ PACKAGE_ARCH_${PN}-other = "all" PACKAGE_ARCH_${PN}-input-methods = "all" PACKAGE_ARCH_${PN}-sysactions = "all" +# file://${HOME}/C/svn/ssh+svn/e/trunk/e \ SRC_URI = "\ svn://svn.enlightenment.org/svn/e/trunk;module=e;proto=http \ file://enlightenment_start.oe \ @@ -107,6 +108,7 @@ do_install_append() { FILES_${PN} = "\ ${bindir}/* \ + ${libdir}/enlightenment/utils/* \ ${libdir}/enlightenment/modules/*/*.* \ ${libdir}/enlightenment/modules/*/*/* \ ${libdir}/enlightenment/preload/e_precache.so \ @@ -116,6 +118,7 @@ FILES_${PN} = "\ ${datadir}/enlightenment/data/config/profile.cfg \ ${datadir}/enlightenment/AUTHORS \ ${datadir}/enlightenment/COPYING \ + ${datadir}/xsessions/enlightenment.desktop \ ${sysconfdir}/xdg \ " FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default" diff --git a/recipes/e17/elementary-sms_svn.bb b/recipes/e17/elementary-sms_svn.bb new file mode 100644 index 0000000000..2f0eec3a85 --- /dev/null +++ b/recipes/e17/elementary-sms_svn.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "An Elementary based SMS app" +LICENSE = "GPL" +DEPENDS = "ecore edbus elementary libefso" +SECTION = "x11" +PV = "0.0.0+svnr${SRCREV}" +PR = "r1" + +inherit e + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/TMP/st;module=elementary-sms;proto=http" +S = "${WORKDIR}/elementary-sms" + +FILES_${PN} += "${bindir}/*" +FILES_${PN} += "${datadir}/${PN}" +FILES_${PN} += "${datadir}/icons/*" +FILES_${PN} += "${datadir}/applications/*" diff --git a/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch b/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch new file mode 100644 index 0000000000..97679d6ff9 --- /dev/null +++ b/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch @@ -0,0 +1,11 @@ +--- e2fsprogs-1.38/lib/ext2fs/ismounted.c~ 2005-06-06 06:05:22.000000000 +1000 ++++ e2fsprogs-1.38/lib/ext2fs/ismounted.c 2009-04-03 15:07:35.000000000 +1100 +@@ -147,7 +147,7 @@ + is_root: + #define TEST_FILE "/.ismount-test-file" + *mount_flags |= EXT2_MF_ISROOT; +- fd = open(TEST_FILE, O_RDWR|O_CREAT); ++ fd = open(TEST_FILE, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR); + if (fd < 0) { + if (errno == EROFS) + *mount_flags |= EXT2_MF_READONLY; diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb index 388c519d0c..af49b0d7dd 100644 --- a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb +++ b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb @@ -2,11 +2,12 @@ SECTION = "base" require e2fsprogs.inc inherit native -PR = "r2" +PR = "r3" SRC_URI += "file://no-hardlinks.patch;patch=1 \ file://mkinstalldirs.patch;patch=1 \ - " + file://file-open-mode.patch;patch=1 \ + " EXTRA_OECONF = "" diff --git a/recipes/e2fsprogs/e2fsprogs_1.38.bb b/recipes/e2fsprogs/e2fsprogs_1.38.bb index 5687556c78..8ec469a84a 100644 --- a/recipes/e2fsprogs/e2fsprogs_1.38.bb +++ b/recipes/e2fsprogs/e2fsprogs_1.38.bb @@ -1,10 +1,11 @@ require e2fsprogs.inc -PR = "r19" +PR = "r20" SRC_URI += "file://no-hardlinks.patch;patch=1 \ file://mkinstalldirs.patch;patch=1 \ - " + file://file-open-mode.patch;patch=1 \ + " TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb index 177d9af2f8..c2b92323c4 100644 --- a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb +++ b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb @@ -2,7 +2,9 @@ require e2fsprogs.inc SRC_URI += "file://mkinstalldirs.patch;patch=1" -PR = "r2" +DEPENDS += "gettext-native" + +PR = "r3" do_compile_prepend () { find ./ -print|xargs chmod u=rwX diff --git a/recipes/efl1/edje-native_svn.bb b/recipes/efl1/edje-native_svn.bb index 238bfd00dc..e7650cd639 100644 --- a/recipes/efl1/edje-native_svn.bb +++ b/recipes/efl1/edje-native_svn.bb @@ -1,11 +1,11 @@ require edje_${PV}.bb inherit native -PR = "r1" +PR = "r3" DEPENDS = "evas-native ecore-native eet-native embryo-native" do_configure_prepend() { sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c - sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c - sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c + sed -i 's: cpp -I: /usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c + sed -i 's:\"gcc -I:\"/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c } diff --git a/recipes/efl1/edje-sdk_svn.bb b/recipes/efl1/edje-sdk_svn.bb index 2bd75a0672..1733380c0b 100644 --- a/recipes/efl1/edje-sdk_svn.bb +++ b/recipes/efl1/edje-sdk_svn.bb @@ -1,7 +1,7 @@ require edje_svn.bb inherit sdk -PR = "r1" +PR = "r3" SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-sdk', '')}" DEPENDS = "evas-native ecore-native eet-native embryo-native" diff --git a/recipes/efl1/edje_svn.bb b/recipes/efl1/edje_svn.bb index 7cf257f62a..31d47e6fb8 100644 --- a/recipes/efl1/edje_svn.bb +++ b/recipes/efl1/edje_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library" DEPENDS = "eet evas ecore embryo edje-native" LICENSE = "MIT BSD" PV = "0.5.0.050+svnr${SRCREV}" -PR = "r1" +PR = "r3" inherit efl @@ -17,7 +17,6 @@ RRECOMMENDS_${PN}-utils = "\ libevas-saver-png \ libevas-saver-jpeg \ libevas-saver-eet \ - libevas-saver-tiff \ " DEBIAN_NOAUTONAME_${PN}-utils = "1" diff --git a/recipes/efl1/elementary_svn.bb b/recipes/efl1/elementary_svn.bb index 82a099f00d..13ca29543d 100644 --- a/recipes/efl1/elementary_svn.bb +++ b/recipes/efl1/elementary_svn.bb @@ -31,3 +31,7 @@ FILES_${PN}-tests = "\ ${datadir}/applications/* \ ${datadir}/icons/* \ " + +EXTRA_OECONF = "\ + --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ +" diff --git a/recipes/efl1/evas-native_svn.bb b/recipes/efl1/evas-native_svn.bb index dbd03f5257..56723ca9ab 100644 --- a/recipes/efl1/evas-native_svn.bb +++ b/recipes/efl1/evas-native_svn.bb @@ -1,7 +1,7 @@ require evas.inc inherit native DEPENDS = "freetype-native libpng-native jpeg-native eet-native eina-native" -PR = "r0" +PR = "r1" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/recipes/efl1/evas.inc b/recipes/efl1/evas.inc index ff7a184fb2..0fb01f31a7 100644 --- a/recipes/efl1/evas.inc +++ b/recipes/efl1/evas.inc @@ -3,6 +3,7 @@ LICENSE = "MIT BSD" # can also depend on valgrind, libsdl-x11, directfb DEPENDS = "eina eet freetype jpeg libpng virtual/libx11 libxext libxrender fontconfig" PV = "0.9.9.050+svnr${SRCREV}" +PR = "r1" # disable thumb mode for arm diff --git a/recipes/freesmartphone/cornucopia.inc b/recipes/freesmartphone/cornucopia.inc new file mode 100644 index 0000000000..c3bf018369 --- /dev/null +++ b/recipes/freesmartphone/cornucopia.inc @@ -0,0 +1,15 @@ +DESCRIPTION = "The freesmartphone.org API reference implementation (FSO 2.0)" +AUTHOR = "Team FSO" +LICENSE = "LGPL" +SECTION = "devel" +DEPENDS = "vala-native glib-2.0 dbus dbus-glib" +PV = "0.0.0.0+gitr${SRCREV}" + +SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master" +S = "${WORKDIR}/git/${PN}" + +inherit autotools_stage pkgconfig vala + +FILES_${PN} += "${sysconfdir} ${datadir}" +# ship vapi files +FILES_${PN}-dev += "${datadir}/vala" diff --git a/recipes/freesmartphone/enter_0.0.2.bb b/recipes/freesmartphone/enter_0.0.2.bb deleted file mode 100644 index 2a51af6506..0000000000 --- a/recipes/freesmartphone/enter_0.0.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "An easy-to-use virtual keyboard for small touchscreen displays" -SECTION = "openmoko/inputmethods" -DEPENDS = "ecore evas edje" -PR = "r0" - -inherit autotools - -SRC_URI = "http://gstaedtner.net/projects/enter/enter.tar.gz" - -FILES_${PN} += "${datadir}" diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb index 4cb61c7c29..cb3e1586db 100644 --- a/recipes/freesmartphone/fsodeviced_git.bb +++ b/recipes/freesmartphone/fsodeviced_git.bb @@ -1,13 +1,2 @@ -DESCRIPTION = "Reference implementation of the org.freesmartphone.Device.* APIs" -SECTION = "console/network" -DEPENDS = "libfsoframework" -LICENSE = "GPL" -PV = "0.0.0.0+gitr${SRCREV}" -PR = "r0" - -SRC_URI = "\ - ${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master \ -" -S = "${WORKDIR}/git/fsodeviced" - -inherit autotools fso-plugin vala +require cornucopia.inc +inherit fso-plugin diff --git a/recipes/freesmartphone/fsogsmd_git.bb b/recipes/freesmartphone/fsogsmd_git.bb new file mode 100644 index 0000000000..cb3e1586db --- /dev/null +++ b/recipes/freesmartphone/fsogsmd_git.bb @@ -0,0 +1,2 @@ +require cornucopia.inc +inherit fso-plugin diff --git a/recipes/freesmartphone/libfsoframework_git.bb b/recipes/freesmartphone/libfsoframework_git.bb index 7b03e17041..2fb01bfeb2 100644 --- a/recipes/freesmartphone/libfsoframework_git.bb +++ b/recipes/freesmartphone/libfsoframework_git.bb @@ -1,17 +1,3 @@ +require cornucopia.inc DESCRIPTION = "freesmartphone.org support library" -LICENSE = "GPL" -SECTION = "devel" -DEPENDS = "vala-native glib-2.0 dbus dbus-glib" -PV = "0.0.0.0+gitr${SRCREV}" -PR = "r0" -SRC_URI = "\ - ${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master \ -" -S = "${WORKDIR}/git/libfsoframework" - -inherit autotools_stage pkgconfig - -FILES_${PN} += "${sysconfdir} ${datadir}" -# ship vapi files -FILES_${PN}-dev += "${datadir}/vala" diff --git a/recipes/freesmartphone/pylgrim_svn.bb b/recipes/freesmartphone/pylgrim_svn.bb deleted file mode 100644 index beeb44c110..0000000000 --- a/recipes/freesmartphone/pylgrim_svn.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "A GPS moving map application featuring OpenStreetMap tiles" -HOMEPAGE = "http://neo1973-germany.de/wiki/pylgrim" -AUTHOR = "Josch" -LICENSE = "GPL" -SECTION = "x11/navigation" -DEPENDS = "edje-native" -RDEPENDS = "task-python-efl python-textutils" -PV = "0.0+svnr${SRCREV}" -PE = "1" - -SRC_URI = "svn://neo1973-germany.de/svn;module=pylgrim;proto=http" -S = "${WORKDIR}/pylgrim" - -do_compile() { - edje_cc pylgrim.edc -} - -do_install() { - install -d ${D}${datadir}/pylgrim - for i in *.py pylgrim.edj; do - install -m 0755 $i ${D}${datadir}/pylgrim/ - done -} - -FILES_${PN} += "${datadir}" diff --git a/recipes/gdbm/gdbm_1.8.3.bb b/recipes/gdbm/gdbm_1.8.3.bb index f3beb47b41..883022ebfa 100644 --- a/recipes/gdbm/gdbm_1.8.3.bb +++ b/recipes/gdbm/gdbm_1.8.3.bb @@ -4,7 +4,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ file://makefile.patch;patch=1 \ @@ -12,6 +12,8 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ inherit autotools +TARGET_CC_ARCH += "${LDFLAGS}" + do_stage () { oe_libinstall -so -a libgdbm ${STAGING_LIBDIR} install -m 0644 ${S}/gdbm.h ${STAGING_INCDIR}/ diff --git a/recipes/glibc/glibc_2.6.1.bb b/recipes/glibc/glibc_2.6.1.bb index ab343ea0a6..c1a95987bf 100644 --- a/recipes/glibc/glibc_2.6.1.bb +++ b/recipes/glibc/glibc_2.6.1.bb @@ -41,7 +41,6 @@ SRC_URI = "\ file://arm-longlong.patch;patch=1 \ file://fhs-linux-paths.patch;patch=1 \ file://dl-cache-libcmp.patch;patch=1 \ - file://ldsocache-varrun.patch;patch=1 \ file://nptl-crosscompile.patch;patch=1 \ file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1;pnum=0 \ file://glibc-check_pf.patch;patch=1;pnum=0 \ @@ -61,6 +60,8 @@ SRC_URI = "\ file://march-i686.patch;patch=1;pnum=0 \ " +# file://ldsocache-varrun.patch;patch=1 \ + # Build fails on sh3 and sh4 without additional patches SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1" SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1" diff --git a/recipes/gnome/gnome-bluetooth_2.27.1.bb b/recipes/gnome/gnome-bluetooth_2.27.1.bb deleted file mode 100644 index 9a435c7f9c..0000000000 --- a/recipes/gnome/gnome-bluetooth_2.27.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" - -PR = "r1" - -inherit autotools gnome pkgconfig - -DEPENDS = "gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring" -RCONFLICTS_${PN} = "bluez-gnome" - -do_configure_prepend() { - sed -i -e s:docs::g ${S}/Makefile.am -} - diff --git a/recipes/gnome/gnome-bluetooth_2.27.3.bb b/recipes/gnome/gnome-bluetooth_2.27.3.bb new file mode 100644 index 0000000000..5144c851c4 --- /dev/null +++ b/recipes/gnome/gnome-bluetooth_2.27.3.bb @@ -0,0 +1,21 @@ +LICENSE = "GPL" +SECTION = "x11/gnome" + +inherit autotools gnome pkgconfig + +GBTREV = "609" +SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk;rev=${GBTREV};proto=http" +S = "${WORKDIR}/trunk" +PV = "2.27.3+svnr${GBTREV}" +PR = "r1" + +DEPENDS = "obexd obex-data-server gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring" +RRECOMMENDS_${PN} += "obexd obex-data-server" +RCONFLICTS_${PN} = "bluez-gnome" + +do_configure_prepend() { + sed -i -e s:docs::g ${S}/Makefile.am + echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make + echo "EXTRA_DIST = version.xml" > gtk-doc.make +} + diff --git a/recipes/gnome/gnome-icon-theme_2.26.0.bb b/recipes/gnome/gnome-icon-theme_2.26.0.bb new file mode 100644 index 0000000000..7e5c7b3af8 --- /dev/null +++ b/recipes/gnome/gnome-icon-theme_2.26.0.bb @@ -0,0 +1,13 @@ +LICENSE = "GPL" +SECTION = "x11/gnome" +DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" +RDEPENDS = "hicolor-icon-theme" +RRECOMMENDS = "librsvg-gtk" + +FILES_${PN} += "${datadir}/*" + +EXTRA_OECONF = "--disable-hicolor-check" + +inherit gnome + + diff --git a/recipes/gnome/gnome-menus_2.26.0.bb b/recipes/gnome/gnome-menus_2.26.0.bb new file mode 100644 index 0000000000..5837e7fed2 --- /dev/null +++ b/recipes/gnome/gnome-menus_2.26.0.bb @@ -0,0 +1,15 @@ +DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+" +LICENSE = "GPL" + +inherit gnome pkgconfig + +do_stage() { +autotools_stage_all +} + +PACKAGES += "${PN}-python" +FILES_${PN} += "${datadir}/desktop-directories/" +FILES_${PN}-python = "${libdir}/python*" +FILES_${PN}-dbg += "${libdir}/python*/site-packages/*/.debug \ + ${libdir}/python*/site-packages/.debug" + diff --git a/recipes/gnome/gnome-panel_2.24.0.bb b/recipes/gnome/gnome-panel_2.24.0.bb index 743e0fafd7..473bea405c 100644 --- a/recipes/gnome/gnome-panel_2.24.0.bb +++ b/recipes/gnome/gnome-panel_2.24.0.bb @@ -5,6 +5,8 @@ inherit gnome pkgconfig SRC_URI += "file://scrollkeeper.patch;patch=1" +SRC_URI += "file://idl-sysroot.patch;patch=1" + do_configure_prepend() { sed -i -e s:help:: ${S}/Makefile.am } @@ -16,7 +18,8 @@ FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*" FILES_${PN} =+ "${datadir}/gnome* \ ${datadir}/icons" -EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2" +export SYSROOT = "${STAGING_DIR_HOST}" +EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2 SYSROOT=${SYSROOT}" EXTRA_OECONF = "--disable-scrollkeeper" do_stage() { diff --git a/recipes/gnome/gvfs_1.2.1.bb b/recipes/gnome/gvfs_1.2.1.bb new file mode 100644 index 0000000000..399cce67e7 --- /dev/null +++ b/recipes/gnome/gvfs_1.2.1.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "gvfs is a userspace virtual filesystem" +LICENSE = "LGPL" +DEPENDS = "gnome-keyring glib-2.0 obexftp fuse avahi fuse hal gconf-dbus samba gphoto2" + +inherit gnome + +EXTRA_OECONF = "--enable-samba --with-archive-includes=${STAGING_INCDIR}" + +PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" + +FILES_${PN} += "${datadir}/dbus-1/services/* ${libdir}/gio/modules/*.so" +FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*" +FILES_${PN}-dev += "${libdir}/gio/modules/*.la" + +FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${sysconfdir}/gvfs/mounts/ftp.mount" +FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${sysconfdir}/gvfs/mounts/sftp.mount" +FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${sysconfdir}/gvfs/mounts/trash.mount" + +do_stage() { + autotools_stage_all +} diff --git a/recipes/gstreamer/gst-plugins-base_0.10.22.bb b/recipes/gstreamer/gst-plugins-base_0.10.22.bb index 92f2f56fa3..3086d93ffd 100644 --- a/recipes/gstreamer/gst-plugins-base_0.10.22.bb +++ b/recipes/gstreamer/gst-plugins-base_0.10.22.bb @@ -2,11 +2,11 @@ require gst-plugins.inc PROVIDES += "gst-plugins" -PR = "r1" +PR = "r2" # gst-plugins-base only builds the alsa plugin # if alsa has been built and is present. You will # not get an error if this is not present, just # a missing alsa plugin -DEPENDS += "alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv" +DEPENDS += "libtheora alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv" diff --git a/recipes/gtk-webcore/midori.inc b/recipes/gtk-webcore/midori.inc index a241157c58..a7ed936da3 100644 --- a/recipes/gtk-webcore/midori.inc +++ b/recipes/gtk-webcore/midori.inc @@ -9,3 +9,4 @@ SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz" EXTRA_OECONF = " --disable-hildon " +TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/recipes/gtk-webcore/midori_0.1.5.bb b/recipes/gtk-webcore/midori_0.1.5.bb index c1d1f66fe7..61ecb080ff 100644 --- a/recipes/gtk-webcore/midori_0.1.5.bb +++ b/recipes/gtk-webcore/midori_0.1.5.bb @@ -1,5 +1,7 @@ require midori.inc +PR = "r1" + DEPENDS += "python-native python-docutils-native" SRC_URI = "http://goodies.xfce.org/releases/midori/midori-${PV}.tar.bz2 \ diff --git a/recipes/images/illume-image.bb b/recipes/images/illume-image.bb index 857d5b080f..9c2b1befed 100644 --- a/recipes/images/illume-image.bb +++ b/recipes/images/illume-image.bb @@ -11,12 +11,15 @@ BASE_INSTALL = "\ task-base \ netbase \ sysfsutils \ + wireless-tools \ modutils-initscripts \ module-init-tools-depmod \ + pointercal \ + tslib-conf \ # prelink \ - exquisite \ - exquisite-themes \ - exquisite-theme-illume \ +# exquisite \ +# exquisite-themes \ +# exquisite-theme-illume \ # rsync \ # screen \ # fbset \ @@ -29,8 +32,13 @@ XSERVER ?= "xserver-kdrive-fbdev" # getting an X window system up X_INSTALL = "\ + libx11-locale \ + localedef \ glibc-charmap-utf-8 \ + shared-mime-info \ + mime-support \ e-wm \ + e-wm-sysactions \ e-wm-config-illume \ e-wm-config-standard \ e-wm-config-netbook \ @@ -49,26 +57,31 @@ X_INSTALL = "\ \ ttf-dejavu-common \ ttf-dejavu-sans \ -# ttf-dejavu-serif \ + ttf-dejavu-serif \ ttf-dejavu-sans-mono \ ttf-arphic-uming \ - \ +" +DEV_INSTALL = "\ + task-native-sdk \ + e-wm-dev \ + task-proper-tools \ + ntpdate \ + nfs-utils-client \ + gdb \ + pkgconfig \ + ltrace \ + perl-module-file-path \ " # useful command line tools TOOLS_INSTALL = "\ -# bash \ dosfstools \ -# iptables \ lsof \ mickeydbus \ - mickeyterm \ mtd-utils \ nano \ powertop \ - s3c24xx-gpio \ sysstat \ -# tcpdump \ " # audio @@ -85,30 +98,31 @@ AUDIO_INSTALL = "\ " GTK_INSTALL = "\ -# openmoko-calculator2 \ vala-terminal \ -# gpe-scap \ -# tangogps \ -" - -GAMES_INSTALL = "\ -# numptyphysics \ + gpe-scap \ " # FIXME these should rather be part of alsa-state, # once Om stabilizes them... -AUDIO_INSTALL_append_om-gta01 = "\ - openmoko-alsa-scenarios \ -" -AUDIO_INSTALL_append_om-gta02 = "\ - openmoko-alsa-scenarios \ -" +AUDIO_INSTALL_append_om-gta01 = "openmoko-alsa-scenarios" +AUDIO_INSTALL_append_om-gta02 = "openmoko-alsa-scenarios" + +# GLES libs - put them on if the platform has them +GLES_INSTALL = "" +GLES_INSTALL_append_beagleboard = "libgles-omap3 devmem2" +GLES_INSTALL_append_omap-3430sdp = "libgles-omap3" +GLES_INSTALL_append_omap-3430ldp = "libgles-omap3" +GLES_INSTALL_append_omap3evm = "libgles-omap3" +#GLES_INSTALL_append_overo = "libgles-omap3" +GLES_INSTALL_append_mx31ads = "libgles-mx31" +GLES_INSTALL_append_mx31litekit = "libgles-mx31" +GLES_INSTALL_append_zylonite = "libgles-zylonite" # python PYTHON_INSTALL = "\ - task-python-efl \ - python-codecs \ - python-gst \ +# task-python-efl \ +# python-codecs \ +# python-gst \ " # zhone @@ -116,35 +130,30 @@ ZHONE_INSTALL = "\ fso-gsm0710muxd \ frameworkd \ fso-gpsd \ -# zhone \ + zhone \ " # additional apps APPS_INSTALL = "\ -# tichy \ -# gpe-gallery \ -# gpe-sketchbook \ -# gpe-filemanager \ -# vagalume \ -# starling \ - rxvt-unicode \ - gpe-terminal \ elementary-alarm \ - gpe-scap \ + expedite \ + expedite-themes \ libefso \ essential-dialer \ + elementary-sms \ " IMAGE_INSTALL = "\ ${BASE_INSTALL} \ + ${GLES_INSTALL} \ ${X_INSTALL} \ ${GTK_INSTALL} \ - ${GAMES_INSTALL} \ ${AUDIO_INSTALL} \ ${TOOLS_INSTALL} \ ${PYTHON_INSTALL} \ - ${ZHONE_INSTALL} \ +# ${ZHONE_INSTALL} \ ${APPS_INSTALL} \ + ${DEV_INSTALL} \ " inherit image @@ -156,7 +165,6 @@ fso_rootfs_postprocess() { date "+%m%d%H%M%Y" >./etc/timestamp # alias foo echo "alias pico=nano" >>./etc/profile -# echo "alias fso='cd /local/pkg/fso'" >>./etc/profile echo "alias ipkg='opkg'" >>./etc/profile # dns echo "nameserver 208.67.222.222" >>./etc/resolv.conf diff --git a/recipes/libgpg-error/libgpg-error.inc b/recipes/libgpg-error/libgpg-error.inc index f6a84dc5ef..6fcc9202b2 100644 --- a/recipes/libgpg-error/libgpg-error.inc +++ b/recipes/libgpg-error/libgpg-error.inc @@ -12,7 +12,7 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \ FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${bindir}/*" -inherit autotools binconfig pkgconfig +inherit autotools binconfig pkgconfig gettext do_stage() { oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR} diff --git a/recipes/linux/linux-2.6.28/at91sam9260dfc/at91sam9260dfc_defconfig b/recipes/linux/linux-2.6.28/at91sam9260dfc/defconfig index 9b01dc06a6..9b01dc06a6 100644 --- a/recipes/linux/linux-2.6.28/at91sam9260dfc/at91sam9260dfc_defconfig +++ b/recipes/linux/linux-2.6.28/at91sam9260dfc/defconfig diff --git a/recipes/linux/linux-2.6.28/at91sam9261ek/at91sam9261ek_defconfig b/recipes/linux/linux-2.6.28/at91sam9261ek/defconfig index 9cdb7074f1..9cdb7074f1 100644 --- a/recipes/linux/linux-2.6.28/at91sam9261ek/at91sam9261ek_defconfig +++ b/recipes/linux/linux-2.6.28/at91sam9261ek/defconfig diff --git a/recipes/linux/linux-2.6.28/at91sam9g20dfc/at91sam9g20dfc_defconfig b/recipes/linux/linux-2.6.28/at91sam9g20dfc/defconfig index 58242c5e8d..58242c5e8d 100644 --- a/recipes/linux/linux-2.6.28/at91sam9g20dfc/at91sam9g20dfc_defconfig +++ b/recipes/linux/linux-2.6.28/at91sam9g20dfc/defconfig diff --git a/recipes/linux/linux-2.6.28/atngw100/atngw100_defconfig b/recipes/linux/linux-2.6.28/atngw100/defconfig index b4f78d0794..cc40243403 100644 --- a/recipes/linux/linux-2.6.28/atngw100/atngw100_defconfig +++ b/recipes/linux/linux-2.6.28/atngw100/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.27.10 -# Tue Jan 6 09:24:25 2009 +# Linux kernel version: 2.6.28 +# Sun Apr 12 11:36:16 2009 # CONFIG_AVR32=y CONFIG_GENERIC_GPIO=y @@ -29,22 +29,24 @@ CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y -# CONFIG_TASKSTATS is not set -# CONFIG_AUDIT is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +# CONFIG_TASK_XACCT is not set +CONFIG_AUDIT=y # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CGROUPS is not set # CONFIG_GROUP_SCHED is not set CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y -# CONFIG_RELAY is not set +CONFIG_RELAY=y # CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" @@ -68,25 +70,17 @@ CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y +CONFIG_AIO=y CONFIG_VM_EVENT_COUNTERS=y -CONFIG_SLUB_DEBUG=y -# CONFIG_SLAB is not set -CONFIG_SLUB=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set # CONFIG_SLOB is not set -CONFIG_PROFILING=y +# CONFIG_PROFILING is not set # CONFIG_MARKERS is not set -CONFIG_OPROFILE=m CONFIG_HAVE_OPROFILE=y -CONFIG_KPROBES=y -# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set -# CONFIG_HAVE_IOREMAP_PROT is not set +# CONFIG_KPROBES is not set CONFIG_HAVE_KPROBES=y -# CONFIG_HAVE_KRETPROBES is not set -# CONFIG_HAVE_ARCH_TRACEHOOK is not set -# CONFIG_HAVE_DMA_ATTRS is not set -# CONFIG_USE_GENERIC_SMP_HELPERS is not set CONFIG_HAVE_CLK=y -CONFIG_PROC_PAGE_MONITOR=y # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y @@ -95,7 +89,7 @@ CONFIG_BASE_SMALL=1 CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y @@ -112,18 +106,18 @@ CONFIG_BLOCK=y CONFIG_IOSCHED_NOOP=y # CONFIG_IOSCHED_AS is not set # CONFIG_IOSCHED_DEADLINE is not set -CONFIG_IOSCHED_CFQ=y +# CONFIG_IOSCHED_CFQ is not set # CONFIG_DEFAULT_AS is not set # CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" +# CONFIG_DEFAULT_CFQ is not set +CONFIG_DEFAULT_NOOP=y +CONFIG_DEFAULT_IOSCHED="noop" CONFIG_CLASSIC_RCU=y +# CONFIG_FREEZER is not set # # System Type and features # -# CONFIG_TICK_ONESHOT is not set # CONFIG_NO_HZ is not set # CONFIG_HIGH_RES_TIMERS is not set CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -135,6 +129,9 @@ CONFIG_CPU_AT32AP700X=y CONFIG_CPU_AT32AP7000=y # CONFIG_BOARD_ATSTK1000 is not set CONFIG_BOARD_ATNGW100=y +# CONFIG_BOARD_FAVR_32 is not set +# CONFIG_BOARD_MIMC200 is not set +# CONFIG_BOARD_ATNGW100_EVKLCD10X is not set CONFIG_LOADER_U_BOOT=y # @@ -162,14 +159,14 @@ CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y -# CONFIG_SPARSEMEM_STATIC is not set -# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_RESOURCES_64BIT is not set +# CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 CONFIG_NR_QUICK=2 CONFIG_VIRT_TO_BUS=y +CONFIG_UNEVICTABLE_LRU=y # CONFIG_OWNERSHIP_TRACE is not set # CONFIG_NMI_DEBUGGING is not set # CONFIG_HZ_100 is not set @@ -178,7 +175,7 @@ CONFIG_HZ_250=y # CONFIG_HZ_1000 is not set CONFIG_HZ=250 # CONFIG_SCHED_HRTICK is not set -CONFIG_CMDLINE="" +CONFIG_CMDLINE=" debug " # # Power management options @@ -192,17 +189,18 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y # CONFIG_CPU_FREQ_DEBUG is not set -# CONFIG_CPU_FREQ_STAT is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_STAT=y +# CONFIG_CPU_FREQ_STAT_DETAILS is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y -# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPU_FREQ_AT32AP=y # @@ -215,6 +213,8 @@ CONFIG_CPU_FREQ_AT32AP=y # Executable file formats # CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_HAVE_AOUT is not set # CONFIG_BINFMT_MISC is not set CONFIG_NET=y @@ -224,42 +224,27 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y -CONFIG_XFRM=y -CONFIG_XFRM_USER=y -# CONFIG_XFRM_SUB_POLICY is not set -# CONFIG_XFRM_MIGRATE is not set -# CONFIG_XFRM_STATISTICS is not set -CONFIG_XFRM_IPCOMP=y -CONFIG_NET_KEY=y -# CONFIG_NET_KEY_MIGRATE is not set +# CONFIG_NET_KEY is not set 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_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y -# CONFIG_IP_MULTIPLE_TABLES is not set -# CONFIG_IP_ROUTE_MULTIPATH is not set -# CONFIG_IP_ROUTE_VERBOSE is not set CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y # CONFIG_IP_PNP_BOOTP is not set # CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -# CONFIG_IP_PIMSM_V2 is not set # CONFIG_ARPD is not set -CONFIG_SYN_COOKIES=y -CONFIG_INET_AH=y -CONFIG_INET_ESP=y -CONFIG_INET_IPCOMP=y -CONFIG_INET_XFRM_TUNNEL=y -CONFIG_INET_TUNNEL=y -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y @@ -267,172 +252,17 @@ CONFIG_INET_TCP_DIAG=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -# CONFIG_IP_VS is not set -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -CONFIG_INET6_AH=y -CONFIG_INET6_ESP=y -CONFIG_INET6_IPCOMP=y -# CONFIG_IPV6_MIP6 is not set -CONFIG_INET6_XFRM_TUNNEL=y -CONFIG_INET6_TUNNEL=y -CONFIG_INET6_XFRM_MODE_TRANSPORT=y -CONFIG_INET6_XFRM_MODE_TUNNEL=y -CONFIG_INET6_XFRM_MODE_BEET=y -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=y -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -CONFIG_NETFILTER_ADVANCED=y -CONFIG_BRIDGE_NETFILTER=y - -# -# Core Netfilter Configuration -# -# CONFIG_NETFILTER_NETLINK_QUEUE is not set -# CONFIG_NETFILTER_NETLINK_LOG is not set -CONFIG_NF_CONNTRACK=m -CONFIG_NF_CT_ACCT=y -CONFIG_NF_CONNTRACK_MARK=y -# CONFIG_NF_CONNTRACK_EVENTS is not set -# CONFIG_NF_CT_PROTO_DCCP is not set -CONFIG_NF_CT_PROTO_GRE=m -# CONFIG_NF_CT_PROTO_SCTP is not set -# CONFIG_NF_CT_PROTO_UDPLITE is not set -CONFIG_NF_CONNTRACK_AMANDA=m -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 is not set -CONFIG_NETFILTER_XTABLES=y -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set -# CONFIG_NETFILTER_XT_TARGET_DSCP is not set -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NFLOG=m -# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set -# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set -# CONFIG_NETFILTER_XT_TARGET_TRACE is not set -CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -# CONFIG_NETFILTER_XT_MATCH_DCCP is not set -# CONFIG_NETFILTER_XT_MATCH_DSCP is not set -CONFIG_NETFILTER_XT_MATCH_ESP=m -CONFIG_NETFILTER_XT_MATCH_HELPER=m -# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -# CONFIG_NETFILTER_XT_MATCH_OWNER is not set -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set -CONFIG_NETFILTER_XT_MATCH_REALM=m -# CONFIG_NETFILTER_XT_MATCH_SCTP is not set -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -# CONFIG_NETFILTER_XT_MATCH_TIME is not set -# CONFIG_NETFILTER_XT_MATCH_U32 is not set -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m - -# -# IP: Netfilter Configuration -# -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_NF_CONNTRACK_PROC_COMPAT=y -# CONFIG_IP_NF_QUEUE is not set -CONFIG_IP_NF_IPTABLES=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_ADDRTYPE=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_LOG=m -# CONFIG_IP_NF_TARGET_ULOG is not set -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_AMANDA=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=m -CONFIG_NF_NAT_SIP=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_TARGET_CLUSTERIP=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 -# -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_IP6_NF_QUEUE=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_LOG=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_RAW=m - -# -# Bridge: Netfilter Configuration -# -# CONFIG_BRIDGE_NF_EBTABLES is not set +# CONFIG_NETFILTER is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set -CONFIG_STP=m -CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m -# CONFIG_VLAN_8021Q_GVRP is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set -CONFIG_LLC=m # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -441,23 +271,20 @@ CONFIG_LLC=m # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # CONFIG_NET_SCHED is not set -CONFIG_NET_CLS_ROUTE=y # # Network testing # # CONFIG_NET_PKTGEN is not set -# CONFIG_NET_TCPPROBE is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set - -# -# Wireless -# +# CONFIG_PHONET is not set +CONFIG_WIRELESS=y # CONFIG_CFG80211 is not set +CONFIG_WIRELESS_OLD_REGULATORY=y # CONFIG_WIRELESS_EXT is not set # CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set @@ -530,7 +357,7 @@ CONFIG_MTD_CFI_UTIL=y # # CONFIG_MTD_COMPLEX_MAPPINGS is not set CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_PHYSMAP_START=0x80000000 +CONFIG_MTD_PHYSMAP_START=0x8000000 CONFIG_MTD_PHYSMAP_LEN=0x0 CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # CONFIG_MTD_PLATRAM is not set @@ -538,8 +365,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # # Self-contained MTD device drivers # -CONFIG_MTD_DATAFLASH=y -# CONFIG_MTD_M25P80 is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set # CONFIG_MTD_MTDRAM is not set @@ -570,8 +395,14 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 # CONFIG_BLK_DEV_XIP is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set -# CONFIG_MISC_DEVICES is not set -# CONFIG_HAVE_IDE is not set +CONFIG_MISC_DEVICES=y +# CONFIG_ATMEL_PWM is not set +# CONFIG_ATMEL_TCLIB is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ATMEL_SSC is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_C2PORT is not set # # SCSI device support @@ -583,7 +414,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 # CONFIG_ATA is not set # CONFIG_MD is not set CONFIG_NETDEVICES=y -# CONFIG_DUMMY is not set +CONFIG_DUMMY=y # CONFIG_BONDING is not set # CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set @@ -607,16 +438,18 @@ CONFIG_PHYLIB=y # CONFIG_FIXED_PHY is not set # CONFIG_MDIO_BITBANG is not set CONFIG_NET_ETHERNET=y -# CONFIG_MII is not set +CONFIG_MII=y CONFIG_MACB=y -# CONFIG_ENC28J60 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_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set # CONFIG_B44 is not set -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set +CONFIG_NETDEV_1000=y +CONFIG_NETDEV_10000=y # # Wireless LAN @@ -627,13 +460,13 @@ CONFIG_MACB=y # CONFIG_WAN is not set CONFIG_PPP=m # CONFIG_PPP_MULTILINK is not set -CONFIG_PPP_FILTER=y +# CONFIG_PPP_FILTER is not set CONFIG_PPP_ASYNC=m # CONFIG_PPP_SYNC_TTY is not set CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOE=m +# CONFIG_PPP_MPPE is not set +# CONFIG_PPPOE is not set # CONFIG_PPPOL2TP is not set # CONFIG_SLIP is not set CONFIG_SLHC=m @@ -728,28 +561,17 @@ CONFIG_I2C_GPIO=m # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set # CONFIG_I2C_DEBUG_CHIP is not set -CONFIG_SPI=y -# CONFIG_SPI_DEBUG is not set -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -CONFIG_SPI_ATMEL=y -# CONFIG_SPI_BITBANG is not set - -# -# SPI Protocol Masters -# -# CONFIG_SPI_AT25 is not set -CONFIG_SPI_SPIDEV=m -# CONFIG_SPI_TLE62X0 is not set +# CONFIG_SPI is not set CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_GPIOLIB=y # CONFIG_DEBUG_GPIO is not set # CONFIG_GPIO_SYSFS is not set # +# Memory mapped GPIO expanders: +# + +# # I2C GPIO expanders: # # CONFIG_GPIO_MAX732X is not set @@ -763,26 +585,17 @@ CONFIG_GPIOLIB=y # # SPI GPIO expanders: # -# CONFIG_GPIO_MAX7301 is not set -# CONFIG_GPIO_MCP23S08 is not set # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set # CONFIG_THERMAL is not set # CONFIG_THERMAL_HWMON is not set -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -# CONFIG_SOFT_WATCHDOG is not set -CONFIG_AT32AP700X_WDT=y +# CONFIG_WATCHDOG is not set +CONFIG_SSB_POSSIBLE=y # # Sonics Silicon Backplane # -CONFIG_SSB_POSSIBLE=y # CONFIG_SSB is not set # @@ -792,6 +605,9 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_MFD_SM501 is not set # CONFIG_HTC_PASIC3 is not set # CONFIG_MFD_TMIO is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_REGULATOR is not set # # Multimedia devices @@ -832,28 +648,31 @@ CONFIG_USB_SUPPORT=y # CONFIG_USB_GADGET_MUSB_HDRC is not set # -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; # CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET_SELECTED=y -# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_AT91 is not set CONFIG_USB_GADGET_ATMEL_USBA=y CONFIG_USB_ATMEL_USBA=y # CONFIG_USB_GADGET_FSL_USB2 is not set -# CONFIG_USB_GADGET_NET2280 is not set -# CONFIG_USB_GADGET_PXA25X is not set -# CONFIG_USB_GADGET_M66592 is not set -# CONFIG_USB_GADGET_PXA27X is not set -# CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_PXA25X is not set +# CONFIG_USB_GADGET_PXA27X is not set # CONFIG_USB_GADGET_S3C2410 is not set -# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_FSL_QE is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y -CONFIG_USB_ZERO=m +# CONFIG_USB_ZERO is not set CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y CONFIG_USB_GADGETFS=m @@ -863,24 +682,23 @@ CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_PRINTER is not set # CONFIG_USB_CDC_COMPOSITE is not set -CONFIG_MMC=m +CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set # -# MMC/SD Card Drivers +# MMC/SD/SDIO Card Drivers # -CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK=y CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set # -# MMC/SD Host Controller Drivers +# MMC/SD/SDIO Host Controller Drivers # # CONFIG_MMC_SDHCI is not set -# CONFIG_MMC_ATMELMCI is not set -CONFIG_MMC_SPI=m +CONFIG_MMC_ATMELMCI=y # CONFIG_MEMSTICK is not set CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -895,8 +713,9 @@ CONFIG_LEDS_GPIO=y # LED Triggers # CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y +# CONFIG_LEDS_TRIGGER_TIMER is not set +# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set # CONFIG_ACCESSIBILITY is not set CONFIG_RTC_LIB=y @@ -929,25 +748,24 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_M41T80 is not set # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set # # SPI RTC drivers # -# CONFIG_RTC_DRV_M41T94 is not set -# CONFIG_RTC_DRV_DS1305 is not set -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_R9701 is not set -# CONFIG_RTC_DRV_RS5C348 is not set # # Platform RTC drivers # +# CONFIG_RTC_DRV_DS1286 is not set # CONFIG_RTC_DRV_DS1511 is not set # CONFIG_RTC_DRV_DS1553 is not set # CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_STK17TA8 is not set # CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set # CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_BQ4802 is not set # CONFIG_RTC_DRV_V3020 is not set # @@ -956,20 +774,26 @@ CONFIG_RTC_INTF_DEV=y CONFIG_RTC_DRV_AT32AP700X=y # CONFIG_DMADEVICES is not set # CONFIG_UIO is not set +# CONFIG_STAGING is not set # # File systems # -CONFIG_EXT2_FS=m +CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m -# CONFIG_EXT3_FS_XATTR is not set -# CONFIG_EXT4DEV_FS is not set -CONFIG_JBD=m +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -# CONFIG_FS_POSIX_ACL is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_FILE_LOCKING=y # CONFIG_XFS_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_DNOTIFY is not set @@ -978,7 +802,7 @@ CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set -CONFIG_FUSE_FS=m +CONFIG_FUSE_FS=y # # CD-ROM/DVD Filesystems @@ -992,16 +816,19 @@ CONFIG_FUSE_FS=m CONFIG_FAT_FS=m CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_CODEPAGE=850 +CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_NTFS_FS is not set +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set # # Pseudo filesystems # CONFIG_PROC_FS=y -# CONFIG_PROC_KCORE is not set +CONFIG_PROC_KCORE=y CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set @@ -1031,7 +858,7 @@ CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set -# CONFIG_MINIX_FS is not set +CONFIG_MINIX_FS=m # CONFIG_OMFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set @@ -1039,24 +866,24 @@ CONFIG_JFFS2_RTIME=y # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set -# CONFIG_NFS_V4 is not set -CONFIG_ROOT_NFS=y +CONFIG_NFS_V4=y CONFIG_NFSD=m CONFIG_NFSD_V3=y # CONFIG_NFSD_V3_ACL is not set -# CONFIG_NFSD_V4 is not set -CONFIG_LOCKD=y +CONFIG_NFSD_V4=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=m CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y -# CONFIG_RPCSEC_GSS_KRB5 is not set +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +# CONFIG_SUNRPC_REGISTER_V4 is not set +CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_SMB_FS is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set # CONFIG_CIFS_WEAK_PW_HASH is not set @@ -1077,7 +904,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set -CONFIG_NLS_CODEPAGE_850=m +# CONFIG_NLS_CODEPAGE_850 is not set # CONFIG_NLS_CODEPAGE_852 is not set # CONFIG_NLS_CODEPAGE_855 is not set # CONFIG_NLS_CODEPAGE_857 is not set @@ -1123,7 +950,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_DEBUG_FS is not set +CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set @@ -1132,10 +959,9 @@ CONFIG_DETECT_SOFTLOCKUP=y CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set -# CONFIG_TIMER_STATS is not set +CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -1156,10 +982,19 @@ CONFIG_DEBUG_BUGVERBOSE=y CONFIG_FRAME_POINTER=y # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set -# CONFIG_KPROBES_SANITY_TEST is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_BACKTRACE_SELF_TEST is not set -# CONFIG_LKDTM is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_FAULT_INJECTION is not set + +# +# Tracers +# +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_CONTEXT_SWITCH_TRACER is not set +# CONFIG_BOOT_TRACER is not set +# CONFIG_DYNAMIC_PRINTK_DEBUG is not set # CONFIG_SAMPLES is not set # @@ -1167,21 +1002,27 @@ CONFIG_FRAME_POINTER=y # # CONFIG_KEYS is not set # CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set # CONFIG_SECURITY_FILE_CAPABILITIES is not set -CONFIG_CRYPTO=y +CONFIG_CRYPTO=m # # Crypto core or helper # -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_AEAD=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_MANAGER=y +# CONFIG_CRYPTO_FIPS is not set +CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_ALGAPI2=m +CONFIG_CRYPTO_AEAD2=m +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=m +CONFIG_CRYPTO_HASH2=m +CONFIG_CRYPTO_RNG2=m +CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_MANAGER2=m # CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_CRYPTD is not set -CONFIG_CRYPTO_AUTHENC=y +# CONFIG_CRYPTO_AUTHENC is not set # CONFIG_CRYPTO_TEST is not set # @@ -1194,18 +1035,18 @@ CONFIG_CRYPTO_AUTHENC=y # # Block modes # -CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CBC=m # CONFIG_CRYPTO_CTR is not set # CONFIG_CRYPTO_CTS is not set -CONFIG_CRYPTO_ECB=m +# CONFIG_CRYPTO_ECB is not set # CONFIG_CRYPTO_LRW is not set -CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_PCBC is not set # CONFIG_CRYPTO_XTS is not set # # Hash modes # -CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_XCBC is not set # @@ -1213,13 +1054,13 @@ CONFIG_CRYPTO_HMAC=y # # CONFIG_CRYPTO_CRC32C is not set # CONFIG_CRYPTO_MD4 is not set -CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MD5=m # CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_RMD128 is not set # CONFIG_CRYPTO_RMD160 is not set # CONFIG_CRYPTO_RMD256 is not set # CONFIG_CRYPTO_RMD320 is not set -CONFIG_CRYPTO_SHA1=y +# CONFIG_CRYPTO_SHA1 is not set # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_TGR192 is not set @@ -1230,12 +1071,12 @@ CONFIG_CRYPTO_SHA1=y # # CONFIG_CRYPTO_AES is not set # CONFIG_CRYPTO_ANUBIS is not set -CONFIG_CRYPTO_ARC4=m +# CONFIG_CRYPTO_ARC4 is not set # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set -CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_SALSA20 is not set @@ -1247,30 +1088,30 @@ CONFIG_CRYPTO_DES=y # # Compression # -CONFIG_CRYPTO_DEFLATE=y +# CONFIG_CRYPTO_DEFLATE is not set # CONFIG_CRYPTO_LZO is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_HW=y # # Library routines # CONFIG_BITREVERSE=y -# CONFIG_GENERIC_FIND_FIRST_BIT is not set -# CONFIG_GENERIC_FIND_NEXT_BIT is not set CONFIG_CRC_CCITT=m # CONFIG_CRC16 is not set # CONFIG_CRC_T10DIF is not set -CONFIG_CRC_ITU_T=m +# CONFIG_CRC_ITU_T is not set CONFIG_CRC32=y -CONFIG_CRC7=m +# CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set +CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_GENERIC_ALLOCATOR=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y diff --git a/recipes/linux/linux-msm7xxxx_git.bb b/recipes/linux/linux-msm7xxxx_git.bb index 33a0652dfb..0f65ff37df 100644 --- a/recipes/linux/linux-msm7xxxx_git.bb +++ b/recipes/linux/linux-msm7xxxx_git.bb @@ -3,14 +3,14 @@ require linux.inc PV = "2.6.25+${PR}+gitr${SRCREV}" PV_htcraphael = "2.6.27+${PR}+gitr${SRCREV}" PV_htcdiamond = "2.6.27+${PR}+gitr${SRCREV}" -PR = "r8" +PR = "r13" COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcvogue|htctitan|htcnike|htcraphael|htcdiamond|htcblackstone" SRCREV = "d2fc2471ba384dabad1c9a4126e2e2372349d34c" -SRCREV_htcraphael = "1e936f767872234a9b299e209a5e33212de473fa" -SRCREV_htcdiamond = "12008ce2c5c1ab657c46fdc6f6129ccf6730760a" -SRCREV_htcblackstone = "12008ce2c5c1ab657c46fdc6f6129ccf6730760a" +SRCREV_htcraphael = "905eb169a7d659c221aad5c38aac443065178c4c" +SRCREV_htcdiamond = "905eb169a7d659c221aad5c38aac443065178c4c" +SRCREV_htcblackstone = "905eb169a7d659c221aad5c38aac443065178c4c" SRC_BRANCH = "htc-vogue" SRC_BRANCH_htcraphael = "htc-msm-2.6.27" @@ -21,4 +21,5 @@ SRC_URI = "\ git://git.linuxtogo.org/home/groups/mobile-linux/kernel.git;branch=${SRC_BRANCH};protocol=git \ file://defconfig \ " + S = "${WORKDIR}/git" diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0005-DSS2-Add-panel-drivers.patch b/recipes/linux/linux-omap-2.6.29/dss2/0005-DSS2-Add-panel-drivers.patch index 835298f40a..d12586ca2f 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0005-DSS2-Add-panel-drivers.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0005-DSS2-Add-panel-drivers.patch @@ -254,7 +254,7 @@ index 0000000..e4bb781 + .vfp = 4, + .vbp = 12-10, + }, -+ ++ .recommended_bpp = 16, + .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IVS, +}; + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch b/recipes/linux/linux-omap-2.6.29/dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch new file mode 100644 index 0000000000..daa95ca50d --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch @@ -0,0 +1,183 @@ +From 67f3fc050ab4e2006d5b7ec6ec341896627181ab Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> +Date: Mon, 6 Apr 2009 17:32:04 +0200 +Subject: [PATCH] DSS2: Check fclk limits when configuring video planes +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +Check that the currect functional clock is fast enough to support +the requested scaling ratios. Also check if 5-tap filtering can be +used even though the downscaling ratio is less than 1:2 since the +functional clock rate required for 5-tap filtering can be less than +the requirement for 3-tap filtering, and 5-tap filtering should look +better. + +Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> +--- + drivers/video/omap2/dss/dispc.c | 104 ++++++++++++++++++++++++++++++++++++--- + 1 files changed, 97 insertions(+), 7 deletions(-) + +diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c +index 41734f3..61861d8 100644 +--- a/drivers/video/omap2/dss/dispc.c ++++ b/drivers/video/omap2/dss/dispc.c +@@ -1026,11 +1026,11 @@ static void _dispc_set_vid_accu1(enum omap_plane plane, int haccu, int vaccu) + static void _dispc_set_scaling(enum omap_plane plane, + u16 orig_width, u16 orig_height, + u16 out_width, u16 out_height, +- bool ilace) ++ bool ilace, bool five_taps) + { + int fir_hinc; + int fir_vinc; +- int hscaleup, vscaleup, five_taps; ++ int hscaleup, vscaleup; + int fieldmode = 0; + int accu0 = 0; + int accu1 = 0; +@@ -1040,7 +1040,6 @@ static void _dispc_set_scaling(enum omap_plane plane, + + hscaleup = orig_width <= out_width; + vscaleup = orig_height <= out_height; +- five_taps = orig_height > out_height * 2; + + _dispc_set_scale_coef(plane, hscaleup, vscaleup, five_taps); + +@@ -1283,6 +1282,73 @@ static void calc_rotation_offset(u8 rotation, bool mirror, + } + } + ++static unsigned long calc_fclk_five_taps(u16 width, u16 height, ++ u16 out_width, u16 out_height, enum omap_color_mode color_mode) ++{ ++ u32 fclk = 0; ++ /* FIXME venc pclk? */ ++ u64 tmp, pclk = dispc_pclk_rate(); ++ ++ if (height > out_height) { ++ /* FIXME get real display PPL */ ++ unsigned int ppl = 800; ++ ++ tmp = pclk * height * out_width; ++ do_div(tmp, 2 * out_height * ppl); ++ fclk = tmp; ++ ++ if (height > 2 * out_height) { ++ tmp = pclk * (height - 2 * out_height) * out_width; ++ do_div(tmp, 2 * out_height * (ppl - out_width)); ++ fclk = max(fclk, (u32) tmp); ++ } ++ } ++ ++ if (width > out_width) { ++ tmp = pclk * width; ++ do_div(tmp, out_width); ++ fclk = max(fclk, (u32) tmp); ++ ++ if (color_mode == OMAP_DSS_COLOR_RGB24U) ++ fclk <<= 1; ++ } ++ ++ return fclk; ++} ++ ++static unsigned long calc_fclk(u16 width, u16 height, ++ u16 out_width, u16 out_height, ++ enum omap_color_mode color_mode, bool five_taps) ++{ ++ unsigned int hf, vf; ++ ++ if (five_taps) ++ return calc_fclk_five_taps(width, height, ++ out_width, out_height, color_mode); ++ ++ /* ++ * FIXME how to determine the 'A' factor ++ * for the no downscaling case ? ++ */ ++ ++ if (width > 3 * out_width) ++ hf = 4; ++ else if (width > 2 * out_width) ++ hf = 3; ++ else if (width > out_width) ++ hf = 2; ++ else ++ hf = 1; ++ ++ if (height > out_height) ++ vf = 2; ++ else ++ vf = 1; ++ ++ /* FIXME venc pclk? */ ++ return dispc_pclk_rate() * vf * hf; ++} ++ + static int _dispc_setup_plane(enum omap_plane plane, + enum omap_channel channel_out, + u32 paddr, u16 screen_width, +@@ -1294,7 +1360,7 @@ static int _dispc_setup_plane(enum omap_plane plane, + u8 rotation, int mirror) + { + const int maxdownscale = cpu_is_omap34xx() ? 4 : 2; +- bool five_taps = height > out_height * 2; ++ bool five_taps = 0; + bool fieldmode = 0; + int cconv = 0; + unsigned offset0, offset1; +@@ -1323,8 +1389,8 @@ static int _dispc_setup_plane(enum omap_plane plane, + } + } else { + /* video plane */ +- if (width > (2048 >> five_taps)) +- return -EINVAL; ++ ++ unsigned long fclk; + + if (out_width < width / maxdownscale || + out_width > width * 8) +@@ -1356,6 +1422,30 @@ static int _dispc_setup_plane(enum omap_plane plane, + default: + return -EINVAL; + } ++ ++ /* Must use 5-tap filter? */ ++ five_taps = height > out_height * 2; ++ ++ /* Try to use 5-tap filter whenever possible. */ ++ if (cpu_is_omap34xx() && !five_taps && ++ height > out_height && width <= 1024) { ++ fclk = calc_fclk_five_taps(width, height, ++ out_width, out_height, color_mode); ++ if (fclk <= dispc_fclk_rate()) ++ five_taps = true; ++ } ++ ++ if (width > (2048 >> five_taps)) ++ return -EINVAL; ++ ++ fclk = calc_fclk(width, height, out_width, out_height, ++ color_mode, five_taps); ++ ++ DSSDBG("required fclk rate = %lu Hz\n", fclk); ++ DSSDBG("current fclk rate = %lu Hz\n", dispc_fclk_rate()); ++ ++ if (fclk > dispc_fclk_rate()) ++ return -EINVAL; + } + + if (ilace && height >= out_height) +@@ -1399,7 +1489,7 @@ static int _dispc_setup_plane(enum omap_plane plane, + if (plane != OMAP_DSS_GFX) { + _dispc_set_scaling(plane, width, height, + out_width, out_height, +- ilace); ++ ilace, five_taps); + _dispc_set_vid_size(plane, out_width, out_height); + _dispc_set_vid_color_conv(plane, cconv); + } +-- +1.5.6.5 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch b/recipes/linux/linux-omap-2.6.29/dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch new file mode 100644 index 0000000000..b3248527e8 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch @@ -0,0 +1,79 @@ +From 9f8f1613253656f155b3844c8255a560f86e0acd Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> +Date: Mon, 6 Apr 2009 17:32:05 +0200 +Subject: [PATCH] DSS2: Check scaling limits against proper values +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +Move the ilace and fieldmode related height adjustments to be performed +before checking the scaling limits. + +Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> +--- + drivers/video/omap2/dss/dispc.c | 31 ++++++++++++++++--------------- + 1 files changed, 16 insertions(+), 15 deletions(-) + +diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c +index 61861d8..ae7be3d 100644 +--- a/drivers/video/omap2/dss/dispc.c ++++ b/drivers/video/omap2/dss/dispc.c +@@ -1366,10 +1366,25 @@ static int _dispc_setup_plane(enum omap_plane plane, + unsigned offset0, offset1; + s32 row_inc; + s32 pix_inc; ++ u16 frame_height = height; + + if (paddr == 0) + return -EINVAL; + ++ if (ilace && height >= out_height) ++ fieldmode = 1; ++ ++ if (ilace) { ++ if (fieldmode) ++ height /= 2; ++ pos_y /= 2; ++ out_height /= 2; ++ ++ DSSDBG("adjusting for ilace: height %d, pos_y %d, " ++ "out_height %d\n", ++ height, pos_y, out_height); ++ } ++ + if (plane == OMAP_DSS_GFX) { + if (width != out_width || height != out_height) + return -EINVAL; +@@ -1448,28 +1463,14 @@ static int _dispc_setup_plane(enum omap_plane plane, + return -EINVAL; + } + +- if (ilace && height >= out_height) +- fieldmode = 1; +- + calc_rotation_offset(rotation, mirror, +- screen_width, width, height, color_mode, ++ screen_width, width, frame_height, color_mode, + fieldmode, + &offset0, &offset1, &row_inc, &pix_inc); + + DSSDBG("offset0 %u, offset1 %u, row_inc %d, pix_inc %d\n", + offset0, offset1, row_inc, pix_inc); + +- if (ilace) { +- if (fieldmode) +- height /= 2; +- pos_y /= 2; +- out_height /= 2; +- +- DSSDBG("adjusting for ilace: height %d, pos_y %d, " +- "out_height %d\n", +- height, pos_y, out_height); +- } +- + _dispc_set_channel_out(plane, channel_out); + _dispc_set_color_mode(plane, color_mode); + +-- +1.5.6.5 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0021-DSS2-Add-venc-register-dump.patch b/recipes/linux/linux-omap-2.6.29/dss2/0021-DSS2-Add-venc-register-dump.patch new file mode 100644 index 0000000000..31ff180228 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0021-DSS2-Add-venc-register-dump.patch @@ -0,0 +1,96 @@ +From c5e71be877e71c7df329205307e830f158c403bf Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> +Date: Mon, 6 Apr 2009 17:32:06 +0200 +Subject: [PATCH] DSS2: Add venc register dump +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +Add a new file to debugfs to dump the VENC registers. The function +prototype was already there but the implementation was missing. + +Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> +--- + drivers/video/omap2/dss/venc.c | 55 ++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 55 insertions(+), 0 deletions(-) + +diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c +index aceed9f..b655df4 100644 +--- a/drivers/video/omap2/dss/venc.c ++++ b/drivers/video/omap2/dss/venc.c +@@ -30,6 +30,7 @@ + #include <linux/completion.h> + #include <linux/delay.h> + #include <linux/string.h> ++#include <linux/seq_file.h> + + #include <mach/display.h> + #include <mach/cpu.h> +@@ -81,6 +82,7 @@ + #define VENC_TVDETGP_INT_START_STOP_Y 0xB4 + #define VENC_GEN_CTRL 0xB8 + #define VENC_OUTPUT_CONTROL 0xC4 ++#define VENC_OUTPUT_TEST 0xC8 + #define VENC_DAC_B__DAC_C 0xC8 + + struct venc_config { +@@ -598,3 +600,56 @@ void venc_init_display(struct omap_display *display) + display->set_timings = venc_set_timings; + display->check_timings = venc_check_timings; + } ++ ++void venc_dump_regs(struct seq_file *s) ++{ ++#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, venc_read_reg(r)) ++ ++ venc_enable_clocks(1); ++ ++ DUMPREG(VENC_F_CONTROL); ++ DUMPREG(VENC_VIDOUT_CTRL); ++ DUMPREG(VENC_SYNC_CTRL); ++ DUMPREG(VENC_LLEN); ++ DUMPREG(VENC_FLENS); ++ DUMPREG(VENC_HFLTR_CTRL); ++ DUMPREG(VENC_CC_CARR_WSS_CARR); ++ DUMPREG(VENC_C_PHASE); ++ DUMPREG(VENC_GAIN_U); ++ DUMPREG(VENC_GAIN_V); ++ DUMPREG(VENC_GAIN_Y); ++ DUMPREG(VENC_BLACK_LEVEL); ++ DUMPREG(VENC_BLANK_LEVEL); ++ DUMPREG(VENC_X_COLOR); ++ DUMPREG(VENC_M_CONTROL); ++ DUMPREG(VENC_BSTAMP_WSS_DATA); ++ DUMPREG(VENC_S_CARR); ++ DUMPREG(VENC_LINE21); ++ DUMPREG(VENC_LN_SEL); ++ DUMPREG(VENC_L21__WC_CTL); ++ DUMPREG(VENC_HTRIGGER_VTRIGGER); ++ DUMPREG(VENC_SAVID__EAVID); ++ DUMPREG(VENC_FLEN__FAL); ++ DUMPREG(VENC_LAL__PHASE_RESET); ++ DUMPREG(VENC_HS_INT_START_STOP_X); ++ DUMPREG(VENC_HS_EXT_START_STOP_X); ++ DUMPREG(VENC_VS_INT_START_X); ++ DUMPREG(VENC_VS_INT_STOP_X__VS_INT_START_Y); ++ DUMPREG(VENC_VS_INT_STOP_Y__VS_EXT_START_X); ++ DUMPREG(VENC_VS_EXT_STOP_X__VS_EXT_START_Y); ++ DUMPREG(VENC_VS_EXT_STOP_Y); ++ DUMPREG(VENC_AVID_START_STOP_X); ++ DUMPREG(VENC_AVID_START_STOP_Y); ++ DUMPREG(VENC_FID_INT_START_X__FID_INT_START_Y); ++ DUMPREG(VENC_FID_INT_OFFSET_Y__FID_EXT_START_X); ++ DUMPREG(VENC_FID_EXT_START_Y__FID_EXT_OFFSET_Y); ++ DUMPREG(VENC_TVDETGP_INT_START_STOP_X); ++ DUMPREG(VENC_TVDETGP_INT_START_STOP_Y); ++ DUMPREG(VENC_GEN_CTRL); ++ DUMPREG(VENC_OUTPUT_CONTROL); ++ DUMPREG(VENC_OUTPUT_TEST); ++ ++ venc_enable_clocks(0); ++ ++#undef DUMPREG ++} +-- +1.5.6.5 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0022-DSS2-FB-remove-unused-var-warning.patch b/recipes/linux/linux-omap-2.6.29/dss2/0022-DSS2-FB-remove-unused-var-warning.patch new file mode 100644 index 0000000000..d4fb327c76 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0022-DSS2-FB-remove-unused-var-warning.patch @@ -0,0 +1,27 @@ +From facfd479bb6efad76eec1e74048cb7a31da7287d Mon Sep 17 00:00:00 2001 +From: Imre Deak <imre.deak@nokia.com> +Date: Mon, 6 Apr 2009 22:26:04 +0200 +Subject: [PATCH] DSS2: FB: remove unused var warning + +Signed-off-by: Imre Deak <imre.deak@nokia.com> +--- + drivers/video/omap2/omapfb/omapfb-main.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c +index afe40a9..12ce0c3 100644 +--- a/drivers/video/omap2/omapfb/omapfb-main.c ++++ b/drivers/video/omap2/omapfb/omapfb-main.c +@@ -1246,7 +1246,9 @@ static int omapfb_alloc_fbmem_display(struct fb_info *fbi, unsigned long size, + display->get_resolution(display, &w, &h); + + if (ofbi->rotation_type == OMAPFB_ROT_VRFB) { ++#ifdef DEBUG + int oldw = w, oldh = h; ++#endif + + omap_vrfb_adjust_size(&w, &h, bytespp); + +-- +1.5.6.5 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch b/recipes/linux/linux-omap-2.6.29/dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch new file mode 100644 index 0000000000..6492905530 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch @@ -0,0 +1,214 @@ +From c02b843c2732bc7b15a3e35b5dd715d68225bbd1 Mon Sep 17 00:00:00 2001 +From: Imre Deak <imre.deak@nokia.com> +Date: Wed, 8 Apr 2009 12:51:46 +0200 +Subject: [PATCH] DSS2: pass the default FB color format through board info + +Add a field to the FB memory region platform data, so that board +init code can pass a default color format to the driver. Set this +format as an initial setting for the given FB. + +This is needed for an upcoming patch that adds detection of the +color format set by the bootloader. + +Signed-off-by: Imre Deak <imre.deak@nokia.com> +--- + drivers/video/omap2/omapfb/omapfb-main.c | 121 +++++++++++++++++++++++++++--- + drivers/video/omap2/omapfb/omapfb.h | 2 + + include/linux/omapfb.h | 5 + + 3 files changed, 117 insertions(+), 11 deletions(-) + +diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c +index 12ce0c3..67c67c2 100644 +--- a/drivers/video/omap2/omapfb/omapfb-main.c ++++ b/drivers/video/omap2/omapfb/omapfb-main.c +@@ -370,6 +370,21 @@ static enum omap_color_mode fb_mode_to_dss_mode(struct fb_var_screeninfo *var) + return -EINVAL; + } + ++static int dss_mode_to_fb_mode(enum omap_color_mode dssmode, ++ struct fb_var_screeninfo *var) ++{ ++ int i; ++ ++ for (i = 0; i < ARRAY_SIZE(omapfb_colormodes); ++i) { ++ struct omapfb_colormode *mode = &omapfb_colormodes[i]; ++ if (dssmode == mode->dssmode) { ++ assign_colormode_to_var(var, mode); ++ return 0; ++ } ++ } ++ return -ENOENT; ++} ++ + void set_fb_fix(struct fb_info *fbi) + { + struct fb_fix_screeninfo *fix = &fbi->fix; +@@ -1267,6 +1282,60 @@ static int omapfb_alloc_fbmem_display(struct fb_info *fbi, unsigned long size, + return omapfb_alloc_fbmem(fbi, size, paddr); + } + ++static enum omap_color_mode fb_format_to_dss_mode(enum omapfb_color_format format) ++{ ++ enum omap_color_mode mode; ++ ++ switch (format) { ++ case OMAPFB_COLOR_RGB565: ++ mode = OMAP_DSS_COLOR_RGB16; ++ break; ++ case OMAPFB_COLOR_YUV422: ++ mode = OMAP_DSS_COLOR_YUV2; ++ break; ++ case OMAPFB_COLOR_CLUT_8BPP: ++ mode = OMAP_DSS_COLOR_CLUT8; ++ break; ++ case OMAPFB_COLOR_CLUT_4BPP: ++ mode = OMAP_DSS_COLOR_CLUT4; ++ break; ++ case OMAPFB_COLOR_CLUT_2BPP: ++ mode = OMAP_DSS_COLOR_CLUT2; ++ break; ++ case OMAPFB_COLOR_CLUT_1BPP: ++ mode = OMAP_DSS_COLOR_CLUT1; ++ break; ++ case OMAPFB_COLOR_RGB444: ++ mode = OMAP_DSS_COLOR_RGB12U; ++ break; ++ case OMAPFB_COLOR_YUY422: ++ mode = OMAP_DSS_COLOR_UYVY; ++ break; ++ case OMAPFB_COLOR_ARGB16: ++ mode = OMAP_DSS_COLOR_ARGB16; ++ break; ++ case OMAPFB_COLOR_RGB24U: ++ mode = OMAP_DSS_COLOR_RGB24U; ++ break; ++ case OMAPFB_COLOR_RGB24P: ++ mode = OMAP_DSS_COLOR_RGB24P; ++ break; ++ case OMAPFB_COLOR_ARGB32: ++ mode = OMAP_DSS_COLOR_ARGB32; ++ break; ++ case OMAPFB_COLOR_RGBA32: ++ mode = OMAP_DSS_COLOR_RGBA32; ++ break; ++ case OMAPFB_COLOR_RGBX32: ++ mode = OMAP_DSS_COLOR_RGBX32; ++ break; ++ default: ++ mode = -EINVAL; ++ } ++ ++ return mode; ++} ++ + static int omapfb_parse_vram_param(const char *param, int max_entries, + unsigned long *sizes, unsigned long *paddrs) + { +@@ -1483,9 +1552,36 @@ int omapfb_fb_init(struct omapfb2_device *fbdev, struct fb_info *fbi) + } + + var->nonstd = 0; ++ var->bits_per_pixel = 0; + + var->rotate = ofbi->rotation; + ++ /* ++ * Check if there is a default color format set in the board file, ++ * and use this format instead the default deducted from the ++ * display bpp. ++ */ ++ if (fbdev->dev->platform_data) { ++ struct omapfb_platform_data *opd; ++ int id = ofbi->id; ++ ++ opd = fbdev->dev->platform_data; ++ if (opd->mem_desc.region[id].format_used) { ++ enum omap_color_mode mode; ++ enum omapfb_color_format format; ++ ++ format = opd->mem_desc.region[id].format; ++ mode = fb_format_to_dss_mode(format); ++ if (mode < 0) { ++ r = mode; ++ goto err; ++ } ++ r = dss_mode_to_fb_mode(mode, var); ++ if (r < 0) ++ goto err; ++ } ++ } ++ + if (display) { + u16 w, h; + display->get_resolution(display, &w, &h); +@@ -1502,16 +1598,18 @@ int omapfb_fb_init(struct omapfb2_device *fbdev, struct fb_info *fbi) + var->xres_virtual = var->xres; + var->yres_virtual = var->yres; + +- switch (display->get_recommended_bpp(display)) { +- case 16: +- var->bits_per_pixel = 16; +- break; +- case 24: +- var->bits_per_pixel = 32; +- break; +- default: +- dev_err(fbdev->dev, "illegal display bpp\n"); +- return -EINVAL; ++ if (!var->bits_per_pixel) { ++ switch (display->get_recommended_bpp(display)) { ++ case 16: ++ var->bits_per_pixel = 16; ++ break; ++ case 24: ++ var->bits_per_pixel = 32; ++ break; ++ default: ++ dev_err(fbdev->dev, "illegal display bpp\n"); ++ return -EINVAL; ++ } + } + } else { + /* if there's no display, let's just guess some basic values */ +@@ -1519,7 +1617,8 @@ int omapfb_fb_init(struct omapfb2_device *fbdev, struct fb_info *fbi) + var->yres = 240; + var->xres_virtual = var->xres; + var->yres_virtual = var->yres; +- var->bits_per_pixel = 16; ++ if (!var->bits_per_pixel) ++ var->bits_per_pixel = 16; + } + + r = check_fb_var(fbi, var); +diff --git a/drivers/video/omap2/omapfb/omapfb.h b/drivers/video/omap2/omapfb/omapfb.h +index 65e9e6e..2607def 100644 +--- a/drivers/video/omap2/omapfb/omapfb.h ++++ b/drivers/video/omap2/omapfb/omapfb.h +@@ -27,6 +27,8 @@ + #define DEBUG + #endif + ++#include <mach/display.h> ++ + #ifdef DEBUG + extern unsigned int omapfb_debug; + #define DBG(format, ...) \ +diff --git a/include/linux/omapfb.h b/include/linux/omapfb.h +index 96190b2..7a34f22 100644 +--- a/include/linux/omapfb.h ++++ b/include/linux/omapfb.h +@@ -298,6 +298,11 @@ struct omapfb_mem_region { + void __iomem *vaddr; + unsigned long size; + u8 type; /* OMAPFB_PLANE_MEM_* */ ++ enum omapfb_color_format format;/* OMAPFB_COLOR_* */ ++ unsigned format_used:1; /* Must be set when format is set. ++ * Needed b/c of the badly chosen 0 ++ * base for OMAPFB_COLOR_* values ++ */ + unsigned alloc:1; /* allocated by the driver */ + unsigned map:1; /* kernel mapped by the driver */ + }; +-- +1.5.6.5 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch b/recipes/linux/linux-omap-2.6.29/dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch new file mode 100644 index 0000000000..559e49f40a --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch @@ -0,0 +1,48 @@ +From 2710416c43572652cb5355a5eaf68038c95659e8 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen <tomi.valkeinen@nokia.com> +Date: Thu, 9 Apr 2009 12:10:46 +0300 +Subject: [PATCH] DSS2: Beagle: Use gpio_set_value + +--- + arch/arm/mach-omap2/board-omap3beagle.c | 10 +++++++--- + 1 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index b67e7a5..8c1961d 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -372,7 +372,7 @@ static struct platform_device keys_gpio = { + static int beagle_enable_dvi(struct omap_display *display) + { + if (display->hw_config.panel_reset_gpio != -1) +- gpio_direction_output(display->hw_config.panel_reset_gpio, 1); ++ gpio_set_value(display->hw_config.panel_reset_gpio, 1); + + return 0; + } +@@ -380,7 +380,7 @@ static int beagle_enable_dvi(struct omap_display *display) + static void beagle_disable_dvi(struct omap_display *display) + { + if (display->hw_config.panel_reset_gpio != -1) +- gpio_direction_output(display->hw_config.panel_reset_gpio, 0); ++ gpio_set_value(display->hw_config.panel_reset_gpio, 0); + } + + static struct omap_dss_display_config beagle_display_data_dvi = { +@@ -445,8 +445,12 @@ static void __init beagle_display_init(void) + int r; + + r = gpio_request(beagle_display_data_dvi.panel_reset_gpio, "DVI reset"); +- if (r < 0) ++ if (r < 0) { + printk(KERN_ERR "Unable to get DVI reset GPIO\n"); ++ return; ++ } ++ ++ gpio_direction_output(beagle_display_data_dvi.panel_reset_gpio, 0); + } + + static struct omap_board_config_kernel omap3_beagle_config[] __initdata = { +-- +1.5.6.5 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch b/recipes/linux/linux-omap-2.6.29/dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch new file mode 100644 index 0000000000..e81b1331bb --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch @@ -0,0 +1,28 @@ +From 990f3160d33361c135ee72e91f202e05a8c378fc Mon Sep 17 00:00:00 2001 +From: Hardik Shah <hardik.shah@ti.com> +Date: Mon, 13 Apr 2009 18:50:24 +0530 +Subject: [PATCH] DSS2: VRFB: Macro for calculating base address of the VRFB context was faulty + +Signed-off-by: Hardik Shah <hardik.shah@ti.com> +--- + arch/arm/plat-omap/vrfb.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/plat-omap/vrfb.c b/arch/arm/plat-omap/vrfb.c +index 7e0f8fc..d68065f 100644 +--- a/arch/arm/plat-omap/vrfb.c ++++ b/arch/arm/plat-omap/vrfb.c +@@ -16,8 +16,8 @@ + + #define SMS_ROT_VIRT_BASE(context, rot) \ + (((context >= 4) ? 0xD0000000 : 0x70000000) \ +- | 0x4000000 * (context) \ +- | 0x1000000 * (rot)) ++ + (0x4000000 * (context)) \ ++ + (0x1000000 * (rot))) + + #define OMAP_VRFB_SIZE (2048 * 2048 * 4) + +-- +1.5.6.5 + diff --git a/recipes/linux/linux-omap_2.6.29.bb b/recipes/linux/linux-omap_2.6.29.bb index 0948e46060..a580a43542 100644 --- a/recipes/linux/linux-omap_2.6.29.bb +++ b/recipes/linux/linux-omap_2.6.29.bb @@ -39,6 +39,13 @@ SRC_URI_append = " \ file://dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch;patch=1 \ file://dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch;patch=1 \ file://dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch;patch=1 \ + file://dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch;patch=1 \ + file://dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch;patch=1 \ + file://dss2/0021-DSS2-Add-venc-register-dump.patch;patch=1 \ + file://dss2/0022-DSS2-FB-remove-unused-var-warning.patch;patch=1 \ + file://dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch;patch=1 \ + file://dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch;patch=1 \ + file://dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch;patch=1 \ file://0001-board-ldp-add-regulator-info-to-get-the-microSD-slo.patch;patch=1 \ file://fix-unaligned-access.diff;patch=1 \ file://make-alignment-visible.diff;patch=1 \ diff --git a/recipes/linux/linux/atngw100/defconfig b/recipes/linux/linux/atngw100/defconfig index 290dce50c5..489d094f3c 100644 --- a/recipes/linux/linux/atngw100/defconfig +++ b/recipes/linux/linux/atngw100/defconfig @@ -1,36 +1,38 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21 -# Sat Jun 2 10:40:44 2007 +# Linux kernel version: 2.6.29 +# Tue Apr 14 21:56:13 2009 # CONFIG_AVR32=y CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # 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_GENERIC_BUG=y 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 is not set +CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y -# CONFIG_IPC_NS is not set CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y @@ -38,15 +40,29 @@ CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y # CONFIG_TASK_XACCT is not set -# CONFIG_UTS_NS is not set CONFIG_AUDIT=y -# CONFIG_IKCONFIG is not set -CONFIG_SYSFS_DEPRECATED=y + +# +# RCU Subsystem +# +# CONFIG_CLASSIC_RCU is not set +# CONFIG_TREE_RCU is not set +CONFIG_PREEMPT_RCU=y +CONFIG_RCU_TRACE=y +# CONFIG_TREE_RCU_TRACE is not set +CONFIG_PREEMPT_RCU_TRACE=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_GROUP_SCHED is not set +# CONFIG_CGROUPS is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set CONFIG_RELAY=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" +# CONFIG_NAMESPACES is not set +# CONFIG_BLK_DEV_INITRD is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y @@ -59,31 +75,36 @@ CONFIG_ELF_CORE=y # CONFIG_BASE_FULL is not set CONFIG_FUTEX=y CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y -CONFIG_SLAB=y +CONFIG_AIO=y CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_COMPAT_BRK is not set +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_CLK=y +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y -# CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=1 -# CONFIG_SLOB is not set - -# -# Loadable module support -# CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set -# CONFIG_KMOD is not set - -# -# 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 +# CONFIG_BLK_DEV_INTEGRITY is not set # # IO Schedulers @@ -97,24 +118,42 @@ CONFIG_IOSCHED_NOOP=y # CONFIG_DEFAULT_CFQ is not set CONFIG_DEFAULT_NOOP=y CONFIG_DEFAULT_IOSCHED="noop" +CONFIG_FREEZER=y # # System Type and features # +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_SUBARCH_AVR32B=y CONFIG_MMU=y CONFIG_PERFORMANCE_COUNTERS=y CONFIG_PLATFORM_AT32AP=y +CONFIG_CPU_AT32AP700X=y CONFIG_CPU_AT32AP7000=y -CONFIG_BOARD_ATSTK1002=y -CONFIG_BOARD_ATSTK1000=y +# CONFIG_BOARD_ATSTK1000 is not set +CONFIG_BOARD_ATNGW100=y +# CONFIG_BOARD_HAMMERHEAD is not set +# CONFIG_BOARD_FAVR_32 is not set +# CONFIG_BOARD_MIMC200 is not set +# CONFIG_BOARD_ATNGW100_EVKLCD10X is not set CONFIG_LOADER_U_BOOT=y + +# +# Atmel AVR32 AP options +# +# CONFIG_AP700X_32_BIT_SMC is not set +CONFIG_AP700X_16_BIT_SMC=y +# CONFIG_AP700X_8_BIT_SMC is not set CONFIG_LOAD_ADDRESS=0x10000000 CONFIG_ENTRY_ADDRESS=0x90000000 CONFIG_PHYS_OFFSET=0x10000000 -CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set -# CONFIG_PREEMPT is not set +CONFIG_PREEMPT=y +CONFIG_QUICKLIST=y # CONFIG_HAVE_ARCH_BOOTMEM_NODE is not set # CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set # CONFIG_NEED_NODE_MEMMAP_SIZE is not set @@ -127,94 +166,331 @@ CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y -# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_RESOURCES_64BIT is not set +# CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 +CONFIG_NR_QUICK=2 +CONFIG_VIRT_TO_BUS=y +CONFIG_UNEVICTABLE_LRU=y # CONFIG_OWNERSHIP_TRACE is not set +# CONFIG_NMI_DEBUGGING is not set # CONFIG_HZ_100 is not set CONFIG_HZ_250=y # CONFIG_HZ_300 is not set # CONFIG_HZ_1000 is not set CONFIG_HZ=250 -CONFIG_CMDLINE="" +CONFIG_SCHED_HRTICK=y +CONFIG_CMDLINE=" debug " # -# Bus options +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y + # +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=m +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=m +# CONFIG_CPU_FREQ_STAT_DETAILS is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +CONFIG_CPU_FREQ_AT32AP=y # -# PCCARD (PCMCIA/CardBus) support +# Bus options # +# CONFIG_ARCH_SUPPORTS_MSI is not set # CONFIG_PCCARD is not set # # Executable file formats # CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_HAVE_AOUT is not set # CONFIG_BINFMT_MISC is not set - -# -# Networking -# CONFIG_NET=y # # Networking options # -# CONFIG_NETDEBUG is not set +CONFIG_COMPAT_NET_DEV_OPS=y CONFIG_PACKET=y 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 is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m # CONFIG_NET_KEY is not set CONFIG_INET=y -# CONFIG_IP_MULTICAST is not set -# CONFIG_IP_ADVANCED_ROUTER is not set +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=y +CONFIG_IP_ROUTE_VERBOSE=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y # CONFIG_IP_PNP_BOOTP is not set # CONFIG_IP_PNP_RARP is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE is not set -# CONFIG_ARPD is not set -# CONFIG_SYN_COOKIES is not set -# CONFIG_INET_AH is not set -# CONFIG_INET_ESP is not set -# CONFIG_INET_IPCOMP is not set -# CONFIG_INET_XFRM_TUNNEL is not set -# CONFIG_INET_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +# CONFIG_IP_MROUTE is not set +CONFIG_ARPD=y +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_LRO=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 is not set -# CONFIG_IPV6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_NETWORK_SECMARK is not set -# CONFIG_NETFILTER is not set - -# -# DCCP Configuration (EXPERIMENTAL) -# +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=m +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +# CONFIG_DEFAULT_BIC is not set +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +CONFIG_DEFAULT_RENO=y +CONFIG_DEFAULT_TCP_CONG="reno" +CONFIG_TCP_MD5SIG=y +CONFIG_IPV6=m +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +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=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +# CONFIG_IPV6_MROUTE is not set +CONFIG_NETWORK_SECMARK=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +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_TPROXY is not set +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=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_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_VS=m +CONFIG_IP_VS_IPV6=y +CONFIG_IP_VS_DEBUG=y +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_TTL=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_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=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 +# +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m # CONFIG_IP_DCCP is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# # CONFIG_IP_SCTP is not set - -# -# TIPC Configuration (EXPERIMENTAL) -# # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set # CONFIG_LLC2 is not set @@ -224,20 +500,77 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # 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 +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +# CONFIG_NET_SCH_INGRESS is not set + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set # # Network testing # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set # CONFIG_IRDA is not set # CONFIG_BT is not set -# CONFIG_IEEE80211 is not set +# CONFIG_AF_RXRPC is not set +# CONFIG_PHONET is not set +CONFIG_FIB_RULES=y +# CONFIG_WIRELESS is not set +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set # # Device Drivers @@ -246,27 +579,22 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # # Generic Driver Options # +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_STANDALONE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_FW_LOADER is not set # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set - -# -# Connector - unified userspace <-> kernelspace linker -# # CONFIG_CONNECTOR is not set - -# -# Memory Technology Devices (MTD) -# CONFIG_MTD=y # CONFIG_MTD_DEBUG is not set # CONFIG_MTD_CONCAT is not set CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_TESTS is not set # CONFIG_MTD_REDBOOT_PARTS is not set CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AR7_PARTS is not set # # User Modules And Translation Layers @@ -279,6 +607,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 @@ -304,21 +633,22 @@ CONFIG_MTD_CFI_UTIL=y # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_ABSENT is not set -# CONFIG_MTD_OBSOLETE_CHIPS is not set # # Mapping drivers for chip access # # CONFIG_MTD_COMPLEX_MAPPINGS is not set CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_PHYSMAP_START=0x8000000 -CONFIG_MTD_PHYSMAP_LEN=0x0 -CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +# CONFIG_MTD_PHYSMAP_COMPAT is not set # CONFIG_MTD_PLATRAM is not set # # Self-contained MTD device drivers # +CONFIG_MTD_DATAFLASH=y +# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set +# CONFIG_MTD_DATAFLASH_OTP is not set +# CONFIG_MTD_M25P80 is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set # CONFIG_MTD_MTDRAM is not set @@ -330,120 +660,115 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set - -# -# NAND Flash Device Drivers -# # CONFIG_MTD_NAND is not set - -# -# OneNAND Flash Device Drivers -# # CONFIG_MTD_ONENAND is not set # -# Parallel port support +# LPDDR flash memory drivers # -# CONFIG_PARPORT is not set +# CONFIG_MTD_LPDDR is not set # -# Plug and Play support +# UBI - Unsorted block images # -# CONFIG_PNPACPI is not set +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +CONFIG_MTD_UBI_GLUEBI=y # -# Block devices +# UBI debugging options # +# CONFIG_MTD_UBI_DEBUG is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=m # CONFIG_BLK_DEV_CRYPTOLOOP is not set CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=m -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=4096 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +# 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_ATMEL_PWM=m +CONFIG_ATMEL_TCLIB=y +CONFIG_ATMEL_TCB_CLKSRC=y +CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 +# CONFIG_ICS932S401 is not set +CONFIG_ATMEL_SSC=m +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_C2PORT is not set # -# Misc devices -# - -# -# ATA/ATAPI/MFM/RLL support +# EEPROM support # -# CONFIG_IDE is not set +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_AT25=m +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_93CX6 is not set # # SCSI device support # # CONFIG_RAID_ATTRS is not set # CONFIG_SCSI is not set +# CONFIG_SCSI_DMA is not set # CONFIG_SCSI_NETLINK is not set - -# -# Serial ATA (prod) and Parallel ATA (experimental) drivers -# # CONFIG_ATA is not set - -# -# Multi-device support (RAID and LVM) -# # CONFIG_MD is not set - -# -# Fusion MPT device support -# -# CONFIG_FUSION is not set - -# -# IEEE 1394 (FireWire) support -# - -# -# I2O device support -# - -# -# Network device support -# CONFIG_NETDEVICES=y -CONFIG_DUMMY=y +# CONFIG_IFB is not set +# CONFIG_DUMMY is not set # CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set CONFIG_TUN=m - -# -# PHY device support -# -# CONFIG_PHYLIB is not set - -# -# Ethernet (10 or 100Mbit) -# +# CONFIG_VETH is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set CONFIG_NET_ETHERNET=y CONFIG_MII=y CONFIG_MACB=y +# CONFIG_ENC28J60 is not set +# CONFIG_DNET 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_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_B44 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set # -# Ethernet (1000 Mbit) -# - -# -# Ethernet (10000 Mbit) -# - -# -# Token Ring devices -# - -# -# Wireless LAN (non-hamradio) +# Wireless LAN # -# CONFIG_NET_RADIO is not set +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set +# CONFIG_IWLWIFI_LEDS is not set # -# Wan interfaces +# Enable WiMAX (Networking options) to see the WiMAX drivers # # CONFIG_WAN is not set CONFIG_PPP=m @@ -453,23 +778,15 @@ CONFIG_PPP_ASYNC=m # CONFIG_PPP_SYNC_TTY is not set CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m -# CONFIG_PPP_MPPE is not set -# CONFIG_PPPOE is not set +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPPOL2TP=m # CONFIG_SLIP is not set CONFIG_SLHC=m -# CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set - -# -# ISDN subsystem -# # CONFIG_ISDN is not set - -# -# Telephony Support -# # CONFIG_PHONE is not set # @@ -487,6 +804,7 @@ CONFIG_SLHC=m # Character devices # # CONFIG_VT is not set +CONFIG_DEVKMEM=y # CONFIG_SERIAL_NONSTANDARD is not set # @@ -499,188 +817,394 @@ CONFIG_SLHC=m # CONFIG_SERIAL_ATMEL=y CONFIG_SERIAL_ATMEL_CONSOLE=y +CONFIG_SERIAL_ATMEL_PDC=y # CONFIG_SERIAL_ATMEL_TTYAT is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_LEGACY_PTYS is not set +# CONFIG_IPMI_HANDLER is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_ALGOBIT=m # -# IPMI +# I2C Hardware Bus support # -# CONFIG_IPMI_HANDLER is not set # -# Watchdog Cards +# I2C system bus drivers (mostly embedded / system-on-chip) # -# CONFIG_WATCHDOG is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_RTC is not set -# CONFIG_GEN_RTC is not set -# CONFIG_DTLK is not set -# CONFIG_R3964 is not set -# CONFIG_RAW_DRIVER is not set +CONFIG_I2C_GPIO=m +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_SIMTEC is not set # -# TPM devices +# External I2C/SMBus adapter drivers # -# CONFIG_TCG_TPM is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set # -# I2C support +# Other I2C/SMBus bus drivers # -# CONFIG_I2C is not set +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set # -# SPI support +# Miscellaneous I2C Chip support # -# CONFIG_SPI is not set -# CONFIG_SPI_MASTER is not set +# CONFIG_DS1682 is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_PCF8575 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y # -# Dallas's 1-wire bus +# SPI Master Controller Drivers # -# CONFIG_W1 is not set +CONFIG_SPI_ATMEL=y +CONFIG_SPI_BITBANG=m +CONFIG_SPI_GPIO=m # -# Hardware Monitoring support +# SPI Protocol Masters # -# CONFIG_HWMON is not set -# CONFIG_HWMON_VID is not set +CONFIG_SPI_SPIDEV=m +# CONFIG_SPI_TLE62X0 is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +# CONFIG_GPIO_SYSFS is not set # -# Multifunction device drivers +# Memory mapped GPIO expanders: # -# CONFIG_MFD_SM501 is not set # -# Multimedia devices +# I2C GPIO expanders: # -# CONFIG_VIDEO_DEV is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set # -# Digital Video Broadcasting Devices +# PCI GPIO expanders: # -# CONFIG_DVB is not set # -# Graphics support +# SPI GPIO expanders: # -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set -# CONFIG_FB is not set +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +# CONFIG_HWMON is not set +# CONFIG_THERMAL is not set +# CONFIG_THERMAL_HWMON is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set # -# Sound +# Watchdog Device Drivers # -# CONFIG_SOUND is not set +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_AT32AP700X_WDT=y +CONFIG_SSB_POSSIBLE=y # -# USB support +# Sonics Silicon Backplane # -# CONFIG_USB_ARCH_HAS_HCD is not set -# CONFIG_USB_ARCH_HAS_OHCI is not set -# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_SSB=m +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set # -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# Multifunction device drivers # +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_TPS65010 is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_REGULATOR is not set # -# USB Gadget Support +# Multimedia devices # -# CONFIG_USB_GADGET is not set # -# MMC/SD Card support +# Multimedia core support # -# CONFIG_MMC is not set +# CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +# CONFIG_VIDEO_MEDIA is not set # -# LED devices +# Multimedia drivers # -# CONFIG_NEW_LEDS is not set +# CONFIG_DAB is not set # -# LED drivers +# Graphics support # +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +# CONFIG_FB is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # -# LED Triggers +# Display device support # +# CONFIG_DISPLAY_SUPPORT is not set +# CONFIG_SOUND is not set +CONFIG_USB_SUPPORT=y +# CONFIG_USB_ARCH_HAS_HCD is not set +# CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +# CONFIG_USB_MUSB_HDRC is not set +# CONFIG_USB_GADGET_MUSB_HDRC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; +# +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AT91 is not set +CONFIG_USB_GADGET_ATMEL_USBA=y +CONFIG_USB_ATMEL_USBA=m +# CONFIG_USB_GADGET_FSL_USB2 is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_PXA25X is not set +# CONFIG_USB_GADGET_PXA27X is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_IMX is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_FSL_QE is not set +# CONFIG_USB_GADGET_CI13XXX is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m +# CONFIG_USB_MIDI_GADGET is not set +CONFIG_USB_G_PRINTER=m +CONFIG_USB_CDC_COMPOSITE=m + +# +# OTG and related infrastructure +# +# CONFIG_USB_GPIO_VBUS is not set +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +CONFIG_MMC_ATMELMCI=y +# CONFIG_MMC_ATMELMCI_DMA is not set +CONFIG_MMC_SPI=m +# CONFIG_MEMSTICK is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y # -# InfiniBand support +# LED drivers # +# CONFIG_LEDS_ATMEL_PWM is not set +CONFIG_LEDS_GPIO=y +# CONFIG_LEDS_PCA955X is not set # -# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) +# LED Triggers # +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +# CONFIG_ACCESSIBILITY is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set # -# Real Time Clock +# RTC interfaces # -# CONFIG_RTC_CLASS is not set +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set # -# DMA Engine support +# I2C RTC drivers # -# CONFIG_DMA_ENGINE is not set +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set # -# DMA Clients +# SPI RTC drivers # +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set # -# DMA Devices +# Platform RTC drivers +# +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_V3020 is not set + # +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_AT32AP700X=y +CONFIG_DMADEVICES=y # -# Auxiliary Display support +# DMA Devices # +CONFIG_DW_DMAC=y +CONFIG_DMA_ENGINE=y # -# Virtualization +# DMA Clients # +# CONFIG_NET_DMA is not set +# CONFIG_DMATEST is not set +CONFIG_UIO=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m +# CONFIG_UIO_SMX is not set +# CONFIG_UIO_SERCOS3 is not set +# CONFIG_STAGING is not set # # File systems # -CONFIG_EXT2_FS=m -# CONFIG_EXT2_FS_XATTR is not set +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +# CONFIG_EXT2_FS_POSIX_ACL is not set +# CONFIG_EXT2_FS_SECURITY is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set -# CONFIG_EXT4DEV_FS is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +CONFIG_EXT4_FS=m +# CONFIG_EXT4DEV_COMPAT is not set +CONFIG_EXT4_FS_XATTR=y +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_EXT4_FS_SECURITY is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -# CONFIG_FS_POSIX_ACL is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_FILE_LOCKING=y # CONFIG_XFS_FS is not set -# CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set -CONFIG_MINIX_FS=m -# CONFIG_ROMFS_FS is not set +# CONFIG_BTRFS_FS is not set +CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set -# CONFIG_DNOTIFY is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m # # CD-ROM/DVD Filesystems # -# CONFIG_ISO9660_FS is not set -# CONFIG_UDF_FS is not set +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y # # DOS/FAT/NT Filesystems # CONFIG_FAT_FS=m -CONFIG_MSDOS_FS=m +# CONFIG_MSDOS_FS is not set CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_NTFS_FS is not set +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y # # Pseudo filesystems @@ -688,16 +1212,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set -CONFIG_RAMFS=y CONFIG_CONFIGFS_FS=m - -# -# Miscellaneous filesystems -# +CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set @@ -708,47 +1229,83 @@ CONFIG_CONFIGFS_FS=m CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_FS_XATTR is not set -# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set -# CONFIG_CRAMFS is not set +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +# CONFIG_JFFS2_CMODE_PRIORITY is not set +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_JFFS2_CMODE_FAVOURLZO=y +CONFIG_UBIFS_FS=y +CONFIG_UBIFS_FS_XATTR=y +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set - -# -# Network File Systems -# -# CONFIG_NFS_FS is not set -# CONFIG_NFSD is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_ROOT_NFS=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +# CONFIG_SUNRPC_REGISTER_V4 is not set +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_XATTR=y +# CONFIG_CIFS_POSIX is not set +# CONFIG_CIFS_DEBUG2 is not set +CONFIG_CIFS_EXPERIMENTAL=y # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set -# CONFIG_9P_FS is not set # # Partition Types # # CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y - -# -# Native Language Support -# -CONFIG_NLS=m -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf-8" CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_CODEPAGE_852 is not set +CONFIG_NLS_CODEPAGE_852=m # CONFIG_NLS_CODEPAGE_855 is not set # CONFIG_NLS_CODEPAGE_857 is not set # CONFIG_NLS_CODEPAGE_860 is not set @@ -769,7 +1326,7 @@ CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ASCII is not set CONFIG_NLS_ISO8859_1=m -# CONFIG_NLS_ISO8859_2 is not set +CONFIG_NLS_ISO8859_2=m # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set # CONFIG_NLS_ISO8859_5 is not set @@ -781,69 +1338,195 @@ CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_15 is not set # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set -CONFIG_NLS_UTF8=m - -# -# Distributed Lock Manager -# +CONFIG_NLS_UTF8=y # CONFIG_DLM is not set # # Kernel hacking # -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set +CONFIG_PRINTK_TIME=y +# CONFIG_ENABLE_WARN_DEPRECATED is not set CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set -CONFIG_LOG_BUF_SHIFT=14 CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +# CONFIG_SCHED_DEBUG is not set # CONFIG_SCHEDSTATS is not set CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +# CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_DEBUG_LIST is not set -CONFIG_FRAME_POINTER=y -CONFIG_FORCED_INLINING=y +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_FRAME_POINTER is not set +# CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_FAULT_INJECTION is not set -# CONFIG_KPROBES is not set + +# +# Tracers +# +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_CONTEXT_SWITCH_TRACER is not set +# CONFIG_BOOT_TRACER is not set +# CONFIG_TRACE_BRANCH_PROFILING is not set +# CONFIG_DYNAMIC_PRINTK_DEBUG is not set +# CONFIG_SAMPLES is not set # # Security options # # CONFIG_KEYS is not set # CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_FIPS=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_LZO=y # -# Cryptographic options +# Random Number Generation # -# CONFIG_CRYPTO is not set +CONFIG_CRYPTO_ANSI_CPRNG=m +# CONFIG_CRYPTO_HW is not set # # Library routines # CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y CONFIG_CRC_CCITT=m -# CONFIG_CRC16 is not set +CONFIG_CRC16=y +CONFIG_CRC_T10DIF=m +CONFIG_CRC_ITU_T=m CONFIG_CRC32=y -# CONFIG_LIBCRC32C is not set +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y diff --git a/recipes/linux/linux_2.6.28.bb b/recipes/linux/linux_2.6.28.bb index 6e6b28065b..b11bf166c3 100644 --- a/recipes/linux/linux_2.6.28.bb +++ b/recipes/linux/linux_2.6.28.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r6" +PR = "r8" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" diff --git a/recipes/linux/linux_2.6.29.bb b/recipes/linux/linux_2.6.29.bb index 0d1ced114c..1ba739b325 100644 --- a/recipes/linux/linux_2.6.29.bb +++ b/recipes/linux/linux_2.6.29.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r1" +PR = "r2" S = "${WORKDIR}/linux-2.6.29" @@ -10,6 +10,7 @@ DEFAULT_PREFERENCE_boc01 = "1" DEFAULT_PREFERENCE_canyonlands = "1" DEFAULT_PREFERENCE_tosa = "1" DEFAULT_PREFERENCE_vortex86sx = "1" +DEFAULT_PREFERENCE_atngw100 = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 \ file://defconfig" diff --git a/recipes/ltrace/ltrace_0.4.bb b/recipes/ltrace/ltrace_0.4.bb index 19a0d43e33..9dc959e484 100644 --- a/recipes/ltrace/ltrace_0.4.bb +++ b/recipes/ltrace/ltrace_0.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://packages.debian.org/unstable/utils/ltrace.html" SECTION = "devel" DEPENDS = "binutils libelf" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4.orig.tar.gz \ ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1 \ @@ -18,6 +18,7 @@ EXTRA_OEMAKE = "INSTALL_FILE='$(INSTALL) -p -m 0644' \ INSTALL_DIR='$(INSTALL) -p -d -m 0755' " export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_INCDIR}" +TARGET_CC_ARCH += "${LDFLAGS}" do_configure_prepend() { ln -sf ./linux-gnu sysdeps/linux-gnueabi diff --git a/recipes/madbufferfly/madbutterfly/001_makefile.am_bugs.patch b/recipes/madbufferfly/madbutterfly/001_makefile.am_bugs.patch new file mode 100644 index 0000000000..783cf09646 --- /dev/null +++ b/recipes/madbufferfly/madbutterfly/001_makefile.am_bugs.patch @@ -0,0 +1,66 @@ +Index: git/src/Makefile.am +=================================================================== +--- git.orig/src/Makefile.am 2009-04-08 02:24:01.000000000 +0800 ++++ git/src/Makefile.am 2009-04-08 02:28:53.000000000 +0800 +@@ -2,18 +2,49 @@ + + lib_LTLIBRARIES = libmbfly.la + +-noinst_PROGRAMS = X_main + MBAF_SOURCES=mbaf/mbapp.c mbaf/mbbutton.c mbaf/mbobject.c mbaf/animated_menu.c +-libmbfly_la_SOURCES = animate.c chgcolor.c coord.c event.c geo.c \ +- observer.c paint.c redraw_man.c rotate.c shape_path.c \ +- shape_rect.c shape_text.c shift.c subtree_free.c timer.c \ +- timertool.c tools.c visibility.c X_supp.c prop.c sprite.c \ +- mouse.c shape_image.c img_ldr.c $(MBAF_SOURCES) ++libmbfly_la_SOURCES = animate.c \ ++ chgcolor.c \ ++ coord.c \ ++ event.c \ ++ geo.c \ ++ observer.c \ ++ paint.c \ ++ redraw_man.c \ ++ rotate.c \ ++ shape_path.c \ ++ shape_rect.c \ ++ shape_text.c \ ++ shift.c \ ++ subtree_free.c \ ++ timer.c \ ++ timertool.c \ ++ tools.c \ ++ visibility.c \ ++ X_supp.c \ ++ prop.c \ ++ sprite.c \ ++ mouse.c \ ++ shape_image.c \ ++ img_ldr.c \ ++ $(MBAF_SOURCES) ++ ++libmbfly_la_CFLAGS = @cairo_CFLAGS@ \ ++ @pangocairo_CFLAGS@ ++libmbfly_la_LDFLAGS = @cairo_LIBS@ \ ++ @pangocairo_LIBS@ + +-libmbfly_la_CPPFLAGS = @cairo_CFLAGS@ @pangocairo_CFLAGS@ +-libmbfly_la_LDFLAGS = @cairo_LIBS@ @pangocairo_LIBS@ ++bin_PROGRAMS = X_main ++noinst_PROGRAMS = X_main + + X_main_SOURCES = X_main.c +-X_main_LDADD = $(top_builddir)/src/libmbfly.la +-X_main_CPPFLAGS = @pangocairo_CFLAGS@ -I$(top_builddir)/src +-X_main_LDFLAGS = @pangocairo_LIBS@ ++X_main_LDADD = ${top_builddir}/src/libmbfly.la ++X_main_CFLAGS = @pangocairo_CFLAGS@ \ ++ @cairo_CFLAGS@ \ ++ -I${top_builddir}/include ++X_main_LDFLAGS = @pangocairo_LIBS@ \ ++ @cairo_LIBS@ ++ ++X_main: libmbfly.la ++ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(X_main_CFLAGS) $(X_main_LIBADD) X_main.c -o $@ $< ++ + diff --git a/recipes/madbufferfly/madbutterfly_git.bb b/recipes/madbufferfly/madbutterfly_git.bb new file mode 100644 index 0000000000..a0f31691f8 --- /dev/null +++ b/recipes/madbufferfly/madbutterfly_git.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "MadButterfly is a SVG browser. It can be used to be GUI environment of embedded system or desktop." +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "BSD" +DEPENDS = "cairo pango" +PV = "0.0.1+gitr${SRCREV}" + +SRC_URI = "git://git.gitorious.org/madbutterfly/mainline.git;protocol=git \ + file://001_makefile.am_bugs.patch;patch=1" + +S = "${WORKDIR}/git" + +inherit autotools + +FILES_${PN} += "/bin/* ${libdir}/*.so" +FILES_${PN}-dev += "${libdir}/*a ${libdir}/pkgconfig/* ${includedir}/* ${datadir}/*" diff --git a/recipes/mtkbabel/mtkbabel_0.7.bb b/recipes/mtkbabel/mtkbabel_0.8.bb index afbaa5368b..fb6aa969ab 100644 --- a/recipes/mtkbabel/mtkbabel_0.7.bb +++ b/recipes/mtkbabel/mtkbabel_0.8.bb @@ -6,9 +6,9 @@ PACKAGE_ARCH = "all" RDEPENDS = "libdevice-serialport-perl libtimedate-perl perl-module-file-basename perl-module-getopt-std" -SRC_URI = "http://www.rigacci.org/wiki/lib/exe/fetch.php/tecnica/download/local_software/mtkbabel-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/${PN}/${P}.tar.gz" -do_install() { +do_install() { install -d ${D}${bindir} install -m 0755 mtkbabel ${D}${bindir}/ install -d ${D}${mandir}/man1 diff --git a/recipes/nautilus/nautilus/no-try-run-strftime.diff b/recipes/nautilus/nautilus/no-try-run-strftime.diff new file mode 100644 index 0000000000..ccd2934b3a --- /dev/null +++ b/recipes/nautilus/nautilus/no-try-run-strftime.diff @@ -0,0 +1,28 @@ +--- /tmp/configure.in 2009-04-13 11:26:43.000000000 +0200 ++++ nautilus-2.26.1/configure.in 2009-04-13 11:28:37.000000000 +0200 +@@ -375,25 +375,6 @@ + + dnl =========================================================================== + +-dnl strftime checks +- +-AC_TRY_RUN([#include <time.h> +- int main () +- { +- char buf[100]; +- struct tm tm = {0}; +- tm.tm_year = 99; +- if (strftime(buf, 100, "%EY", &tm) == 4 && +- strcmp (buf, "1999")==0) +- return 0; +- return 1; +- } +- ], +- AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.]) +- ) +- +-dnl =========================================================================== +- + # + # Checks for Xft/XRender + # diff --git a/recipes/nautilus/nautilus_2.26.1.bb b/recipes/nautilus/nautilus_2.26.1.bb new file mode 100644 index 0000000000..8eb5c80ed9 --- /dev/null +++ b/recipes/nautilus/nautilus_2.26.1.bb @@ -0,0 +1,37 @@ +# nautilus OE build file +# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +inherit gnome + +SRC_URI += "file://idl-sysroot.patch;patch=1 \ + file://no-try-run-strftime.diff;patch=1 \ +" + +export SYSROOT = "${STAGING_DIR_HOST}" + +LICENSE="GPL" + +DEPENDS += " gvfs tracker librsvg libexif eel esound gnome-desktop orbit2-native" +RDEPENDS = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash" + +EXTRA_OECONF = " --disable-gtk-doc --disable-update-mimedb " + +PACKAGES += " libnautilus" + +FILES_${PN} += "${datadir}/icons /usr/libexec/ " +FILES_libnautilus = "/usr/lib/*.so*" +FILES_${PN}-dbg += "/usr/libexec/.debug" + +do_configure_prepend() { + sed -i -e /docs/d Makefile.am +} + +# We need native orbit-idl with target idl files. No way to say it in a clean way: +do_configure_append () { + find -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \; +} + +do_stage() { + autotools_stage_all +} diff --git a/recipes/obexftp/obexftp_0.23.bb b/recipes/obexftp/obexftp_0.23.bb new file mode 100644 index 0000000000..d3924f6039 --- /dev/null +++ b/recipes/obexftp/obexftp_0.23.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "OBEX Ftp Client based on openobex." +SECTION = "console/network" +HOMEPAGE = "http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp" +LICENSE = "GPL" +DEPENDS = "openobex bluez4 libusb-compat virtual/libiconv" + +SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.bz2 \ + " + +inherit autotools_stage +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +EXTRA_OECONF += "--enable-bluetooth \ + --disable-swig \ + --disable-perl \ + --disable-python \ + --disable-tcl \ + --disable-ruby \ + --disable-builddocs \ + --disable-rpath \ + " + +PARALLEL_MAKE = "" + +LEAD_SONAME = "libobexftp.so" + + diff --git a/recipes/openobex/obex-data-server_0.4.4.bb b/recipes/openobex/obex-data-server_0.4.4.bb new file mode 100644 index 0000000000..34efcc738a --- /dev/null +++ b/recipes/openobex/obex-data-server_0.4.4.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "obex-data-server is a D-Bus service providing high-level OBEX client and server side functionality" +LICENSE = "GPLv2" + +DEPENDS = "bluez4 dbus-glib openobex" + +SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz" + +inherit autotools + +FILES_${PN} += "${datadir}/dbus-1/" + diff --git a/recipes/openobex/openobex-1.5/libusb_crosscompile_check.patch b/recipes/openobex/openobex-1.5/libusb_crosscompile_check.patch new file mode 100644 index 0000000000..1177dfeac9 --- /dev/null +++ b/recipes/openobex/openobex-1.5/libusb_crosscompile_check.patch @@ -0,0 +1,11 @@ +--- /tmp/acinclude.m4 2009-04-12 10:32:15.000000000 +0200 ++++ openobex-1.5/acinclude.m4 2009-04-12 10:32:38.000000000 +0200 +@@ -158,7 +158,7 @@ + ;; + *) + PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no)) +- AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb") ++ REQUIRES="libusb" + ;; + esac + AC_SUBST(USB_CFLAGS) diff --git a/recipes/openobex/openobex_1.5.bb b/recipes/openobex/openobex_1.5.bb new file mode 100644 index 0000000000..ab69cf18e9 --- /dev/null +++ b/recipes/openobex/openobex_1.5.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "The Openobex project is an open source implementation of the \ +Object Exchange (OBEX) protocol." +HOMEPAGE = "http://openobex.triq.net" +SECTION = "libs" +PROVIDES = "openobex-apps" +DEPENDS = "libusb-compat bluez4" +LICENSE = "GPL" + +SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/openobex-${PV}.tar.gz \ + file://disable-cable-test.patch;patch=1 \ + file://libusb_crosscompile_check.patch;patch=1" + +inherit autotools_stage binconfig pkgconfig + +EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \ + --with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.." + +PACKAGES += "openobex-apps" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}/openobex-config" +FILES_${PN}-apps = "${bindir}/*" +DEBIAN_NOAUTONAME_${PN}-apps = "1" diff --git a/recipes/packagekit/gnome-packagekit_0.2.5.bb b/recipes/packagekit/gnome-packagekit_2.27.1.bb index 6d0341056c..ee3bfe356e 100644 --- a/recipes/packagekit/gnome-packagekit_0.2.5.bb +++ b/recipes/packagekit/gnome-packagekit_2.27.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GNOME frontend for packagekit" LICENSE = "GPL" -DEPENDS = "packagekit libgnome" +DEPENDS = "packagekit libsexy gconf-dbus policykit policykit-gnome libunique gnome-menus" inherit gnome diff --git a/recipes/packagekit/packagekit_0.4.5.bb b/recipes/packagekit/packagekit_0.4.6.bb index 89f4614cfd..b5ad645c90 100644 --- a/recipes/packagekit/packagekit_0.4.5.bb +++ b/recipes/packagekit/packagekit_0.4.6.bb @@ -5,6 +5,8 @@ LICENSE = "GPL" DEPENDS = "gtk+ python cppunit policykit dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)" RDEPENDS_${PN} = "opkg" +inherit gnome autotools_stage + SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz \ file://no_validate.patch;patch=1 \ file://opkg-fix-includes.diff;patch=1 \ @@ -14,8 +16,6 @@ PE = "1" S = "${WORKDIR}/PackageKit-${PV}" -inherit gnome autotools_stage - EXTRA_OECONF = "--with-security-framework=dummy \ --with-default-backend=opkg \ --enable-opkg \ @@ -37,6 +37,7 @@ do_configure_append() { for i in $(find . -name Makefile) ; do sed -i -e s:${STAGING_DIR_NATIVE}::g -e s:${bindir}/mkdir:${STAGING_BINDIR_NATIVE}/mkdir:g $i done + ( cd data ; for i in *.xml.in ; do mv $i $(echo $i | sed 's:.in::g') ; done ; touch foo.xml.in ) } @@ -49,7 +50,7 @@ FILES_${PN}-python = "${libdir}/python*" PACKAGES =+ "${PN}-gtkmodule" FILES_${PN}-gtkmodule = "${libdir}/gtk-2.0/*/*.so" -FILES_${PN} += "${libdir}/packagekit-backend/*.so ${libdir}/pm-utils ${datadir}/dbus-1/system-services/ ${datadir}/PolicyKit" +FILES_${PN} += "${libdir}/packagekit-backend/*.so ${libdir}/pm-utils ${datadir}/dbus-1/system-services/ ${datadir}/PolicyKit ${datadir}/PackageKit" FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so ${libdir}/gtk-2.0/*/.debug" FILES_${PN}-dev += "${libdir}/packagekit-backend/*a ${libdir}/gtk-2.0/*/*a" diff --git a/recipes/palmt650/palmt650-keyboard-modmap.bb b/recipes/palmt650/palmt650-keyboard-modmap.bb new file mode 100644 index 0000000000..c005136761 --- /dev/null +++ b/recipes/palmt650/palmt650-keyboard-modmap.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "A X keyboard modifier mapping for the Treo650" +LICENSE = "GPL" +PV = "0.0.3" +PR = "r0.02" + +SRC_URI = "\ + file://60xXmodmap \ + file://Xmodmap \ +" + +S = "${WORKDIR}" + +do_install() { + install -d ${D}/etc/X11/ + install ${WORKDIR}/Xmodmap ${D}/etc/X11/Xmodmap + install -d ${D}/etc/X11/Xsession.d + install ${WORKDIR}/60xXmodmap ${D}/etc/X11/Xsession.d/60xXmodmap +} + +PACKAGE_ARCH = "all" + +FILES_${PN} += "/etc/X11/Xmodmap" +FILES_${PN} += "/etc/X11/Xsession.d/60xXmodmap" diff --git a/recipes/palmt650/palmt650-keyboard-modmap/60xXmodmap b/recipes/palmt650/palmt650-keyboard-modmap/60xXmodmap new file mode 100644 index 0000000000..db814a06a8 --- /dev/null +++ b/recipes/palmt650/palmt650-keyboard-modmap/60xXmodmap @@ -0,0 +1,8 @@ +# -*- sh -*- +# Xsession.d script for Xmodmap +# +# +# This file is sourced by Xsession(5), not executed. + +xmodmap /etc/X11/Xmodmap +xmodmap -e 'remove Control = Mode_switch' diff --git a/recipes/palmt650/palmt650-keyboard-modmap/Xmodmap b/recipes/palmt650/palmt650-keyboard-modmap/Xmodmap new file mode 100644 index 0000000000..9086cd1a79 --- /dev/null +++ b/recipes/palmt650/palmt650-keyboard-modmap/Xmodmap @@ -0,0 +1,118 @@ +!!!!! get modifiers right +remove Control = Mode_switch +remove Control = Shift_R +remove Shift = Menu +remove Shift = Control_R +! Alt key -> Alt_R +keycode 108 = Alt_R +! Shift(R) key -> Shift_R +!keycode 105 = Shift_R +!add Shift = Shift_R +! hack - should be Control_R for terminal +keycode 105 = Control_R +add Control = Control_R +! blue key -> Mode_switch +keycode 37 = Mode_switch +add mod5 = Mode_switch + +!!!!! top mute/unmute +! keycode mute = has no keycode + +!!!!! side buttons +keycode 123 = Prior +keycode 122 = Next +keycode 71 = End + +!!!!! top 2 buttons left/right and up from arrow key nav +!! below - added hacked symbols: percent asciicircum +keycode 69 = Home percent asciicircum +!! below - added hacked symbols: percent asciicircum +keycode 9 = Menu Delete Insert + +!!!!! arrowkeys +keycode 111 = Up +keycode 116 = Down +keycode 113 = Left +keycode 114 = Right +keycode 104 = KP_Enter + +!!!!! answer, calendar, mail, hangup/power +!!!! CHECKME +!! below - added hacked symbols: Escape Print +keycode 72 = F1 Escape Print +!! below - added hacked symbols: equal semicolon +keycode 67 = F2 equal semicolon +!! below - added hacked symbols: bracketleft braceleft +keycode 68 = F3 bracketleft braceleft +!! below - added hacked symbols: bracketright braceright +keycode 70 = F4 bracketright braceright + +!!!!! 1st row +keycode 24 = q Q slash +keycode 25 = w W plus +keycode 26 = e E 1 +keycode 27 = r R 2 +keycode 28 = t T 3 +keycode 29 = y Y parenleft +keycode 30 = u U parenright +keycode 31 = i I at +keycode 32 = o O quotedbl +!! below - added hacked symbols: underscore +keycode 33 = p P underscore +!!!!! 2nd row +keycode 38 = a A ampersand +keycode 39 = s S minus +keycode 40 = d D 4 +keycode 41 = f F 5 +keycode 42 = g G 6 +keycode 43 = h H dollar +keycode 44 = j J exclam +keycode 45 = k K colon +keycode 46 = l L apostrophe +!! below - added hacked symbols: backslash asciitilde +keycode 22 = BackSpace backslash asciitilde +!!!!! 3rd row +keycode 37 = Mode_switch +keycode 52 = z S asterisk +keycode 53 = x D 7 +keycode 54 = c F 8 +keycode 55 = v G 9 +keycode 56 = b H numbersign +keycode 57 = n J question +keycode 58 = m K comma +!! below - added hacked symbols: bar grave +keycode 60 = period bar grave +keycode 36 = Return +!!!!! bottom row +keycode 50 = Shift_L +!! below - added hacked symbols: less greater +keycode 19 = 0 less greater +keycode 65 = space +keycode 108 = Alt_R +!! below - hacked to be Control_R instead of Shift_R +keycode 105 = Control_R + +!!!!! missing standard key symbols: +! % hacked +! ^ hacked +! _ hacked +! = hacked +! [ hacked +! ] hacked +! { hacked +! } hacked +! ; hacked +! < hacked +! > hacked +! \ hacked +! | hacked +! ` hacked +! ~ hacked +! Escape hacked +! Delete hacked +! Insert hacked +! Print hacked +! Pause +! Caps_Lock +! Num_Lock +! Sroll_Lock diff --git a/recipes/pointercal/files/palmt650/pointercal b/recipes/pointercal/files/palmt650/pointercal new file mode 100644 index 0000000000..76070aea27 --- /dev/null +++ b/recipes/pointercal/files/palmt650/pointercal @@ -0,0 +1 @@ +6542 -110 -2499320 6 -6625 24172268 65536 diff --git a/recipes/udev/udev-124/libvolume-id-soname.patch b/recipes/udev/udev-124/libvolume-id-soname.patch new file mode 100644 index 0000000000..56365a4351 --- /dev/null +++ b/recipes/udev/udev-124/libvolume-id-soname.patch @@ -0,0 +1,12 @@ +diff -uNr udev-124-orig/extras/volume_id/lib/Makefile udev-124/extras/volume_id/lib/Makefile +--- udev-124-orig/extras/volume_id/lib/Makefile 2008-06-12 01:24:30.000000000 -0400 ++++ udev-124/extras/volume_id/lib/Makefile 2009-01-14 23:32:42.000000000 -0500 +@@ -113,7 +113,7 @@ + ifeq ($(libdir),$(usrlibdir)) + ln -sf $(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so + else +- ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so ++ ln -sf ../..$(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so + endif + $(INSTALL) -d $(DESTDIR)$(usrlibdir)/pkgconfig + $(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc diff --git a/recipes/udev/udev_124.bb b/recipes/udev/udev_124.bb index 76edb2fa6f..37dc3a7dbe 100644 --- a/recipes/udev/udev_124.bb +++ b/recipes/udev/udev_124.bb @@ -2,13 +2,14 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod /dev/, handles hotplug events and loads drivers at boot time. It replaces \ the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES_${PN} = "hotplug" -PR = "r14" +PR = "r15" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ file://flags.patch;patch=1 \ file://vol_id_ld.patch;patch=1 \ file://udevtrigger_add_devname_filtering.patch;patch=1 \ + file://libvolume-id-soname.patch;patch=1 \ file://mount.blacklist \ file://run.rules \ " diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc index 443adf29bc..dda9792ee0 100644 --- a/recipes/util-linux-ng/util-linux-ng.inc +++ b/recipes/util-linux-ng/util-linux-ng.inc @@ -5,14 +5,11 @@ DEPENDS = "udev zlib ncurses e2fsprogs-libs" inherit autotools -# I'm finishing this recipe during the 2.13.1 candidate release cycle -# @todo Remove $RC later. See if patches are needed. Move files from /usr/*. -# -- Leon 'likewise' Woestenberg - -#RC="-rc2" -RC="" DEFAULT_PREFERENCE = "-1" +# allows for a release candidate +RC ?= "" + SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${PV}/util-linux-ng-${PV}${RC}.tar.bz2" PACKAGES =+ "util-linux-ng-fdisk util-linux-ng-cfdisk util-linux-ng-sfdisk util-linux-ng-swaponoff util-linux-ng-losetup util-linux-ng-umount util-linux-ng-mount util-linux-ng-readprofile " @@ -114,11 +111,11 @@ do_install () { install -d ${D}${sysconfdir}/default/ echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall - ln -sf ${base_sbindir}/swapon ${D}${base_sbindir}/swapoff.${PN} - ln -sf ${base_sbindir}/shutdown ${D}${base_sbindir}/reboot.${PN} - ln -sf ${base_sbindir}/shutdown ${D}${base_sbindir}/halt.${PN} - ln -sf ${base_sbindir}/shutdown ${D}${base_sbindir}/fastboot - ln -sf ${base_sbindir}/shutdown ${D}${base_sbindir}/fasthalt + ln -sf ${sbindir}/swapon ${D}${sbindir}/swapoff.${PN} + ln -sf ${sbindir}/shutdown ${D}${sbindir}/reboot.${PN} + ln -sf ${sbindir}/shutdown ${D}${sbindir}/halt.${PN} + ln -sf ${sbindir}/shutdown ${D}${sbindir}/fastboot + ln -sf ${sbindir}/shutdown ${D}${sbindir}/fasthalt } pkg_postinst_${PN} () { diff --git a/recipes/util-linux-ng/util-linux-ng_2.13.1.bb b/recipes/util-linux-ng/util-linux-ng_2.13.1.bb index c10792e8ec..946147d41c 100644 --- a/recipes/util-linux-ng/util-linux-ng_2.13.1.bb +++ b/recipes/util-linux-ng/util-linux-ng_2.13.1.bb @@ -4,4 +4,4 @@ require util-linux-ng.inc #SRC_URI += "file://glibc-fix.patch;patch=1" #SRC_URI += "file://glibc-umount2.patch;patch=1" -PR = "r0" +PR = "r1" diff --git a/recipes/util-linux-ng/util-linux-ng_2.14.bb b/recipes/util-linux-ng/util-linux-ng_2.14.bb index 587eb97120..fdd911a07a 100644 --- a/recipes/util-linux-ng/util-linux-ng_2.14.bb +++ b/recipes/util-linux-ng/util-linux-ng_2.14.bb @@ -1,6 +1,6 @@ require util-linux-ng.inc -PR = "r4" +PR = "r5" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/util-linux-ng-2.14', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" SRC_URI += "file://util-linux-ng-uclibc-versionsort.patch;patch=1 \ diff --git a/recipes/wxwidgets/wxwidgets-unicode_2.8.10.bb b/recipes/wxwidgets/wxwidgets-unicode_2.8.10.bb new file mode 100644 index 0000000000..54ae04d8bb --- /dev/null +++ b/recipes/wxwidgets/wxwidgets-unicode_2.8.10.bb @@ -0,0 +1,29 @@ +PR = "r0" + +LEAD_SONAME = "libwx_gtk2_core-2.8.so" + +EXTRA_OECONF += "--enable-unicode=yes" + +S = "wxWidgets-${PV}" + +require wxwidgets.inc + +do_stage() { + install -d ${STAGING_INCDIR}/wx-2.8/wx + cp -pR include/wx ${STAGING_INCDIR}/wx-2.8 + cp -pR lib/libwx* ${STAGING_LIBDIR} + cp -pR lib/wx ${STAGING_LIBDIR} + cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile + cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal + ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8 ${STAGING_BINDIR_CROSS}/wx-config + sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \ + -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \ + -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \ + -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \ + -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8 +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install + ln -sf ${libdir}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8 ${D}${bindir}/wx-config +} diff --git a/recipes/wxwidgets/wxwidgets.inc b/recipes/wxwidgets/wxwidgets.inc index 1e4cd0b6bb..19952948bb 100644 --- a/recipes/wxwidgets/wxwidgets.inc +++ b/recipes/wxwidgets/wxwidgets.inc @@ -10,7 +10,10 @@ S = "${WORKDIR}/wxWidgets-${PV}" inherit autotools pkgconfig -EXTRA_OECONF = " --enable-gpe " +EXTRA_OECONF = " --enable-gpe --disable-visibility " + +CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}" + do_configure() { oe_runconf diff --git a/recipes/wxwidgets/wxwidgets_2.8.9.bb b/recipes/wxwidgets/wxwidgets_2.8.10.bb index 8e8d3565fd..8e8d3565fd 100644 --- a/recipes/wxwidgets/wxwidgets_2.8.9.bb +++ b/recipes/wxwidgets/wxwidgets_2.8.10.bb diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate b/recipes/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate index 8e6a8b22cb..70786908b6 100644 --- a/recipes/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate +++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate @@ -1,6 +1,6 @@ #!/bin/sh -while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ] +while [ ! -z $TSLIB_TSDEVICE ] && [ -f $TSLIB_TSDEVICE] && [ ! -f /etc/pointercal ] do /usr/bin/xtscal done diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver index 76a09b51dc..f6f5943847 100644 --- a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver +++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver @@ -41,7 +41,8 @@ export USER=root SCREEN_SIZE=`fallback_screen_arg` -ARGS=" -br -pn" +ARGS=" -pn" +PPM=" -br" # use ucb 1x00 touchscreen if present if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then @@ -104,18 +105,30 @@ case `module_id` in ARGS="$ARGS -fb /dev/fb1" ;; "GTA01") if [ `screen_width` -gt 330 ] ; then + if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm" + fi DPI=285 else - DPI=140 + if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm" + fi + DPI=142 fi - ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib" ;; + ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" ;; "GTA02") if [ `screen_width` -gt 330 ] ; then + if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm" + fi DPI=285 else - DPI=140 + if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm" + fi + DPI=142 fi - ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib" + ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" XSERVER=/usr/bin/Xglamo ;; "Nokia N770") @@ -125,14 +138,28 @@ case `module_id` in ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" XSERVER=/usr/bin/Xomap ;; "Palm Treo 650") - ARGS="$ARGS -dpi 181 -screen 320x320 -hide-cursor" ;; + if [ -f "/usr/share/pixmaps/xsplash-qvga-square.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga-square.ppm" + fi + ARGS="$ARGS -dpi 181 -screen 320x320 -mouse tslib -hide-cursor ${PPM}" ;; "Motorola Ezx Platform") + if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm ${PPM}" + fi ARGS="$ARGS -dpi 170 -screen ${SCREEN_SIZE}" ;; "Glofiish M800") - ARGS="$ARGS -dpi 285 -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor" ;; + if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm" + fi + ARGS="$ARGS -dpi 285 -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" ;; "Freescale MX21ADS") # That's what /proc/cpuinfo shows as hardware on the chumby ARGS="$ARGS -dpi 121 -screen 320x240 -hide-cursor -mouse tslib" ;; + "OMAP3 Beagle Board") + ARGS="$ARGS ${PPM}" +# 32bpp - we'll enable it once newer kernels are.. working. +# ARGS="$ARGS -fbbpp32" + XSERVER=/usr/bin/Xorg ;; *) # It is a device we do not know about, in which case we force # kdrive to use the current framebuffer geometry -- otherwise diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver b/recipes/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver index 7c70b2f82f..3ad9747dab 100644 --- a/recipes/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver +++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver @@ -40,8 +40,8 @@ module_id() { export USER=root SCREEN_SIZE=`fallback_screen_arg` - -ARGS=" -br -pn" +PPM="-br" +ARGS=" -pn" # use ucb 1x00 touchscreen if present if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then @@ -102,18 +102,30 @@ case `module_id` in ARGS="$ARGS -fb /dev/fb1" ;; "GTA01") if [ `screen_width` -gt 330 ] ; then + if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm" + fi DPI=285 else + if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm" + fi DPI=140 fi - ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor -root-ppm /usr/share/pixmaps/xsplash-vga.ppm vt1" ;; + ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" ;; "GTA02") if [ `screen_width` -gt 330 ] ; then + if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm" + fi DPI=285 else + if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm" + fi DPI=140 fi - ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor -root-ppm /usr/share/pixmaps/xsplash-vga.ppm vt1" + ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" XSERVER=/usr/bin/Xglamo ;; "Nokia N770") @@ -123,18 +135,31 @@ case `module_id` in ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" XSERVER=/usr/bin/Xomap ;; "Palm Treo 650") - if [ -f "/usr/share/pixmaps/xsplash-qvga-square.ppm" ]; then - PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga-square.ppm" - fi - ARGS="$ARGS -dpi 181 -screen 320x320 -hide-cursor $PPM" ;; + if [ -f "/usr/share/pixmaps/xsplash-qvga-square.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga-square.ppm" + fi + ARGS="$ARGS -dpi 181 -screen 320x320 -hide-cursor ${PPM}" ;; "Motorola Ezx Platform") - ARGS="$ARGS -dpi 170 -screen ${SCREEN_SIZE} -hide-cursor -mouse tslib -root-ppm /usr/share/pixmaps/xsplash-qvga.ppm vt1" ;; + if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm" + fi + ARGS="$ARGS -dpi 170 -screen ${SCREEN_SIZE} -hide-cursor -mouse tslib ${PPM} vt1" ;; "Glofiish M800") - ARGS="$ARGS -dpi 285 -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor -root-ppm /usr/share/pixmaps/xsplash-vga.ppm vt1" ;; + if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm" + fi + ARGS="$ARGS -dpi 285 -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" ;; "Freescale MX21ADS") # That's what /proc/cpuinfo shows as hardware on the chumby - ARGS="$ARGS -dpi 121 -screen 320x240 -hide-cursor -mouse tslib -root-ppm /usr/share/pixmaps/xsplash-qvga.ppm vt1" ;; - + if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then + PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm" + fi + ARGS="$ARGS -dpi 121 -screen 320x240 -hide-cursor -mouse tslib ${PPM} vt1" ;; + "OMAP3 Beagle Board") + ARGS="$ARGS -br" +# 32bpp - we'll enable it once newer kernels are.. working. +# ARGS="$ARGS -fbbpp32" + XSERVER=/usr/bin/Xorg ;; *) # It is a device we do not know about, in which case we force # kdrive to use the current framebuffer geometry -- otherwise diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb index 9667c479f6..6b585c44e0 100644 --- a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb +++ b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Common X11 scripts" LICENSE = "GPL" SECTION = "x11" -PR = "r34" +PR = "r36" SRC_URI = "\ file://Xdefaults \ diff --git a/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm index 28ba65cd52..1f0fa47be6 100755 --- a/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm +++ b/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm @@ -19,13 +19,16 @@ done case "$1" in start) - . /etc/profile - [ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root - [ -z $HOME ] && export HOME=/home/$LOGNAME - - - echo "Starting Xserver" - /etc/X11/Xserver & + # We don't want this script to block the rest of the boot process + if [ "$2" != "background" ]; then + $0 $1 background & + else + . /etc/profile + [ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root + [ -z $HOME ] && export HOME=/home/$LOGNAME + echo "Starting Xserver" + /etc/X11/Xserver & + fi ;; stop) diff --git a/recipes/zope/python-zopeinterface_3.5.1.bb b/recipes/zope/python-zopeinterface_3.5.1.bb index 85533910ff..c09ebbc3bb 100644 --- a/recipes/zope/python-zopeinterface_3.5.1.bb +++ b/recipes/zope/python-zopeinterface_3.5.1.bb @@ -5,5 +5,9 @@ LICENSE = "ZPL" inherit distutils +PR = "r1" + SRC_URI = "http://pypi.python.org/packages/source/z/zope.interface/zope.interface-${PV}.tar.gz" S = "${WORKDIR}/zope.interface-${PV}" + +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*.egg/*/*/.debug" |