From a96a9a1166d85ffae0d97188ff1e986b8efb046b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 6 Jan 2010 18:37:14 +0100 Subject: netbook-launcher-efl: add 0.2.0.0 liblauncher: add 0.1.8 --- conf/checksums.ini | 8 ++++++++ recipes/netbook-launcher/liblauncher_0.1.8.bb | 10 ++++++++++ recipes/netbook-launcher/netbook-launcher-efl_0.2.0.0.bb | 11 +++++++++++ 3 files changed, 29 insertions(+) create mode 100644 recipes/netbook-launcher/liblauncher_0.1.8.bb create mode 100644 recipes/netbook-launcher/netbook-launcher-efl_0.2.0.0.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 83d76da1e4..9253cf92ec 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -15702,6 +15702,10 @@ sha256=3453c1426fdc06b32bc5f4e7d3ce039ec7f38f0fa4018d505e515099b209dd25 md5=7ee7d8c834f1e06093130a86cbb9e79a sha256=3453c1426fdc06b32bc5f4e7d3ce039ec7f38f0fa4018d505e515099b209dd25 +[http://launchpad.net/liblauncher/0.1/0.1.8/+download/liblauncher-0.1.8.tar.gz] +md5=b220357aaccc581c05337d05c5a1356f +sha256=e2d7c0eb9702e83e28551b89e3cbc283c6835e42c8336bd251c3b5c50dfdc9e5 + [http://xorg.freedesktop.org/releases/individual/lib/liblbxutil-1.0.1.tar.bz2] md5=b73cbd5bc3cd268722a624a5f1318fde sha256=94c31c7090106d3a95e2a7c083961efca1321b970118fe103ab06e5d927b7258 @@ -19858,6 +19862,10 @@ sha256=aa54d1822f8505f600b4c8d5debdf289b956b3b86bfd72e2ba02026352c107fc md5=b6e67a96e2f84bb70912da8c7e0d5ec1 sha256=e836560ffae454d4ca0c4cacd1f2a3e8528c5744372a77968bba3b947328ca38 +[http://launchpad.net/launch-lite-proj/trunk/alpha-0.2.0/+download/netbook-launcher-efl-0.2.0.0.tar.gz] +md5=33088cb4a03b71082f2722b40cef11e0 +sha256=04e6f182f7d1421d06597c5b0909810b9db836a40763d92df0d1a6c798ccb61f + [http://downloads.sourceforge.net/netcat/netcat-0.7.1.tar.bz2] md5=0a29eff1736ddb5effd0b1ec1f6fe0ef sha256=b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb diff --git a/recipes/netbook-launcher/liblauncher_0.1.8.bb b/recipes/netbook-launcher/liblauncher_0.1.8.bb new file mode 100644 index 0000000000..b0cc555f85 --- /dev/null +++ b/recipes/netbook-launcher/liblauncher_0.1.8.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "A library to build launchers" +LICENSE = "GPLv3,LGPLv2.1,LGPLv3" + +DEPENDS = "glib-2.0 libwnck virtual/libx11 gconf gnome-menus" + +SRC_URI = "http://launchpad.net/liblauncher/0.1/${PV}/+download/liblauncher-${PV}.tar.gz" + +inherit autotools + + diff --git a/recipes/netbook-launcher/netbook-launcher-efl_0.2.0.0.bb b/recipes/netbook-launcher/netbook-launcher-efl_0.2.0.0.bb new file mode 100644 index 0000000000..007bee9493 --- /dev/null +++ b/recipes/netbook-launcher/netbook-launcher-efl_0.2.0.0.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "This is a version of netbook-launcher using Enlightenment Foundation Libraries (EFL) so it would run in systems without 3D acceleration required by Clutter." +LICENSE = "GPLv3" + +DEPENDS = "liblauncher libxau dbus-glib gtk+ libgnome libgnomeui edje edje-native libnotify libcanberra evas eina ecore elementary eet" + +inherit gnome + +SRC_URI = "http://launchpad.net/launch-lite-proj/trunk/alpha-0.2.0/+download/netbook-launcher-efl-${PV}.tar.gz" + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" + -- cgit v1.2.3 From 21fd017229fb1210b07c68aa0b75f72d8e0c1e89 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 6 Jan 2010 19:04:36 +0100 Subject: human-icon-theme: add 0.35 --- conf/checksums.ini | 4 ++++ recipes/netbook-launcher/human-icon-theme_0.35.bb | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 recipes/netbook-launcher/human-icon-theme_0.35.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 9253cf92ec..80b651d14d 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -12322,6 +12322,10 @@ sha256=3ba0bdf71376429bb3ce8ae51595fc25e6a5147cdcc26e47b6da17386eb78cdf md5=e80a6739ead9a260087fe4d3fc6a8359 sha256=9f90613de73e1b8e90d9bbcb09046e83680f15a46fc630c3e26e9aa4ca0e6a1d +[https://launchpad.net/ubuntu/lucid/+source/human-icon-theme/0.35/+files/human-icon-theme_0.35.tar.gz] +md5=dd9bad3b7f95619a6536932300fe202a +sha256=d234a562fc4af10982b138b3e67e7f61f44b572d0493c776e639508e4faa0a29 + [http://downloads.sourceforge.net/hunkyfonts/hunkyfonts-0.3.0.tar.bz2] md5=36444795a356fb8a56c63b2840729bab sha256=e0b1849c545b6af276407d93025c73094dd74fc259b07c1d91594fdbb9a0b829 diff --git a/recipes/netbook-launcher/human-icon-theme_0.35.bb b/recipes/netbook-launcher/human-icon-theme_0.35.bb new file mode 100644 index 0000000000..578f78a23f --- /dev/null +++ b/recipes/netbook-launcher/human-icon-theme_0.35.bb @@ -0,0 +1,16 @@ +DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" + +LICENSE = "CC-BY-SA" +RDEPENDS = "hicolor-icon-theme" +RRECOMMENDS = "librsvg-gtk" + +inherit gnome + +SRC_URI = "https://launchpad.net/ubuntu/lucid/+source/human-icon-theme/${PV}/+files/human-icon-theme_${PV}.tar.gz" + +do_install_prepend() { + sed -i -e s:/usr/lib/icon-naming-utils/:${STAGING_DIR_NATIVE}/${libexecdir}/:g Makefile +} + +PACKAGE_ARCH = "all" +FILES_${PN} += "${datadir}/*" -- cgit v1.2.3 From 2bc2e6b801236fe9768da3be3711e60b44753bb1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 7 Jan 2010 09:50:49 +0100 Subject: pidgin: update to 2.6.4 --- conf/checksums.ini | 4 ++++ .../pidgin/angstrom/purple-OE-branding-25.patch | 16 ++++++++++++++++ recipes/pidgin/pidgin_2.6.4.bb | 19 +++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 recipes/pidgin/pidgin/angstrom/purple-OE-branding-25.patch create mode 100644 recipes/pidgin/pidgin_2.6.4.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 80b651d14d..4903dc11b9 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -21862,6 +21862,10 @@ sha256=2f79da1f127dd05f9404494ebc794f8cda919764fd2424f79df31f3b0f9dfd21 md5=a1bbb3c9be7d4ee1f53590d319cbfa72 sha256=acbadfd4d725e628ab8906f87438b26ebf86e67d219bbdcf07a9ccd18bdaafd6 +[http://downloads.sourceforge.net/pidgin/pidgin-2.6.4.tar.bz2] +md5=6e1dc8b9dd6983a54ff3a6de33efa778 +sha256=fa907ace507708e4a4bae32cc81a6271fb6da8bc0458fd8fc97cc4429ec8be11 + [ftp://ftp.cac.washington.edu/pine/pine4.64.tar.Z] md5=75af127948cc0c701d424d22d621f792 sha256=62c7b97695cb486e420afbbbe21bef853dd68a71665d867ffef50cb34dfba5f4 diff --git a/recipes/pidgin/pidgin/angstrom/purple-OE-branding-25.patch b/recipes/pidgin/pidgin/angstrom/purple-OE-branding-25.patch new file mode 100644 index 0000000000..cd1ac49e56 --- /dev/null +++ b/recipes/pidgin/pidgin/angstrom/purple-OE-branding-25.patch @@ -0,0 +1,16 @@ +Index: pidgin-2.5.0/libpurple/protocols/irc/irc.h +=================================================================== +--- pidgin-2.5.0.orig/libpurple/protocols/irc/irc.h 2008-08-19 01:53:38.000000000 +0000 ++++ pidgin-2.5.0/libpurple/protocols/irc/irc.h 2008-08-27 11:15:58.000000000 +0000 +@@ -36,9 +36,9 @@ + + #define IRC_DEFAULT_CHARSET "UTF-8" + #define IRC_DEFAULT_AUTODETECT FALSE +-#define IRC_DEFAULT_ALIAS "purple" ++#define IRC_DEFAULT_ALIAS "Angstrom-user" + +-#define IRC_DEFAULT_QUIT "Leaving." ++#define IRC_DEFAULT_QUIT "Powered by Angstrom: http://www.angstrom-distribution.org/" + + #define IRC_INITIAL_BUFSIZE 1024 + diff --git a/recipes/pidgin/pidgin_2.6.4.bb b/recipes/pidgin/pidgin_2.6.4.bb new file mode 100644 index 0000000000..7ced40d9c3 --- /dev/null +++ b/recipes/pidgin/pidgin_2.6.4.bb @@ -0,0 +1,19 @@ +require pidgin.inc +PR = "${INC_PR}.0" + +DEPENDS += "farsight2 libidn" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ + file://sanitize-configure.ac.patch;patch=1 \ + file://pidgin.desktop-set-icon.patch;patch=1 \ + file://purple-OE-branding-25.patch;patch=1 \ + file://pidgin-cross-python.patch;patch=1 \ +" + +EXTRA_OECONF += "\ + --disable-gtkspell \ + --disable-meanwhile \ + --disable-nm \ + --disable-screensaver \ +" -- cgit v1.2.3 From d27fb2aec799ec77bb645541d7bd3fc9aa63529d Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 6 Jan 2010 12:22:16 +0800 Subject: qt4x11: Cease out the qt4x11 PROVIDER * The LGPL and Commercial edition are actually the same tarball. * If someone sees the need he can take qt qt4-recipes and specify -commercial in the compilation. --- classes/qt4x11.bbclass | 2 +- conf/compatibility-providers.conf | 2 +- conf/distro/kaeilos.conf | 4 ---- recipes/qt4/qt4-x11-free.inc | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass index aa2e2a174e..2d56b7e95b 100644 --- a/classes/qt4x11.bbclass +++ b/classes/qt4x11.bbclass @@ -1,4 +1,4 @@ -DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-x11-free')]}" +DEPENDS_prepend = "${@["qt4-x11-free ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-x11-free')]}" inherit qmake2 diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf index 10a81f2943..61a373003c 100644 --- a/conf/compatibility-providers.conf +++ b/conf/compatibility-providers.conf @@ -47,7 +47,7 @@ PREFERRED_PROVIDER_openmoko-alsa-scenarios ?= "alsa-scenarii-shr" PREFERRED_PROVIDER_opkg ?= "opkg" #PREFERRED_PROVIDER_opkg ?= "opkg-nogpg" PREFERRED_PROVIDER_qemu-native ?= "qemu-native" -PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free" +PREFERRED_PROVIDER_qt4-x11-free ?= "qt4-x11-free" PREFERRED_PROVIDER_task-bootstrap ?= "task-bootstrap" PREFERRED_PROVIDER_tslib-conf ?= "tslib" PREFERRED_PROVIDER_tslib ?= "tslib" diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf index 4d790f4e1f..03595dba1d 100644 --- a/conf/distro/kaeilos.conf +++ b/conf/distro/kaeilos.conf @@ -182,10 +182,6 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" -# QT stuff: -# There are several flavours of qt4x11 in OE, so lets pick one that is buildable for everyone -PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free" - #Silence a warning during parsing PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc index ade148bab6..dffe3a0d17 100644 --- a/recipes/qt4/qt4-x11-free.inc +++ b/recipes/qt4/qt4-x11-free.inc @@ -4,7 +4,6 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" -PROVIDES = "qt4x11" INC_PR = "r14" -- cgit v1.2.3 From d542c62b5af575ecfa6c4e353b1d57c27d3e12c3 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 4 Jan 2010 15:37:05 +0800 Subject: qt4: Make the gles variants for Embedded and X11 provide the normal variant This way a distribution/user can set PREFERRED_PROVIDER_qt4-embedded = "qt4-embedded-gles" to select the GLES/OpenVG runtime. The default is qt4-embedded as GLES require a dedicated library most of the time provided as a binary blob by the vendor requiring the user to manually download and store it at the right place. For X11 we already have a PREFERRED_PROVIDER setting in place and don't need to update. Acked-by: Koen Kooi --- conf/compatibility-providers.conf | 1 + recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled | 1 + recipes/qt4/qt4-embedded-gles_4.6.0.bb | 1 + recipes/qt4/qt4-x11-free-gles_4.5.2.bb | 1 + recipes/qt4/qt4-x11-free-gles_4.6.0.bb | 1 + recipes/qt4/qt4-x11-free-gles_git.bb.disabled | 1 + 6 files changed, 6 insertions(+) diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf index 61a373003c..0d8e9bcaf7 100644 --- a/conf/compatibility-providers.conf +++ b/conf/compatibility-providers.conf @@ -47,6 +47,7 @@ PREFERRED_PROVIDER_openmoko-alsa-scenarios ?= "alsa-scenarii-shr" PREFERRED_PROVIDER_opkg ?= "opkg" #PREFERRED_PROVIDER_opkg ?= "opkg-nogpg" PREFERRED_PROVIDER_qemu-native ?= "qemu-native" +PREFERRED_PROVIDER_qt4-embedded ?= "qt4-embedded" PREFERRED_PROVIDER_qt4-x11-free ?= "qt4-x11-free" PREFERRED_PROVIDER_task-bootstrap ?= "task-bootstrap" PREFERRED_PROVIDER_tslib-conf ?= "tslib" diff --git a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled index 5aa07c2ebb..a888e7d6be 100644 --- a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled +++ b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled @@ -9,6 +9,7 @@ require qt4-embedded_${PV}.bb LICENSE = "LGPLv2.1 GPLv3" DEPENDS += "virtual/egl" +PROVIDES += "qt4-embedded" SRC_URI += "file://sgx-hack.patch;patch=1" export EXTRA_QMAKE_MUNGE = " glmunge " diff --git a/recipes/qt4/qt4-embedded-gles_4.6.0.bb b/recipes/qt4/qt4-embedded-gles_4.6.0.bb index 04e074f9dd..915dd0734f 100644 --- a/recipes/qt4/qt4-embedded-gles_4.6.0.bb +++ b/recipes/qt4/qt4-embedded-gles_4.6.0.bb @@ -1,6 +1,7 @@ require qt4-embedded.inc PR = "${INC_PR}.1" +PROVIDES += "qt4-embedded" QT_GLFLAGS = "-opengl es2 -openvg" require qt-4.6.0.inc diff --git a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb index cd81841269..a3f60bf982 100644 --- a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb +++ b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb @@ -11,6 +11,7 @@ require qt4-x11-free_${PV}.bb PR = "${INC_PR}.3" DEPENDS += "virtual/egl" +PROVIDES += "qt4-x11-free" #SRC_URI += "file://sgx-hack.patch;patch=1" SRC_URI += "file://hack-out-pg_config.patch;patch=1" diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb index 089992c142..8d09d89f8d 100644 --- a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb +++ b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb @@ -13,5 +13,6 @@ QT_CONFIG_FLAGS += " \ FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free" DEPENDS += "virtual/egl" +PROVIDES += "qt4-x11-free" diff --git a/recipes/qt4/qt4-x11-free-gles_git.bb.disabled b/recipes/qt4/qt4-x11-free-gles_git.bb.disabled index 22db2dfa8d..59778910b5 100644 --- a/recipes/qt4/qt4-x11-free-gles_git.bb.disabled +++ b/recipes/qt4/qt4-x11-free-gles_git.bb.disabled @@ -5,6 +5,7 @@ FILESPATHPKG =. "qt4-x11-free-${PV}:qt4-x11-free:" QT_GLFLAGS = "-opengl es1 -openvg" require qt4-x11-free.inc +PROVIDES = "qt4-x11-free" LICENSE = "LGPLv2.1 GPLv3" PR = "${INC_PR}.0+gitr${SRCREV}" -- cgit v1.2.3 From be4bdd0ffa8d542606c0c66f6784dff1977e2945 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 7 Jan 2010 13:27:11 +0800 Subject: qtwebkit-performance-utilities: Add new recipe These are some simple benchmarks and utilities for QtWebKit --- conf/distro/include/sane-srcrevs.inc | 2 ++ .../webkit/qtwebkit-performance-utilities-e_git.bb | 4 +++ recipes/webkit/qtwebkit-performance-utilities.inc | 33 ++++++++++++++++++++++ .../webkit/qtwebkit-performance-utilities_git.bb | 4 +++ 4 files changed, 43 insertions(+) create mode 100644 recipes/webkit/qtwebkit-performance-utilities-e_git.bb create mode 100644 recipes/webkit/qtwebkit-performance-utilities.inc create mode 100644 recipes/webkit/qtwebkit-performance-utilities_git.bb diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 3cddffda50..4de3a9e278 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -280,6 +280,8 @@ SRCREV_pn-qemu-native ?= "${QEMUSRCREV}" SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}" SRCREV_pn-qi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d" SRCREV_pn-qi-ubi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d" +SRCREV_pn-qtwebkit-performance-utilities ?= "8a39befbf5bb20dba1e5317ae55a968292d38afe" +SRCREV_pn-qtwebkit-performance-utilities-e ?= "8a39befbf5bb20dba1e5317ae55a968292d38afe" SRCREV_pn-remoko ?= "148" SRCREV_pn-remoko-server ?= "148" SRCREV_pn-s3c24xx-gpio ?= "4949" diff --git a/recipes/webkit/qtwebkit-performance-utilities-e_git.bb b/recipes/webkit/qtwebkit-performance-utilities-e_git.bb new file mode 100644 index 0000000000..5342d02a78 --- /dev/null +++ b/recipes/webkit/qtwebkit-performance-utilities-e_git.bb @@ -0,0 +1,4 @@ +inherit qt4e + +require qtwebkit-performance-utilities.inc +PR = "${INC_PR}.0" diff --git a/recipes/webkit/qtwebkit-performance-utilities.inc b/recipes/webkit/qtwebkit-performance-utilities.inc new file mode 100644 index 0000000000..e61f22ce71 --- /dev/null +++ b/recipes/webkit/qtwebkit-performance-utilities.inc @@ -0,0 +1,33 @@ +DESCRIPTION = "QtWebKit Performance Utilities" +LICENSE = "GPLv3" + +INC_PR = "r0" + +DEPENDS = "gd" + +SRC_URI = "git://gitorious.org/qtwebkit/performance.git;protocol=git" +S = "${WORKDIR}/git" +PV = "0.1+gitr${SRCREV}" + +EXTRA_QMAKEVARS_PRE = "INSTALL_DIR=${bindir}" + +FILES_${PN} = "${bindir}/qtwebkit-benchmark/*" +FILES_${PN}-dbg = "${bindir}/qtwebkit-benchmark/.debug/*" + +# package memusage stat +PACKAGES += "memusagestat-dbg memusagestat" +FILES_memusagestat = "${bindir}/*" +FILES_memusagestat-dbg = "${bindir}/.debug/*" + + +do_compile_append() { + cd ${S}/host-tools/memusagestat + ${CC} -o memusagestat memusagestat.c ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -lgd +} + +do_install() { + oe_runmake install INSTALL_ROOT=${D} + cd ${S}/host-tools/memusagestat + install -d ${D}${bindir} + install -m 0755 memusagestat ${D}/${bindir} +} diff --git a/recipes/webkit/qtwebkit-performance-utilities_git.bb b/recipes/webkit/qtwebkit-performance-utilities_git.bb new file mode 100644 index 0000000000..17735dff54 --- /dev/null +++ b/recipes/webkit/qtwebkit-performance-utilities_git.bb @@ -0,0 +1,4 @@ +inherit qt4x11 + +require ${PN}.inc +PR = "${INC_PR}.0" -- cgit v1.2.3 From af57250cfa11ac8e043d7580e1948e480094cfaa Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 7 Jan 2010 10:46:30 +0100 Subject: gimp: add 2.6.8 --- conf/checksums.ini | 4 ++++ recipes/gimp/gimp_2.6.8.bb | 8 ++++++++ 2 files changed, 12 insertions(+) create mode 100644 recipes/gimp/gimp_2.6.8.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 4903dc11b9..5396659ad1 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -8834,6 +8834,10 @@ sha256=f4055ea8f1815d7dcca6bf0159af70489243d63a14dcfaf2a994af062d829ca8 md5=39c30867511b79391eb9177c86c8b79a sha256=08e4d272471d377cd7c6cac6a6089a540436961c00ddd09de4f29a3148ec71ef +[ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-2.6.8.tar.bz2] +md5=a4d9462c9420954824a80c9b1963f9d9 +sha256=d5d4218b742390157fca23a9d2cce436904546a2ea419ffeb44a5f43c99a3332 + [http://downloads.sourceforge.net/g-inspector/ginspector-20050529.tar.bz2] md5=0a8474e0d90b139b1baa70b097a4fd51 sha256=7f55ec02b5ab9e86c64f5718be64854fd9c64899908e580e1a9759421ac3b436 diff --git a/recipes/gimp/gimp_2.6.8.bb b/recipes/gimp/gimp_2.6.8.bb new file mode 100644 index 0000000000..c1edbb7a11 --- /dev/null +++ b/recipes/gimp/gimp_2.6.8.bb @@ -0,0 +1,8 @@ +require gimp.inc + +DEPENDS += "webkit-gtk lcms gegl hal" + +SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-${PV}.tar.bz2 \ + " + + -- cgit v1.2.3 From 43bb6f65a72d3d3f81bc917fd27957ccdf20abe2 Mon Sep 17 00:00:00 2001 From: Marco Cavallini Date: Thu, 7 Jan 2010 11:34:42 +0100 Subject: xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf : added mouse support --- .../xserver-xorg-conf/ronetix-pm9263/xorg.conf | 49 ++++++++++++++++++---- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/recipes/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf index 7f3eb7797f..bdd6d71404 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf +++ b/recipes/xorg-xserver/xserver-xorg-conf/ronetix-pm9263/xorg.conf @@ -1,11 +1,46 @@ -Section "ServerLayout" - Identifier "default" - InputDevice "atmel-ts" "CorePointer" +# +# X11 configuration for Ronetix PM9263 device. +# (C)2009 Koan sas - www.KoanSoftware.com +# + +Section "Monitor" + Identifier "Display" +EndSection + +Section "Device" + Identifier "fbdevice" + Driver "fbdev" + Option "fbdev" "/dev/fb0" + Option "shadowfb" "true" +EndSection + +Section "Screen" + Identifier "fbscreen" + Device "fbdevice" + Monitor "Display" EndSection Section "InputDevice" - Identifier "atmel-ts" - Driver "evdev" - Option "SwapAxes" "1" - Option "Device" "/dev/input/touchscreen0" + Identifier "atmel-ts" + Driver "evdev" + Option "SwapAxes" "1" + Option "Device" "/dev/input/touchscreen0" EndSection + +Section "InputDevice" + Identifier "Generic Mouse" + Driver "mouse" + Option "CorePointer" +EndSection + +Section "ServerLayout" + Identifier "Layout" + Screen "fbscreen" + InputDevice "Generic Mouse" + InputDevice "atmel-ts" "CorePointer" +EndSection + +Section "ServerFlags" + Option "AutoAddDevices" "false" +EndSection + -- cgit v1.2.3 From 611662a49470299f3851db2823d76d4827700ff9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 7 Jan 2010 11:53:42 +0100 Subject: libeflvala: move from recipes/freesmartphone to recipes/efl --- recipes/efl1/libeflvala_git.bb | 15 +++++++++++++++ recipes/freesmartphone/libeflvala_git.bb | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 recipes/efl1/libeflvala_git.bb delete mode 100644 recipes/freesmartphone/libeflvala_git.bb diff --git a/recipes/efl1/libeflvala_git.bb b/recipes/efl1/libeflvala_git.bb new file mode 100644 index 0000000000..9040bbd10a --- /dev/null +++ b/recipes/efl1/libeflvala_git.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Vala meets the Enlightenment Foundation Libraries" +AUTHOR = "Michael 'Mickey' Lauer " +LICENSE = "LGPL" +SECTION = "devel" +DEPENDS = "vala-native glib-2.0 dbus dbus-glib eina eet evas ecore edje elementary" +PV = "0.0.1.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/libeflvala;protocol=git;branch=master" +S = "${WORKDIR}/git" + +inherit autotools_stage pkgconfig vala + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples = "${datadir}/libeflvala ${bindir}/*" diff --git a/recipes/freesmartphone/libeflvala_git.bb b/recipes/freesmartphone/libeflvala_git.bb deleted file mode 100644 index 9040bbd10a..0000000000 --- a/recipes/freesmartphone/libeflvala_git.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Vala meets the Enlightenment Foundation Libraries" -AUTHOR = "Michael 'Mickey' Lauer " -LICENSE = "LGPL" -SECTION = "devel" -DEPENDS = "vala-native glib-2.0 dbus dbus-glib eina eet evas ecore edje elementary" -PV = "0.0.1.0+gitr${SRCREV}" -PR = "r0" - -SRC_URI = "${FREESMARTPHONE_GIT}/libeflvala;protocol=git;branch=master" -S = "${WORKDIR}/git" - -inherit autotools_stage pkgconfig vala - -PACKAGES =+ "${PN}-examples" -FILES_${PN}-examples = "${datadir}/libeflvala ${bindir}/*" -- cgit v1.2.3 From ee6762f166a4769c8326d552ca59f431b705e86e Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Tue, 27 Oct 2009 13:57:49 +0000 Subject: connman: move test utils to separate package, shr config do not disable usb0 on startup Signed-off-by: Klaus Kurzmann --- recipes/connman/connman.inc | 4 +++- recipes/connman/connman_git.bb | 4 +++- recipes/connman/files/shr/connman | 42 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100755 recipes/connman/files/shr/connman diff --git a/recipes/connman/connman.inc b/recipes/connman/connman.inc index eb7aa1ab52..5b2f0cc409 100644 --- a/recipes/connman/connman.inc +++ b/recipes/connman/connman.inc @@ -54,7 +54,7 @@ python populate_packages_prepend() { PACKAGES_DYNAMIC = "${PN}-plugin-*" -PACKAGES += "${PN}-scripts" +PACKAGES += "${PN}-scripts ${PN}-test-utils" FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ @@ -64,6 +64,8 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${libdir}/bonobo/servers \ ${datadir}/dbus-1/system-services/*" +FILES_${PN}-test-utils += "${libdir}/connman/test/*" + FILES_${PN}-scripts += "${libdir}/connman/scripts" FILES_${PN}-dbg += "${libdir}/connman/*/.debug" FILES_${PN}-dev += "${libdir}/connman/*/*.la" diff --git a/recipes/connman/connman_git.bb b/recipes/connman/connman_git.bb index 523d39ba2f..c0cb890e20 100644 --- a/recipes/connman/connman_git.bb +++ b/recipes/connman/connman_git.bb @@ -20,12 +20,14 @@ EXTRA_OECONF = " \ --enable-fake \ " +EXTRA_OECONF_append_shr += "--disable-tools" + require connman.inc SRCREV = "1a94db417ecaba20a609ff4b4431a3f67c5dcbc6" PV = "0.42+git" -PR = "r0" +PR = "r2" PR_append = ".gitr${SRCREV}" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/connman/files/shr/connman b/recipes/connman/files/shr/connman new file mode 100755 index 0000000000..708b1b4cd1 --- /dev/null +++ b/recipes/connman/files/shr/connman @@ -0,0 +1,42 @@ +#!/bin/sh + +DAEMON="/usr/sbin/connmand -I usb0" +PIDFILE=/var/run/connmand.pid +DESC="Connection Manager" + +if [ -f /etc/default/connman ] ; then + . /etc/default/connman +fi + +set -e + +do_start() { + $DAEMON +} + +do_stop() { + start-stop-daemon --stop --name connmand --quiet +} + +case "$1" in + start) + echo "Starting $DESC" + do_start + ;; + stop) + echo "Stopping $DESC" + do_stop + ;; + restart|force-reload) + echo "Restarting $DESC" + do_stop + sleep 1 + do_start + ;; + *) + echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 -- cgit v1.2.3 From 700fd19cd92638de8ea6986abd8bfc7c97aef7e2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 6 Jan 2010 15:27:52 +0100 Subject: fltk: add 1.1.10 --- conf/checksums.ini | 4 ++++ recipes/fltk/fltk_1.1.10.bb | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 recipes/fltk/fltk_1.1.10.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 5396659ad1..2fad0b72d8 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -7174,6 +7174,10 @@ sha256=84fa995c461066ed39c587c834414ef1a320f605b6b6e1db2d10d12fa6a587db md5=2dfdb9b44a1a08a675985bb92d1439e6 sha256=4a0d868889d5221cc6e4b96f6e8de19bd4fc770fa8e05012c6c169686088088b +[ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10/fltk-1.1.10-source.tar.bz2] +md5=a1765594bc427ff892e36089fe1fa672 +sha256=37ada22bf2586b8dd30d84209b8b58bdcb864627e5d02ae3f2c323a29261b19a + [ftp://ftp-fourier.ujf-grenoble.fr/xcas/devel/sources/fltk-1.1.4-device.tar.gz] md5=826c6afa88c9c4da734fe7393ed59639 sha256=a0e31ad5088414aaee003586a23127a5ace7717ba4f8fb4e02cf56bb9a5c30f4 diff --git a/recipes/fltk/fltk_1.1.10.bb b/recipes/fltk/fltk_1.1.10.bb new file mode 100644 index 0000000000..778c0f35b8 --- /dev/null +++ b/recipes/fltk/fltk_1.1.10.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "FLTK is a cross-platform C++ GUI toolkit" +HOMEPAGE = "http://www.fltk.org" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft" + +SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2 \ + file://disable_test.patch;patch=1 \ + " + +S = "${WORKDIR}/fltk-${PV}" + +inherit lib_package autotools_stage binconfig + +TARGET_CC_ARCH += "${LDFLAGS}" + +EXTRA_OECONF = "--enable-shared \ + --enable-threads \ + --enable-xdbe --enable-xft --enable-gl \ + --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}" + +do_configure() { + oe_runconf +} + +python populate_packages_prepend () { + if (bb.data.getVar('DEBIAN_NAMES', d, 1)): + bb.data.setVar('PKG_${PN}', 'libfltk${PV}', d) +} + +LEAD_SONAME = "libfltk.so" -- cgit v1.2.3 From 54c6f4eb5eb57e97ef365fc98638c402366a9cf9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 7 Jan 2010 11:32:18 +0100 Subject: task-shr-feed: remove usbmode --- recipes/tasks/task-shr-feed.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index be55bd225d..1c79fd24d2 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -80,7 +80,6 @@ RDEPENDS_${PN} += "\ sms-sentry \ cellhunter \ dillo2 \ - usbmode \ pyefl-sudoku \ tasks \ dates \ -- cgit v1.2.3 From f3472b0f09a31fe9d989cfa60d2d12d4c44d1a48 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 7 Jan 2010 12:36:36 +0100 Subject: frameworkd: add patch for shr, merge from shr/merge --- .../frameworkd/oeventsd-use-opimd-signals.patch | 27 ++++++++++++++ recipes/freesmartphone/frameworkd_git.bb | 4 +++ recipes/freesmartphone/opimd-utils_git.bb | 42 ++++++++++++++++------ 3 files changed, 62 insertions(+), 11 deletions(-) create mode 100644 recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch diff --git a/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch b/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch new file mode 100644 index 0000000000..4dc5dd3a84 --- /dev/null +++ b/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch @@ -0,0 +1,27 @@ +--- a/framework/subsystems/oeventsd/fso_triggers.py 2009-07-12 13:44:53.000000000 +0200 ++++ b/framework/subsystems/oeventsd/fso_triggers.py 2009-07-12 13:42:43.000000000 +0200 +@@ -197,8 +197,7 @@ + class IncomingMessageTrigger(DBusTrigger): + #============================================================================# + """ +- A custom dbus trigger for org.freesmartphone.GSM.SIM.IncomingStoredMessage +- TODO: change to opimd interface ++ A custom dbus trigger for org.freesmartphone.PIM.Messages.IncomingMessage + """ + + function_name = 'IncomingMessage' +@@ -207,10 +206,10 @@ + bus = dbus.SystemBus() + super(IncomingMessageTrigger, self).__init__( + bus, +- 'org.freesmartphone.ogsmd', +- '/org/freesmartphone/GSM/Device', +- 'org.freesmartphone.GSM.SIM', +- 'IncomingStoredMessage' ++ 'org.freesmartphone.opimd', ++ '/org/freesmartphone/PIM/Messages', ++ 'org.freesmartphone.PIM.Messages', ++ 'IncomingMessage' + ) + def on_signal(self, index): + logger.info("Receive IncomingMessage on index = %s" % index) diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb index 130fe55231..926fcf60a8 100644 --- a/recipes/freesmartphone/frameworkd_git.bb +++ b/recipes/freesmartphone/frameworkd_git.bb @@ -16,6 +16,8 @@ SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \ file://frameworkd \ file://frameworkd.conf \ " +SRC_URI_append_shr = "file://oeventsd-use-opimd-signals.patch;patch=1" + S = "${WORKDIR}/git" do_configure_append() { @@ -55,6 +57,8 @@ RDEPENDS_${PN} += "\ RRECOMMENDS_${PN} += "\ alsa-utils-amixer \ python-gst \ + python-phoneutils \ + python-vobject \ ppp \ " diff --git a/recipes/freesmartphone/opimd-utils_git.bb b/recipes/freesmartphone/opimd-utils_git.bb index 5031ae5c13..68038f34c1 100644 --- a/recipes/freesmartphone/opimd-utils_git.bb +++ b/recipes/freesmartphone/opimd-utils_git.bb @@ -1,27 +1,47 @@ DESCRIPTION = "Test scripts for freesmartphone.org opimd interface" HOMEPAGE = "http://freesmartphone.org" +SHR_RELEASE ?= "shr" LICENSE ?= "GPL" +RDEPENDS = "python-elementary python-dbus python-codecs python-shell python python-core python-edbus frameworkd" SECTION = "x11/application" PV = "0.0.2+gitr${SRCREV}" PR = "r0" inherit setuptools -SRC_URI = "git://git.shr-project.org/repo/opimd-utils.git;protocol=http" -S = "${WORKDIR}/git" +PACKAGES =+ "\ + ${PN}-cli \ + ${PN}-notes \ + ${PN}-data \ +" -RDEPENDS = "\ - python-elementary \ - python-edbus \ - python-codecs \ - python-shell \ - \ +RDEPENDS_${PN} = "\ + ${PN}-data \ shr-settings \ - shr-theme \ - frameworkd \ pyphonelog \ + shr-theme \ +" + +RDEPENDS_${PN}-notes = "\ + ${PN}-data \ +" + +RRECOMMENDS_${PN} = "\ + ${PN}-notes \ + ${PN}-cli \ " +PACKAGE_ARCH_${PN}-cli = "all" +PACKAGE_ARCH_${PN}-data = "all" +PACKAGE_ARCH_${PN}-notes = "all" + +SRC_URI = "git://git.shr-project.org/repo/opimd-utils.git;protocol=http" +S = "${WORKDIR}/git" FILES_${PN} += "${sysconfdir}/X11/Xsession.d/89opimd-notifier" FILES_${PN} += "${prefix}/share/applications/" -FILES_${PN} += "${prefix}/share/pixmaps/opimd-utils/" +FILES_${PN} += "${prefix}/share/pixmaps/" +FILES_${PN}-data += "${prefix}/share/pixmaps/opimd-utils/" +FILES_${PN}-cli += "${prefix}/bin/opimd-cli" +FILES_${PN}-notes += "${prefix}/bin/opimd-notes" +FILES_${PN}-notes += "${prefix}/share/pixmaps/opimd-notes.png" +FILES_${PN}-notes += "${prefix}/share/applications/opimd-notes.desktop" -- cgit v1.2.3 From 2ccd9f2b121b27319fc8a51255e8ad0b879726b2 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Tue, 27 Oct 2009 07:44:09 +0000 Subject: vagalume: add index.theme from shr/merge Signed-off-by: Klaus Kurzmann --- recipes/vagalume/files/index.theme | 8 ++++++++ recipes/vagalume/vagalume_0.7.1.bb | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 recipes/vagalume/files/index.theme diff --git a/recipes/vagalume/files/index.theme b/recipes/vagalume/files/index.theme new file mode 100644 index 0000000000..453acf0586 --- /dev/null +++ b/recipes/vagalume/files/index.theme @@ -0,0 +1,8 @@ +[Icon Theme] +Name=Vagalume +Comment=Vagalume icons +Directories=scalable/actions + +[scalable/actions] +Size=48 +Type=Scalable diff --git a/recipes/vagalume/vagalume_0.7.1.bb b/recipes/vagalume/vagalume_0.7.1.bb index 5b29ae17b6..6ef0d19829 100644 --- a/recipes/vagalume/vagalume_0.7.1.bb +++ b/recipes/vagalume/vagalume_0.7.1.bb @@ -2,13 +2,20 @@ DESCRIPTION = "Last.fm client" AUTHOR = "agarcia@igalia.com" HOMEPAGE = "http://vagalume.igalia.com/" SECTION = "x11" -DEPENDS = "gtk+ gstreamer" +DEPENDS = "gtk+ gstreamer curl gst-plugins-good ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly', d)}" +RDEPENDS = "curl gst-plugin-autodetect gst-plugin-audioconvert gst-plugin-alsa librsvg-gtk ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)}" RRECOMMENDS = "dbus-x11" +PR = "r2" SRC_URI = "http://vagalume.igalia.com/files/source/vagalume_${PV}.orig.tar.gz\ + file://index.theme \ " S = "${WORKDIR}/vagalume-${PV}.orig" inherit autotools FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1" + +do_install_append() { + install -m 0644 ${WORKDIR}/index.theme ${D}${datadir}/vagalume/icons/hicolor +} -- cgit v1.2.3 From 1700b4c84455186bc1d2f80bfc4ea65b51736cdb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 15 Nov 2009 18:11:53 +0100 Subject: libcanberra: add libcanberra-increase-buffer-size.patch from shr/import --- .../pulseaudio/files/libcanberra-increase-buffer-size.patch | 13 +++++++++++++ recipes/pulseaudio/libcanberra_0.14.bb | 5 +++-- recipes/pulseaudio/libcanberra_0.17.bb | 5 +++-- 3 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 recipes/pulseaudio/files/libcanberra-increase-buffer-size.patch diff --git a/recipes/pulseaudio/files/libcanberra-increase-buffer-size.patch b/recipes/pulseaudio/files/libcanberra-increase-buffer-size.patch new file mode 100644 index 0000000000..1005d78689 --- /dev/null +++ b/recipes/pulseaudio/files/libcanberra-increase-buffer-size.patch @@ -0,0 +1,13 @@ +Index: libcanberra-0.14/src/alsa.c +=================================================================== +--- libcanberra-0.14.orig/src/alsa.c ++++ libcanberra-0.14/src/alsa.c +@@ -272,7 +272,7 @@ + return translate_error(ret); + } + +-#define BUFSIZE (16*1024) ++#define BUFSIZE (128*1024) + + static void* thread_func(void *userdata) { + struct outstanding *out = userdata; diff --git a/recipes/pulseaudio/libcanberra_0.14.bb b/recipes/pulseaudio/libcanberra_0.14.bb index f9388e17cf..85dca9a3fe 100644 --- a/recipes/pulseaudio/libcanberra_0.14.bb +++ b/recipes/pulseaudio/libcanberra_0.14.bb @@ -5,12 +5,13 @@ DEPENDS = "alsa-lib gstreamer gtk+ libvorbis pulseaudio" SECTION = "libs/multimedia" AUTHOR = "Lennart Poettering" HOMEPAGE = "http://0pointer.de/lennart/projects/libcanberra" -PR = "r1" +PR = "r2" inherit autotools_stage AUTOTOOLS_STAGE_PKGCONFIG = "1" -SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz" +SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \ + file://libcanberra-increase-buffer-size.patch;patch=1" EXTRA_OECONF = "\ --enable-alsa \ diff --git a/recipes/pulseaudio/libcanberra_0.17.bb b/recipes/pulseaudio/libcanberra_0.17.bb index a0b63069f1..def42e6d0a 100644 --- a/recipes/pulseaudio/libcanberra_0.17.bb +++ b/recipes/pulseaudio/libcanberra_0.17.bb @@ -5,12 +5,13 @@ DEPENDS = "alsa-lib gstreamer gtk+ libtool libvorbis" SECTION = "libs/multimedia" AUTHOR = "Lennart Poettering" HOMEPAGE = "http://0pointer.de/lennart/projects/libcanberra" -PR = "r2" +PR = "r3" inherit autotools_stage vala AUTOTOOLS_STAGE_PKGCONFIG = "1" -SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz" +SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \ + file://libcanberra-increase-buffer-size.patch;patch=1" EXTRA_OECONF = "\ --enable-alsa \ -- cgit v1.2.3 From 758da30df2ca3abbdad24c972f590eaa40e70930 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Nov 2009 03:53:23 +0000 Subject: update-alternatives-cworth: use latest installed alternative * if there is more alternatives with higest priority, use the one last in alternatives file (latest installed) * if target exists and its directory, remove link, otherwise new alternative link is created inside that direstory Signed-off-by: Martin Jansa --- .../update-alternatives-cworth-native_0.99.154.bb | 2 ++ .../update-alternatives-cworth.inc | 5 ++-- .../update-alternatives.use.last.patch | 34 ++++++++++++++++++++++ .../update-alternatives-cworth_0.99.154.bb | 2 ++ 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch diff --git a/recipes/update-alternatives/update-alternatives-cworth-native_0.99.154.bb b/recipes/update-alternatives/update-alternatives-cworth-native_0.99.154.bb index 40534b4bb4..455831cf1f 100644 --- a/recipes/update-alternatives/update-alternatives-cworth-native_0.99.154.bb +++ b/recipes/update-alternatives/update-alternatives-cworth-native_0.99.154.bb @@ -3,6 +3,8 @@ inherit native PROVIDES += "virtual/update-alternatives-native" +PR = "${INC_PR}.0" + do_stage () { install -d ${sbindir} \ ${libdir}/opkg/alternatives diff --git a/recipes/update-alternatives/update-alternatives-cworth.inc b/recipes/update-alternatives/update-alternatives-cworth.inc index f23bfe8bb4..2d8fd42c0c 100644 --- a/recipes/update-alternatives/update-alternatives-cworth.inc +++ b/recipes/update-alternatives/update-alternatives-cworth.inc @@ -1,7 +1,8 @@ LICENSE = "GPL" SECTION = "base" -SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')}" +SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://update-alternatives.use.last.patch;patch=1" S = "${WORKDIR}/ipkg/C" PACKAGE_ARCH = "all" -PR = "r1" +INC_PR = "r3" diff --git a/recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch b/recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch new file mode 100644 index 0000000000..7bd5bd268b --- /dev/null +++ b/recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch @@ -0,0 +1,34 @@ +diff -uNr C.orig/update-alternatives C/update-alternatives +--- C.orig/update-alternatives 2003-03-28 17:39:45.000000000 +0100 ++++ C/update-alternatives 2009-09-17 16:46:59.000000000 +0200 +@@ -97,8 +97,8 @@ + + ## path=`sed -ne "1!p" $ad/$name | sort -nr -k2 | head -1 | sed 's/ .*//'` + ## busybox safe: +- path=`sed -ne "1!p" $ad/$name | sed -e "s/\(.*\) \(.*\)/\2 \1/g" | sort -nr | head -n 1 | sed 's/[^ ]* //'` +- if [ -z "$path" ]; then ++ prio=`sed -ne "1!p" $ad/$name | sed -e "s/\(.*\) \(.*\)/\2 \1/g" | sort -nr | head -n 1 | sed 's/ [^ ]*$//'` ++ if [ -z "$prio" ]; then + echo "update-alternatives: removing $link as no more alternatives exist for it" + rm $ad/$name + if [ -L $link ]; then +@@ -107,11 +107,19 @@ + return 0 + fi + ++ ## find last line with highest priority ++ path=`grep "${prio}$" $ad/$name | tail -n 1 | sed 's/ [^ ]*$//'` ++ + if [ ! -e $link -o -L $link ]; then + local link_dir=`dirname $link` + if [ ! -d $link_dir ]; then + mkdir -p $link_dir + fi ++ if [ -h $link -a -d $link ]; then ++ # if $link exists and the target is directory, than ln -sf $path $link, doesn't replace link to that directory, but creates new link inside ++ echo "update-alternatives: Removing $link" ++ rm -f $link ++ fi + ln -sf $path $link + echo "update-alternatives: Linking $link to $path" + else diff --git a/recipes/update-alternatives/update-alternatives-cworth_0.99.154.bb b/recipes/update-alternatives/update-alternatives-cworth_0.99.154.bb index 6cab1e55ec..b95d6d5ff2 100644 --- a/recipes/update-alternatives/update-alternatives-cworth_0.99.154.bb +++ b/recipes/update-alternatives/update-alternatives-cworth_0.99.154.bb @@ -2,6 +2,8 @@ require update-alternatives-cworth.inc RPROVIDES_${PN} = "update-alternatives" +PR="${INC_PR}.0" + do_install () { install -d ${D}${sbindir} \ ${D}${sysconfdir}/alternatives \ -- cgit v1.2.3 From 9842ab0293d253d5ba59075fcc484618ddd895e2 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Fri, 23 Oct 2009 08:13:24 +0000 Subject: netbase: update config files for om-gta* Signed-off-by: Klaus Kurzmann --- recipes/netbase/netbase/om-gta01/interfaces | 5 +++-- recipes/netbase/netbase/om-gta02/interfaces | 7 ++++--- recipes/netbase/netbase_4.21.bb | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/recipes/netbase/netbase/om-gta01/interfaces b/recipes/netbase/netbase/om-gta01/interfaces index 56c485ef75..e595239758 100644 --- a/recipes/netbase/netbase/om-gta01/interfaces +++ b/recipes/netbase/netbase/om-gta01/interfaces @@ -16,14 +16,15 @@ iface eth1 inet dhcp # Ethernet/RNDIS gadget (g_ether) # ... or on host side, usbnet and random hwaddr -allow-hotplug usb0 +auto usb0 iface usb0 inet static address 192.168.0.202 netmask 255.255.255.0 network 192.168.0.0 - gateway 192.168.0.200 + up route add default gw 192.168.0.200 metric 8 up echo nameserver 208.67.222.222 >> /etc/resolv.conf up echo nameserver 208.67.220.220 >> /etc/resolv.conf + down route del default gw 192.168.0.200 metric 8 # Bluetooth networking iface bnep0 inet dhcp diff --git a/recipes/netbase/netbase/om-gta02/interfaces b/recipes/netbase/netbase/om-gta02/interfaces index ceedfc59c2..08bd3bb074 100644 --- a/recipes/netbase/netbase/om-gta02/interfaces +++ b/recipes/netbase/netbase/om-gta02/interfaces @@ -16,14 +16,15 @@ iface eth1 inet dhcp # Ethernet/RNDIS gadget (g_ether) # ... or on host side, usbnet and random hwaddr -allow-hotplug usb0 +auto usb0 iface usb0 inet static address 192.168.0.202 netmask 255.255.255.0 network 192.168.0.0 - gateway 192.168.0.200 - up echo nameserver 208.67.222.222 >> /etc/resolv.conf + up route add default gw 192.168.0.200 metric 8 + up echo nameserver 208.67.222.222 > /etc/resolv.conf up echo nameserver 208.67.220.220 >> /etc/resolv.conf + down route del default gw 192.168.0.200 metric 8 # Bluetooth networking iface bnep0 inet dhcp diff --git a/recipes/netbase/netbase_4.21.bb b/recipes/netbase/netbase_4.21.bb index 0ce40ba93e..c8b4d19869 100644 --- a/recipes/netbase/netbase_4.21.bb +++ b/recipes/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r39" +PR = "r40" inherit update-rc.d -- cgit v1.2.3 From cc1c330520dc780748eff80c89fa2e02616d5f6b Mon Sep 17 00:00:00 2001 From: Frederik Sdun Date: Thu, 15 Oct 2009 19:22:02 +0000 Subject: imagemagick:native: fix build error with space Signed-off-by: Frederik 'playya' Sdun Signed-off-by: Klaus Kurzmann --- recipes/imagemagick/files/fix_open_file.patch | 12 ++++++++++++ recipes/imagemagick/imagemagick_6.3.5-10.bb | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 recipes/imagemagick/files/fix_open_file.patch diff --git a/recipes/imagemagick/files/fix_open_file.patch b/recipes/imagemagick/files/fix_open_file.patch new file mode 100644 index 0000000000..8374e1e551 --- /dev/null +++ b/recipes/imagemagick/files/fix_open_file.patch @@ -0,0 +1,12 @@ +diff -rup ImageMagick-6.3.5.orig/magick/delegate.c ImageMagick-6.3.5/magick/delegate.c +--- ImageMagick-6.3.5.orig/magick/delegate.c 2009-10-15 18:40:06.000000000 +0200 ++++ ImageMagick-6.3.5/magick/delegate.c 2009-10-15 18:23:10.000000000 +0200 +@@ -769,7 +769,7 @@ static void CopyDelegateFile(const char + /* + Copy source file to destination. + */ +- destination_file=open(destination,O_WRONLY | O_BINARY | O_CREAT); ++ destination_file=open(destination, O_BINARY | O_CREAT, O_WRONLY); + if (destination_file == -1) + return; + source_file=open(source,O_RDONLY | O_BINARY); diff --git a/recipes/imagemagick/imagemagick_6.3.5-10.bb b/recipes/imagemagick/imagemagick_6.3.5-10.bb index cf9e82f3e2..8bd25e9d5a 100644 --- a/recipes/imagemagick/imagemagick_6.3.5-10.bb +++ b/recipes/imagemagick/imagemagick_6.3.5-10.bb @@ -2,12 +2,13 @@ DESCRIPTION = "ImageMagick is an image convertion tools" SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "tiff" -PR = "r4" +PR = "r5" SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \ file://PerlMagic_MakePatch;patch=1 \ file://makefile-am.patch;patch=1 \ - file://binconfig-fixes.patch;patch=1 " + file://binconfig-fixes.patch;patch=1 \ + file://fix_open_file.patch;patch=1 " IMVER = "6.3.5" -- cgit v1.2.3 From 2df4f2cfe72f40fb92c696674f2b3118ae386fab Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 7 Jan 2010 13:08:25 +0100 Subject: gpe-theme-neo: add recipe from shr/merge * gpe-icons.inc: for switching gpe icon theme with u-a and merging installed alternatives of together * standard gpe-icons recipe with require gpe-icons.inc will follow later. I need to prepare some switch for distro to choose if u-a should be used for gpe-icons. --- recipes/gpe-icons/gpe-icons.inc | 36 ++++++++++++++++++++++++++++++++++ recipes/gpe-icons/gpe-theme-neo_git.bb | 25 +++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 recipes/gpe-icons/gpe-icons.inc create mode 100644 recipes/gpe-icons/gpe-theme-neo_git.bb diff --git a/recipes/gpe-icons/gpe-icons.inc b/recipes/gpe-icons/gpe-icons.inc new file mode 100644 index 0000000000..0c23814b41 --- /dev/null +++ b/recipes/gpe-icons/gpe-icons.inc @@ -0,0 +1,36 @@ +SECTION = "gpe" +RDEPENDS += "gdk-pixbuf-loader-png" + +inherit update-alternatives + +INC_PR = "r3" + +ALTERNATIVE_NAME = "gpe-pixmaps" +ALTERNATIVE_LINK = "${datadir}/gpe/pixmaps" +ALTERNATIVE_PATH = "${datadir}/gpe/pixmaps.${PN}" +ALTERNATIVE_PRIORITY ?= 1 + +pkg_postinst() { + if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then + echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!" + echo "warn: It will be replaced with link managed by update-alternatives" + echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old." + echo "warn: It should be empty but probably isn't!" + echo "warn: Check what's left there and remove it manually." + mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old + fi + pixmap_dirs_root="${datadir}/gpe/" + cd ${pixmap_dirs_root} + for pixmap_dir in pixmaps.*; do + if [ "${pixmap_dir}"x == "pixmaps.${PN}"x ] ; then + continue; + fi + for pixmap in `find ${pixmap_dir}`; do + pixmap_target=`echo ${pixmap} | sed "s/${pixmap_dir}/pixmaps.${PN}/g"`; + if [ ! -e ${pixmap_target} ] ; then + cp -ra ${pixmap} ${pixmap_target}; + echo "${pixmap} merged"; + fi; + done + done +} diff --git a/recipes/gpe-icons/gpe-theme-neo_git.bb b/recipes/gpe-icons/gpe-theme-neo_git.bb new file mode 100644 index 0000000000..192c8a7d8e --- /dev/null +++ b/recipes/gpe-icons/gpe-theme-neo_git.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "nEo GPE theme - a very fast, high contrast GPE theme" +SECTION = "gpe" +HOMEPAGE = "http://jmccloud.jm.funpic.de" +AUTHOR = "Jesus McCloud Date: Thu, 7 Jan 2010 13:01:28 +0100 Subject: preferred-xorg-versions-X11R7.5.inc: needs at least 7.1.0 of virtual/libgl --- conf/distro/include/preferred-xorg-versions-X11R7.5.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc index 6e8c93a95a..26d4bf6adc 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc @@ -229,6 +229,7 @@ PREFERRED_VERSION_libfontenc-native ?= "1.0.5" PREFERRED_VERSION_libpciaccess ?= "0.10.9" PREFERRED_VERSION_libxkbfile ?= "1.0.6" PREFERRED_VERSION_libxkbfile-native ?= "1.0.6" +PREFERRED_VERSION_virtual/libgl ?= "7.1.0" PREFERRED_VERSION_xtrans ?= "1.2.5" PREFERRED_VERSION_xtrans-native ?= "1.2.5" -- cgit v1.2.3 From 52ac7118530832cfcc490879c8f3c802179312b0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Nov 2009 12:23:18 +0000 Subject: resolvconf: add version 1.45 from SHR Signed-off-by: Martin Jansa --- recipes/resolvconf/resolvconf_1.45.bb | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 recipes/resolvconf/resolvconf_1.45.bb diff --git a/recipes/resolvconf/resolvconf_1.45.bb b/recipes/resolvconf/resolvconf_1.45.bb new file mode 100644 index 0000000000..2c210ef1ec --- /dev/null +++ b/recipes/resolvconf/resolvconf_1.45.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Resolvconf is a framework for keeping track of the system's \ +information about currently available nameservers. It sets \ +itself up as the intermediary between programs that supply \ +nameserver information and programs that need nameserver \ +information." +SECTION = "console/network" +LICENSE = "GPL" +AUTHOR = "Thomas Hood" +HOMEPAGE = "http://packages.debian.org/resolvconf" +DEPENDS = "bash" +RDEPENDS = "bash" + +SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz" + +do_compile () { + : +} + +do_install () { + install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/run/resolvconf/interface + install -d ${D}${mandir}/man8 ${D}${docdir}/${P} + cp -pPR etc/* ${D}${sysconfdir}/ + install -m 0755 bin/resolvconf ${D}${base_sbindir}/ + install -m 0644 README ${D}${docdir}/${P}/ + install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/ +} + +PACKAGE_ARCH = "all" + -- cgit v1.2.3 From 676b651a8b7e1ed9d1a4ab15814fa93c9ef37c4f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 7 Jan 2010 13:22:49 +0100 Subject: packagekit: add version 0.5.2 from SHR --- recipes/packagekit/packagekit_0.5.2.bb | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 recipes/packagekit/packagekit_0.5.2.bb diff --git a/recipes/packagekit/packagekit_0.5.2.bb b/recipes/packagekit/packagekit_0.5.2.bb new file mode 100644 index 0000000000..5cc4d9ecb8 --- /dev/null +++ b/recipes/packagekit/packagekit_0.5.2.bb @@ -0,0 +1,60 @@ +DESCRIPTION = "PackageKit package management abstraction" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ python cppunit dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)" +RDEPENDS_${PN} = "${IPKG_VARIANT}" + +inherit gnome autotools_stage + +SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz \ + " + +PR = "r0" +PE = "2" + +S = "${WORKDIR}/PackageKit-${PV}" + +EXTRA_OECONF = "--with-security-framework=dummy \ + --with-default-backend=opkg \ + --enable-opkg \ + --enable-dummy \ + --disable-networkmanager \ + --disable-connman \ + --disable-tests \ + --disable-qt \ + --disable-gstreamer-plugin \ + --disable-local \ + --disable-strict \ + ac_cv_path_XMLTO=no \ + " + + +do_configure_prepend() { + mkdir -p m4 + echo "EXTRA_DIST=" > gtk-doc.make + sed -i -e s:0\.1\.5:0\.1\.6:g configure.ac +} + +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 \ + -e s:/usr/bin/intltool-merge:${STAGING_BINDIR_NATIVE}/intltool-merge:g \ + $i + done +} + + +PACKAGES =+ "${PN}-website" +FILES_${PN}-website = "${datadir}/PackageKit/website" + +PACKAGES =+ "${PN}-python" +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 ${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" -- cgit v1.2.3 From dcbd24596e89c91f86e8175abe2d8ea431513632 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 7 Jan 2010 13:21:32 +0100 Subject: preferred-xorg-versions-X11R7.5.inc: setting P_V does not actually work for virtual providers * set mesa, mesa-dri and mesa-xlib explicitly. If other providers of virtual/libgl were introduced they would need to be set explicitly, too. * actually 7.2 is the minimal version in OE to fulfill the 7.1.0 requirement for virtual/libgl --- conf/distro/include/preferred-xorg-versions-X11R7.5.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc index 26d4bf6adc..368f766a5b 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc @@ -229,7 +229,9 @@ PREFERRED_VERSION_libfontenc-native ?= "1.0.5" PREFERRED_VERSION_libpciaccess ?= "0.10.9" PREFERRED_VERSION_libxkbfile ?= "1.0.6" PREFERRED_VERSION_libxkbfile-native ?= "1.0.6" -PREFERRED_VERSION_virtual/libgl ?= "7.1.0" +PREFERRED_VERSION_mesa ?= "7.2" +PREFERRED_VERSION_mesa-dri ?= "7.2" +PREFERRED_VERSION_mesa-xlib ?= "7.2" PREFERRED_VERSION_xtrans ?= "1.2.5" PREFERRED_VERSION_xtrans-native ?= "1.2.5" -- cgit v1.2.3 From 61e57311398158f9dcba835d573afda63f3dbc2f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 7 Jan 2010 16:26:45 +0100 Subject: gpe-theme-neo: kill SRCPV, sorry --- recipes/gpe-icons/gpe-theme-neo_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/gpe-icons/gpe-theme-neo_git.bb b/recipes/gpe-icons/gpe-theme-neo_git.bb index 192c8a7d8e..3f0f7b1c7c 100644 --- a/recipes/gpe-icons/gpe-theme-neo_git.bb +++ b/recipes/gpe-icons/gpe-theme-neo_git.bb @@ -6,7 +6,7 @@ RDEPENDS = "gdk-pixbuf-loader-png gpe-filemanager gpe-sketchbook" RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo icon-theme-neo" LICENSE = "unknown" -PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" +PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}" PR = "${INC_PR}.0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" -- cgit v1.2.3 From ef45af9139fe61af484f950477b97b57de16e4b5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 7 Jan 2010 17:41:04 +0100 Subject: Revert "remoko: bump revision in sane-srcrevs for bluez4 support" Sorry pushed by accident, needs changes to recipes before.. --- conf/distro/include/sane-srcrevs.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 4de3a9e278..9283a3ad9d 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -282,8 +282,8 @@ SRCREV_pn-qi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d" SRCREV_pn-qi-ubi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d" SRCREV_pn-qtwebkit-performance-utilities ?= "8a39befbf5bb20dba1e5317ae55a968292d38afe" SRCREV_pn-qtwebkit-performance-utilities-e ?= "8a39befbf5bb20dba1e5317ae55a968292d38afe" -SRCREV_pn-remoko ?= "148" -SRCREV_pn-remoko-server ?= "148" +SRCREV_pn-remoko ?= "121" +SRCREV_pn-remoko-server ?= "121" SRCREV_pn-s3c24xx-gpio ?= "4949" SRCREV_pn-s3c64xx-gpio ?= "4949" SRCREV_pn-serial-forward ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba" -- cgit v1.2.3 From 20e56bce4f4c951365b53e8c44d464a17f2ce79f Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Thu, 7 Jan 2010 17:54:33 +0100 Subject: connman: use libnl2 --- recipes/connman/connman.inc | 2 +- recipes/connman/connman_0.46.bb | 6 +++--- recipes/connman/files/link-against-libnl2.patch | 13 +++++++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 recipes/connman/files/link-against-libnl2.patch diff --git a/recipes/connman/connman.inc b/recipes/connman/connman.inc index 5b2f0cc409..9ea04e3e8d 100644 --- a/recipes/connman/connman.inc +++ b/recipes/connman/connman.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php" SECTION = "libs/network" LICENSE = "GPL" # we need to define the depends here, the dynamic stuff is too late -DEPENDS = "libnl wpa-supplicant dbus glib-2.0 ppp busybox dhclient resolvconf bluez4" +DEPENDS = "libnl2 wpa-supplicant dbus glib-2.0 ppp busybox dhclient resolvconf bluez4" EXTRA_OECONF += "\ ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \ diff --git a/recipes/connman/connman_0.46.bb b/recipes/connman/connman_0.46.bb index 814187ded6..9fcd7a780f 100644 --- a/recipes/connman/connman_0.46.bb +++ b/recipes/connman/connman_0.46.bb @@ -1,6 +1,5 @@ require connman.inc - -PR = "r3" +PR = "r5" EXTRA_OECONF += "\ --disable-gtk-doc \ @@ -15,6 +14,7 @@ EXTRA_OECONF += "\ --enable-dhclient \ --enable-resolvconf \ --enable-dnsproxy \ + --enable-tools \ --disable-novatel \ --disable-huawei \ --disable-hso \ @@ -32,7 +32,7 @@ EXTRA_OECONF += "\ SRC_URI = "\ http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \ + file://link-against-libnl2.patch;patch=1 \ file://no_system_user_perms.patch;patch=1 \ file://connman \ " - diff --git a/recipes/connman/files/link-against-libnl2.patch b/recipes/connman/files/link-against-libnl2.patch new file mode 100644 index 0000000000..5be1618209 --- /dev/null +++ b/recipes/connman/files/link-against-libnl2.patch @@ -0,0 +1,13 @@ +Index: connman-0.46/configure.ac +=================================================================== +--- connman-0.46.orig/configure.ac ++++ connman-0.46/configure.ac +@@ -326,7 +326,7 @@ + AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools], + [enable testing tools]), [enable_tools=${enableval}]) + if (test "${enable_tools}" = "yes"); then +- PKG_CHECK_MODULES(NETLINK, libnl-1, dummy=yes, ++ PKG_CHECK_MODULES(NETLINK, libnl-2.0, dummy=yes, + AC_MSG_ERROR(Netlink library is required)) + AC_SUBST(NETLINK_CFLAGS) + AC_SUBST(NETLINK_LIBS) -- cgit v1.2.3 From e34bd279e0001cad497b286abec6a7e77f484e79 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 7 Jan 2010 18:31:36 +0100 Subject: linux-kexecboot_2.6x: fix SRC_URI (origins from linux-kexecboot.inc) --- recipes/kexecboot/linux-kexecboot_2.6.29.bb | 2 +- recipes/kexecboot/linux-kexecboot_2.6.32+2.6.33-rc3.bb | 2 +- recipes/kexecboot/linux-kexecboot_2.6.32.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/kexecboot/linux-kexecboot_2.6.29.bb b/recipes/kexecboot/linux-kexecboot_2.6.29.bb index 37fee558dd..4064c98582 100644 --- a/recipes/kexecboot/linux-kexecboot_2.6.29.bb +++ b/recipes/kexecboot/linux-kexecboot_2.6.29.bb @@ -7,7 +7,7 @@ SRCREV = "58cf2f1425abfd3a449f9fe985e48be2d2555022" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc PR_append = "+gitr${SRCREV}" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ +SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" SRC_URI_append = " \ diff --git a/recipes/kexecboot/linux-kexecboot_2.6.32+2.6.33-rc3.bb b/recipes/kexecboot/linux-kexecboot_2.6.32+2.6.33-rc3.bb index f11a94029c..1ebcc37152 100644 --- a/recipes/kexecboot/linux-kexecboot_2.6.32+2.6.33-rc3.bb +++ b/recipes/kexecboot/linux-kexecboot_2.6.32+2.6.33-rc3.bb @@ -16,7 +16,7 @@ DEFAULT_PREFERENCE_poodle = "-1" DEFAULT_PREFERENCE_spitz = "1" DEFAULT_PREFERENCE_tosa = "-1" -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${OLD_KERNEL_RELEASE}.tar.bz2;name=kernel \ +SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${OLD_KERNEL_RELEASE}.tar.bz2;name=kernel \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_RELEASE}.bz2;name=rc3;patch=1 \ file://0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch;patch=1 \ file://defconfig" diff --git a/recipes/kexecboot/linux-kexecboot_2.6.32.bb b/recipes/kexecboot/linux-kexecboot_2.6.32.bb index b876e91988..2839ff2928 100644 --- a/recipes/kexecboot/linux-kexecboot_2.6.32.bb +++ b/recipes/kexecboot/linux-kexecboot_2.6.32.bb @@ -11,7 +11,7 @@ DEFAULT_PREFERENCE_poodle = "-1" DEFAULT_PREFERENCE_spitz = "-1" DEFAULT_PREFERENCE_tosa = "-1" -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ +SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ # file://v3-1-4-Add-support-for-LZO-compressed-kernels.patch;patch=1;status=pending \ # file://v3-2-4-Add-support-for-LZO-compressed-kernels-for-ARM.patch;patch=1;status=pending \ # file://v3-3-4-Add-support-for-LZO-compressed-kernels-on-x86.patch;patch=1;status=pending \ -- cgit v1.2.3 From 0fb0b4c624deea119b48adf6c876fe77f6f40787 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 7 Jan 2010 18:43:21 +0100 Subject: linux-kexecboot: uniform the SRC_URI (defconfig in kernel recipe) --- recipes/kexecboot/linux-kexecboot.inc | 4 +--- recipes/kexecboot/linux-kexecboot_2.6.24.bb | 2 +- recipes/kexecboot/linux-kexecboot_2.6.26.bb | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/recipes/kexecboot/linux-kexecboot.inc b/recipes/kexecboot/linux-kexecboot.inc index 900e005cac..1cf556a99b 100644 --- a/recipes/kexecboot/linux-kexecboot.inc +++ b/recipes/kexecboot/linux-kexecboot.inc @@ -1,10 +1,8 @@ # We set PR here, since a change in the kexecboot recipe will need to get picked up by *all* the kernels: PR = "r17" -SRC_URI = "file://defconfig" - LOGO_SIZE = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "vga", "qvga", d)}' -SRC_URI += "file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2" +SRC_URI = "file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2" require ../linux/linux.inc diff --git a/recipes/kexecboot/linux-kexecboot_2.6.24.bb b/recipes/kexecboot/linux-kexecboot_2.6.24.bb index 82484f45a0..e950ab0abf 100644 --- a/recipes/kexecboot/linux-kexecboot_2.6.24.bb +++ b/recipes/kexecboot/linux-kexecboot_2.6.24.bb @@ -69,7 +69,7 @@ SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ file://binutils-buildid-arm.patch;patch=1 \ file://versatile-armv6.patch;patch=1 \ file://htcuni.patch;patch=1 \ - " + file://defconfig" # FIXMEs before made default # ${RPSRC}/mmcsd_no_scr_check-r1.patch;patch=1;status=hack diff --git a/recipes/kexecboot/linux-kexecboot_2.6.26.bb b/recipes/kexecboot/linux-kexecboot_2.6.26.bb index bf1dbb62bf..345d2ac764 100644 --- a/recipes/kexecboot/linux-kexecboot_2.6.26.bb +++ b/recipes/kexecboot/linux-kexecboot_2.6.26.bb @@ -52,7 +52,7 @@ SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2 \ file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \ file://htcuni.patch;patch=1 \ file://versatile-armv6.patch;patch=1 \ - " + file://defconfig" # FIXMEs before made default # ${RPSRC}/mmcsd_no_scr_check-r1.patch;patch=1;status=hack -- cgit v1.2.3 From 0987059c055bd7690a6b56314f14b85006111ff9 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 7 Jan 2010 19:34:56 +0100 Subject: linux-kexecboot: updated defconfig for 2.6.32 and 2.6.33-rc3 --- .../c7x0/defconfig | 397 ++++++++++++++------- .../linux-kexecboot-2.6.32/c7x0/defconfig | 262 ++++++++------ 2 files changed, 424 insertions(+), 235 deletions(-) diff --git a/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/c7x0/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/c7x0/defconfig index 0215fe1d91..f3c39437cf 100644 --- a/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/c7x0/defconfig +++ b/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/c7x0/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32 -# Sat Dec 12 19:30:33 2009 +# Linux kernel version: 2.6.33-rc3 +# Thu Jan 7 19:25:14 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -33,13 +33,6 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -# CONFIG_KERNEL_LZO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -51,6 +44,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_TREE_RCU=y # CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_TINY_RCU is not set # CONFIG_RCU_TRACE is not set CONFIG_RCU_FANOUT=32 # CONFIG_RCU_FANOUT_EXACT is not set @@ -63,37 +57,35 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_RELAY is not set # CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="initramfs.cpio.gz" +CONFIG_INITRAMFS_SOURCE="initramfs.cpio.lzma" CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_ROOT_GID=0 CONFIG_RD_GZIP=y # CONFIG_RD_BZIP2 is not set -# CONFIG_RD_LZMA is not set -# CONFIG_RD_LZO is not set +CONFIG_RD_LZMA=y # CONFIG_INITRAMFS_COMPRESSION_NONE is not set -CONFIG_INITRAMFS_COMPRESSION_GZIP=y +# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set # CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set -# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set -# CONFIG_INITRAMFS_COMPRESSION_LZO is not set +CONFIG_INITRAMFS_COMPRESSION_LZMA=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y -CONFIG_UID16=y -CONFIG_SYSCTL_SYSCALL=y +# CONFIG_UID16 is not set +# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_KALLSYMS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y # CONFIG_ELF_CORE is not set -CONFIG_BASE_FULL=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_AIO is not set +CONFIG_AIO=y # # Kernel Performance Events And Counters @@ -116,7 +108,7 @@ CONFIG_HAVE_CLK=y # CONFIG_SLOW_WORK is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 +CONFIG_BASE_SMALL=1 # CONFIG_MODULES is not set CONFIG_BLOCK=y # CONFIG_LBDAF is not set @@ -127,14 +119,41 @@ CONFIG_BLOCK=y # IO Schedulers # CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_AS is not set CONFIG_IOSCHED_DEADLINE=y # CONFIG_IOSCHED_CFQ is not set -# CONFIG_DEFAULT_AS is not set CONFIG_DEFAULT_DEADLINE=y # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="deadline" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_INLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +CONFIG_INLINE_READ_UNLOCK=y +# CONFIG_INLINE_READ_UNLOCK_BH is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +CONFIG_INLINE_WRITE_UNLOCK=y +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_FREEZER=y # @@ -163,6 +182,7 @@ CONFIG_MMU=y # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_DOVE is not set # CONFIG_ARCH_KIRKWOOD is not set # CONFIG_ARCH_LOKI is not set # CONFIG_ARCH_MV78XX0 is not set @@ -185,19 +205,57 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set # CONFIG_ARCH_BCMRING is not set +# CONFIG_ARCH_U8500 is not set # # Intel PXA2xx/PXA3xx Implementations # + +# +# Intel/Marvell Dev Platforms (sorted by hardware release time) +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_MACH_ZYLONITE300 is not set +# CONFIG_MACH_ZYLONITE320 is not set +# CONFIG_MACH_LITTLETON is not set +# CONFIG_MACH_TAVOREVB is not set +# CONFIG_MACH_SAAR is not set + +# +# Third Party Dev Platforms (sorted by vendor name) +# +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_VIPER is not set +# CONFIG_MACH_ARCOM_ZEUS is not set +# CONFIG_MACH_BALLOON3 is not set +# CONFIG_MACH_CSB726 is not set +# CONFIG_MACH_ARMCORE is not set +# CONFIG_MACH_EM_X270 is not set +# CONFIG_MACH_EXEDA is not set +# CONFIG_MACH_CM_X300 is not set # CONFIG_ARCH_GUMSTIX is not set # CONFIG_MACH_INTELMOTE2 is not set # CONFIG_MACH_STARGATE2 is not set -# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_XCEP is not set +# CONFIG_TRIZEPS_PXA is not set # CONFIG_MACH_LOGICPD_PXA270 is not set -# CONFIG_MACH_MAINSTONE is not set +# CONFIG_MACH_PCM027 is not set +# CONFIG_MACH_COLIBRI is not set +# CONFIG_MACH_COLIBRI300 is not set +# CONFIG_MACH_COLIBRI320 is not set + +# +# End-user Products (sorted by vendor name) +# +# CONFIG_MACH_H4700 is not set +# CONFIG_MACH_H5000 is not set +# CONFIG_MACH_HIMALAYA is not set +# CONFIG_MACH_MAGICIAN is not set +# CONFIG_MACH_MIOA701 is not set +# CONFIG_PXA_EZX is not set # CONFIG_MACH_MP900C is not set -# CONFIG_MACH_BALLOON3 is not set -# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_PXA_PALM is not set CONFIG_PXA_SHARPSL=y CONFIG_SHARPSL_PM=y # CONFIG_MACH_POODLE is not set @@ -208,30 +266,7 @@ CONFIG_MACH_HUSKY=y # CONFIG_MACH_SPITZ is not set # CONFIG_MACH_BORZOI is not set # CONFIG_MACH_TOSA is not set -# CONFIG_ARCH_VIPER is not set # CONFIG_ARCH_PXA_ESERIES is not set -# CONFIG_TRIZEPS_PXA is not set -# CONFIG_MACH_H5000 is not set -# CONFIG_MACH_EM_X270 is not set -# CONFIG_MACH_EXEDA is not set -# CONFIG_MACH_COLIBRI is not set -# CONFIG_MACH_COLIBRI300 is not set -# CONFIG_MACH_COLIBRI320 is not set -# CONFIG_MACH_ZYLONITE is not set -# CONFIG_MACH_LITTLETON is not set -# CONFIG_MACH_TAVOREVB is not set -# CONFIG_MACH_SAAR is not set -# CONFIG_MACH_ARMCORE is not set -# CONFIG_MACH_CM_X300 is not set -# CONFIG_MACH_H4700 is not set -# CONFIG_MACH_MAGICIAN is not set -# CONFIG_MACH_HIMALAYA is not set -# CONFIG_MACH_MIOA701 is not set -# CONFIG_MACH_PCM027 is not set -# CONFIG_ARCH_PXA_PALM is not set -# CONFIG_MACH_CSB726 is not set -# CONFIG_PXA_EZX is not set -# CONFIG_MACH_XCEP is not set CONFIG_PXA25x=y CONFIG_PXA_SHARP_C7xx=y CONFIG_PXA_SSP=y @@ -240,7 +275,6 @@ CONFIG_PLAT_PXA=y # # Processor Type # -CONFIG_CPU_32=y CONFIG_CPU_XSCALE=y CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y @@ -268,15 +302,16 @@ CONFIG_COMMON_CLKDEV=y # CONFIG_PCI_SYSCALL is not set # CONFIG_ARCH_SUPPORTS_MSI is not set CONFIG_PCCARD=y -# CONFIG_PCMCIA_DEBUG is not set CONFIG_PCMCIA=y -CONFIG_PCMCIA_LOAD_CIS=y -CONFIG_PCMCIA_IOCTL=y +# CONFIG_PCMCIA_LOAD_CIS is not set +# CONFIG_PCMCIA_IOCTL is not set # # PC-card bridges # +CONFIG_PCMCIA_SOC_COMMON=y CONFIG_PCMCIA_PXA2XX=y +# CONFIG_PCMCIA_DEBUG is not set # # Kernel Features @@ -305,12 +340,10 @@ CONFIG_FLATMEM_MANUAL=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_SPLIT_PTLOCK_CPUS=999999 # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y -CONFIG_HAVE_MLOCK=y -CONFIG_HAVE_MLOCKED_PAGE_BIT=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_ALIGNMENT_TRAP=y @@ -413,7 +446,7 @@ CONFIG_MTD_CFI_I1=y CONFIG_MTD_CFI_I2=y # CONFIG_MTD_CFI_I4 is not set # CONFIG_MTD_CFI_I8 is not set -CONFIG_MTD_RAM=y +# CONFIG_MTD_RAM is not set CONFIG_MTD_ROM=y # CONFIG_MTD_ABSENT is not set @@ -477,18 +510,31 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set + +# +# DRBD disabled because PROC_FS, INET or CONNECTOR not selected +# # CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_MG_DISK is not set CONFIG_MISC_DEVICES=y +# CONFIG_AD525X_DPOT is not set +# CONFIG_ICS932S401 is not set # CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_ISL29003 is not set +# CONFIG_DS1682 is not set +# CONFIG_TI_DAC7512 is not set # CONFIG_C2PORT is not set # # EEPROM support # +# CONFIG_EEPROM_AT24 is not set # CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set # CONFIG_EEPROM_93CX6 is not set +# CONFIG_IWMC3200TOP is not set CONFIG_HAVE_IDE=y CONFIG_IDE=y @@ -496,7 +542,9 @@ CONFIG_IDE=y # Please see Documentation/ide/ide.txt for help/info on IDE drives # # CONFIG_BLK_DEV_IDE_SATA is not set -# CONFIG_IDE_GD is not set +CONFIG_IDE_GD=y +CONFIG_IDE_GD_ATA=y +# CONFIG_IDE_GD_ATAPI is not set CONFIG_BLK_DEV_IDECS=y # CONFIG_BLK_DEV_IDECD is not set # CONFIG_BLK_DEV_IDETAPE is not set @@ -526,6 +574,7 @@ CONFIG_IDE_PROC_FS=y CONFIG_INPUT=y # CONFIG_INPUT_FF_MEMLESS is not set # CONFIG_INPUT_POLLDEV is not set +# CONFIG_INPUT_SPARSEKMAP is not set # # Userland interfaces @@ -543,34 +592,38 @@ CONFIG_INPUT_APMPOWER=y # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set # CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_QT2160 is not set CONFIG_KEYBOARD_CORGI=y # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_GPIO is not set -# CONFIG_KEYBOARD_MATRIX is not set +CONFIG_KEYBOARD_GPIO=y +CONFIG_KEYBOARD_MATRIX=y +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_MAX7359 is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_OPENCORES is not set # CONFIG_KEYBOARD_SPITZ is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_XTKBD is not set -CONFIG_INPUT_MOUSE=y -# CONFIG_MOUSE_PS2 is not set -# CONFIG_MOUSE_SERIAL is not set -# CONFIG_MOUSE_VSXXXAA is not set -# CONFIG_MOUSE_GPIO is not set +# CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=y # CONFIG_TOUCHSCREEN_AD7877 is not set +# CONFIG_TOUCHSCREEN_AD7879_I2C is not set # CONFIG_TOUCHSCREEN_AD7879_SPI is not set # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_CORGI is not set +# CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_EETI is not set # CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_MK712 is not set @@ -578,8 +631,11 @@ CONFIG_TOUCHSCREEN_ADS7846=y # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set # CONFIG_TOUCHSCREEN_TOUCHWIN is not set # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set # CONFIG_TOUCHSCREEN_W90X900 is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_UINPUT is not set +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set # # Hardware I/O ports @@ -591,7 +647,7 @@ CONFIG_TOUCHSCREEN_ADS7846=y # Character devices # CONFIG_VT=y -# CONFIG_CONSOLE_TRANSLATIONS is not set +CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set @@ -615,8 +671,7 @@ 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=y -# CONFIG_HW_RANDOM_TIMERIOMEM is not set +# CONFIG_HW_RANDOM is not set # CONFIG_R3964 is not set # @@ -627,7 +682,45 @@ CONFIG_HW_RANDOM=y # CONFIG_CARDMAN_4040 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set -# CONFIG_I2C is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +# CONFIG_I2C_CHARDEV is not set +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_PXA=y +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_SIMTEC is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set + +# +# Miscellaneous I2C Chip support +# +# 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_MASTER=y @@ -637,6 +730,8 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_GPIO is not set CONFIG_SPI_PXA2XX=y +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set # # SPI Protocol Masters @@ -650,7 +745,7 @@ CONFIG_SPI_PXA2XX=y # CONFIG_PPS is not set CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y +# CONFIG_GPIO_SYSFS is not set # # Memory mapped GPIO expanders: @@ -659,6 +754,9 @@ CONFIG_GPIO_SYSFS=y # # I2C GPIO expanders: # +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set # # PCI GPIO expanders: @@ -675,7 +773,14 @@ CONFIG_GPIO_SYSFS=y # AC97 GPIO expanders: # # CONFIG_W1 is not set -# CONFIG_POWER_SUPPLY is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=y +CONFIG_APM_POWER=y +# CONFIG_BATTERY_DS2760 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set CONFIG_HWMON=y # CONFIG_HWMON_VID is not set # CONFIG_HWMON_DEBUG_CHIP is not set @@ -683,21 +788,70 @@ CONFIG_HWMON=y # # Native drivers # +# CONFIG_SENSORS_AD7414 is not set +# CONFIG_SENSORS_AD7418 is not set # CONFIG_SENSORS_ADCXX is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ADT7462 is not set +# CONFIG_SENSORS_ADT7470 is not set +# CONFIG_SENSORS_ADT7473 is not set +# CONFIG_SENSORS_ADT7475 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set # CONFIG_SENSORS_F71805F is not set # CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_G760A is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set # CONFIG_SENSORS_LM70 is not set +# CONFIG_SENSORS_LM73 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_LM93 is not set +# CONFIG_SENSORS_LTC4215 is not set +# CONFIG_SENSORS_LTC4245 is not set +# CONFIG_SENSORS_LM95241 is not set CONFIG_SENSORS_MAX1111=y +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX6650 is not set # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_SHT15 is not set +# CONFIG_SENSORS_DME1737 is not set # CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_ADS7828 is not set +# CONFIG_SENSORS_THMC50 is not set +# CONFIG_SENSORS_TMP401 is not set +# CONFIG_SENSORS_TMP421 is not set # CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83L786NG is not set # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_W83627EHF is not set # CONFIG_SENSORS_LIS3_SPI is not set +# CONFIG_SENSORS_LIS3_I2C is not set # CONFIG_THERMAL is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y @@ -705,13 +859,7 @@ CONFIG_SSB_POSSIBLE=y # # Sonics Silicon Backplane # -CONFIG_SSB=y -CONFIG_SSB_PCMCIAHOST_POSSIBLE=y -# CONFIG_SSB_PCMCIAHOST is not set -CONFIG_SSB_SDIOHOST_POSSIBLE=y -# CONFIG_SSB_SDIOHOST is not set -# CONFIG_SSB_SILENT is not set -# CONFIG_SSB_DEBUG is not set +# CONFIG_SSB is not set # # Multifunction device drivers @@ -721,12 +869,23 @@ CONFIG_SSB_SDIOHOST_POSSIBLE=y # CONFIG_MFD_ASIC3 is not set # CONFIG_HTC_EGPIO is not set # CONFIG_HTC_PASIC3 is not set +# CONFIG_TPS65010 is not set +# CONFIG_TWL4030_CORE is not set # CONFIG_MFD_TMIO is not set # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC6387XB is not set # CONFIG_MFD_TC6393XB is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_MC13783 is not set +# CONFIG_AB3100_CORE is not set # CONFIG_EZX_PCAP is not set +# CONFIG_MFD_88PM8607 is not set +# CONFIG_AB4500_CORE is not set # CONFIG_REGULATOR is not set # CONFIG_MEDIA_SUPPORT is not set @@ -758,9 +917,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y # Frame buffer hardware drivers # # CONFIG_FB_S1D13XXX is not set -CONFIG_FB_PXA=y -# CONFIG_FB_PXA_SMARTPANEL is not set -# CONFIG_FB_PXA_PARAMETERS is not set +# CONFIG_FB_PXA is not set # CONFIG_FB_MBX is not set CONFIG_FB_W100=y # CONFIG_FB_VIRTUAL is not set @@ -769,7 +926,7 @@ CONFIG_FB_W100=y # CONFIG_FB_BROADSHEET is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=y -# CONFIG_LCD_CORGI is not set +CONFIG_LCD_CORGI=y # CONFIG_LCD_LMS283GF05 is not set # CONFIG_LCD_LTV350QV is not set # CONFIG_LCD_ILI9320 is not set @@ -791,7 +948,7 @@ CONFIG_BACKLIGHT_GENERIC=y CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y # CONFIG_FONT_8x8 is not set CONFIG_FONT_8x16=y @@ -803,13 +960,16 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -# CONFIG_LOGO is not set +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_SOUND is not set # CONFIG_HID_SUPPORT is not set # CONFIG_USB_SUPPORT is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set -CONFIG_MMC_UNSAFE_RESUME=y +# CONFIG_MMC_UNSAFE_RESUME is not set # # MMC/SD/SDIO Card Drivers @@ -834,16 +994,22 @@ CONFIG_LEDS_CLASS=y # # LED drivers # +# CONFIG_LEDS_PCA9532 is not set CONFIG_LEDS_GPIO=y CONFIG_LEDS_GPIO_PLATFORM=y +# CONFIG_LEDS_LP3944 is not set +# CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_DAC124S085 is not set +# CONFIG_LEDS_BD2802 is not set +# CONFIG_LEDS_LT3593 is not set # # LED Triggers # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +CONFIG_LEDS_TRIGGER_IDE_DISK=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set # CONFIG_LEDS_TRIGGER_GPIO is not set # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set @@ -853,52 +1019,7 @@ CONFIG_LEDS_TRIGGER_TIMER=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 - -# -# RTC interfaces -# -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 - -# -# 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 -# CONFIG_RTC_DRV_PCF2123 is not set - -# -# Platform RTC drivers -# -# CONFIG_RTC_DRV_CMOS is not set -# 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_SA1100=y -# CONFIG_RTC_DRV_PXA is not set +# CONFIG_RTC_CLASS is not set # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set @@ -1043,7 +1164,7 @@ CONFIG_FRAME_WARN=2048 # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_MEMORY_INIT is not set CONFIG_FRAME_POINTER=y # CONFIG_RCU_CPU_STALL_DETECTOR is not set @@ -1056,6 +1177,7 @@ CONFIG_TRACING_SUPPORT=y CONFIG_HAVE_ARCH_KGDB=y # CONFIG_ARM_UNWIND is not set # CONFIG_DEBUG_USER is not set +# CONFIG_OC_ETM is not set # # Security options @@ -1063,7 +1185,11 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KEYS is not set # CONFIG_SECURITY is not set # CONFIG_SECURITYFS is not set -# CONFIG_SECURITY_FILE_CAPABILITIES is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_SMACK is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" CONFIG_CRYPTO=y # @@ -1171,6 +1297,7 @@ CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_LZMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y diff --git a/recipes/kexecboot/linux-kexecboot-2.6.32/c7x0/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.32/c7x0/defconfig index 0215fe1d91..9baff9990c 100644 --- a/recipes/kexecboot/linux-kexecboot-2.6.32/c7x0/defconfig +++ b/recipes/kexecboot/linux-kexecboot-2.6.32/c7x0/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Sat Dec 12 19:30:33 2009 +# Thu Jan 7 19:13:21 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -33,13 +33,6 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -# CONFIG_KERNEL_LZO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -63,37 +56,35 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_RELAY is not set # CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="initramfs.cpio.gz" +CONFIG_INITRAMFS_SOURCE="initramfs.cpio.lzma" CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_ROOT_GID=0 CONFIG_RD_GZIP=y # CONFIG_RD_BZIP2 is not set -# CONFIG_RD_LZMA is not set -# CONFIG_RD_LZO is not set +CONFIG_RD_LZMA=y # CONFIG_INITRAMFS_COMPRESSION_NONE is not set -CONFIG_INITRAMFS_COMPRESSION_GZIP=y +# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set # CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set -# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set -# CONFIG_INITRAMFS_COMPRESSION_LZO is not set +CONFIG_INITRAMFS_COMPRESSION_LZMA=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y -CONFIG_UID16=y -CONFIG_SYSCTL_SYSCALL=y +# CONFIG_UID16 is not set +# CONFIG_SYSCTL_SYSCALL is not set # CONFIG_KALLSYMS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y # CONFIG_ELF_CORE is not set -CONFIG_BASE_FULL=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_AIO is not set +CONFIG_AIO=y # # Kernel Performance Events And Counters @@ -116,7 +107,7 @@ CONFIG_HAVE_CLK=y # CONFIG_SLOW_WORK is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 +CONFIG_BASE_SMALL=1 # CONFIG_MODULES is not set CONFIG_BLOCK=y # CONFIG_LBDAF is not set @@ -127,7 +118,7 @@ CONFIG_BLOCK=y # IO Schedulers # CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_AS is not set +CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y # CONFIG_IOSCHED_CFQ is not set # CONFIG_DEFAULT_AS is not set @@ -270,8 +261,8 @@ CONFIG_COMMON_CLKDEV=y CONFIG_PCCARD=y # CONFIG_PCMCIA_DEBUG is not set CONFIG_PCMCIA=y -CONFIG_PCMCIA_LOAD_CIS=y -CONFIG_PCMCIA_IOCTL=y +# CONFIG_PCMCIA_LOAD_CIS is not set +# CONFIG_PCMCIA_IOCTL is not set # # PC-card bridges @@ -413,7 +404,7 @@ CONFIG_MTD_CFI_I1=y CONFIG_MTD_CFI_I2=y # CONFIG_MTD_CFI_I4 is not set # CONFIG_MTD_CFI_I8 is not set -CONFIG_MTD_RAM=y +# CONFIG_MTD_RAM is not set CONFIG_MTD_ROM=y # CONFIG_MTD_ABSENT is not set @@ -481,13 +472,18 @@ CONFIG_BLK_DEV_LOOP=y # CONFIG_CDROM_PKTCDVD is not set # CONFIG_MG_DISK is not set CONFIG_MISC_DEVICES=y +# CONFIG_ICS932S401 is not set # CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_ISL29003 is not set # CONFIG_C2PORT is not set # # EEPROM support # +# CONFIG_EEPROM_AT24 is not set # CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set # CONFIG_EEPROM_93CX6 is not set CONFIG_HAVE_IDE=y CONFIG_IDE=y @@ -496,7 +492,9 @@ CONFIG_IDE=y # Please see Documentation/ide/ide.txt for help/info on IDE drives # # CONFIG_BLK_DEV_IDE_SATA is not set -# CONFIG_IDE_GD is not set +CONFIG_IDE_GD=y +CONFIG_IDE_GD_ATA=y +# CONFIG_IDE_GD_ATAPI is not set CONFIG_BLK_DEV_IDECS=y # CONFIG_BLK_DEV_IDECD is not set # CONFIG_BLK_DEV_IDETAPE is not set @@ -543,34 +541,37 @@ CONFIG_INPUT_APMPOWER=y # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set # CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_QT2160 is not set CONFIG_KEYBOARD_CORGI=y # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_GPIO is not set -# CONFIG_KEYBOARD_MATRIX is not set +CONFIG_KEYBOARD_GPIO=y +CONFIG_KEYBOARD_MATRIX=y +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_MAX7359 is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_OPENCORES is not set # CONFIG_KEYBOARD_SPITZ is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_XTKBD is not set -CONFIG_INPUT_MOUSE=y -# CONFIG_MOUSE_PS2 is not set -# CONFIG_MOUSE_SERIAL is not set -# CONFIG_MOUSE_VSXXXAA is not set -# CONFIG_MOUSE_GPIO is not set +# CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=y # CONFIG_TOUCHSCREEN_AD7877 is not set +# CONFIG_TOUCHSCREEN_AD7879_I2C is not set # CONFIG_TOUCHSCREEN_AD7879_SPI is not set # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_CORGI is not set +# CONFIG_TOUCHSCREEN_EETI is not set # CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_MK712 is not set @@ -578,8 +579,11 @@ CONFIG_TOUCHSCREEN_ADS7846=y # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set # CONFIG_TOUCHSCREEN_TOUCHWIN is not set # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set # CONFIG_TOUCHSCREEN_W90X900 is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_UINPUT is not set +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set # # Hardware I/O ports @@ -591,7 +595,7 @@ CONFIG_TOUCHSCREEN_ADS7846=y # Character devices # CONFIG_VT=y -# CONFIG_CONSOLE_TRANSLATIONS is not set +CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set @@ -615,8 +619,7 @@ 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=y -# CONFIG_HW_RANDOM_TIMERIOMEM is not set +# CONFIG_HW_RANDOM is not set # CONFIG_R3964 is not set # @@ -627,7 +630,46 @@ CONFIG_HW_RANDOM=y # CONFIG_CARDMAN_4040 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set -# CONFIG_I2C is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +# CONFIG_I2C_CHARDEV is not set +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_PXA=y +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_SIMTEC is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_DS1682 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_MASTER=y @@ -650,7 +692,7 @@ CONFIG_SPI_PXA2XX=y # CONFIG_PPS is not set CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y +# CONFIG_GPIO_SYSFS is not set # # Memory mapped GPIO expanders: @@ -659,6 +701,9 @@ CONFIG_GPIO_SYSFS=y # # I2C GPIO expanders: # +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set # # PCI GPIO expanders: @@ -675,7 +720,14 @@ CONFIG_GPIO_SYSFS=y # AC97 GPIO expanders: # # CONFIG_W1 is not set -# CONFIG_POWER_SUPPLY is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=y +CONFIG_APM_POWER=y +# CONFIG_BATTERY_DS2760 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set CONFIG_HWMON=y # CONFIG_HWMON_VID is not set # CONFIG_HWMON_DEBUG_CHIP is not set @@ -683,18 +735,65 @@ CONFIG_HWMON=y # # Native drivers # +# CONFIG_SENSORS_AD7414 is not set +# CONFIG_SENSORS_AD7418 is not set # CONFIG_SENSORS_ADCXX is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ADT7462 is not set +# CONFIG_SENSORS_ADT7470 is not set +# CONFIG_SENSORS_ADT7473 is not set +# CONFIG_SENSORS_ADT7475 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set # CONFIG_SENSORS_F71805F is not set # CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_G760A is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set # CONFIG_SENSORS_LM70 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_LM93 is not set +# CONFIG_SENSORS_LTC4215 is not set +# CONFIG_SENSORS_LTC4245 is not set +# CONFIG_SENSORS_LM95241 is not set CONFIG_SENSORS_MAX1111=y +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX6650 is not set # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_SHT15 is not set +# CONFIG_SENSORS_DME1737 is not set # CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_ADS7828 is not set +# CONFIG_SENSORS_THMC50 is not set +# CONFIG_SENSORS_TMP401 is not set +# CONFIG_SENSORS_TMP421 is not set # CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83L786NG is not set # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_W83627EHF is not set # CONFIG_SENSORS_LIS3_SPI is not set @@ -705,13 +804,7 @@ CONFIG_SSB_POSSIBLE=y # # Sonics Silicon Backplane # -CONFIG_SSB=y -CONFIG_SSB_PCMCIAHOST_POSSIBLE=y -# CONFIG_SSB_PCMCIAHOST is not set -CONFIG_SSB_SDIOHOST_POSSIBLE=y -# CONFIG_SSB_SDIOHOST is not set -# CONFIG_SSB_SILENT is not set -# CONFIG_SSB_DEBUG is not set +# CONFIG_SSB is not set # # Multifunction device drivers @@ -721,11 +814,19 @@ CONFIG_SSB_SDIOHOST_POSSIBLE=y # CONFIG_MFD_ASIC3 is not set # CONFIG_HTC_EGPIO is not set # CONFIG_HTC_PASIC3 is not set +# CONFIG_TPS65010 is not set +# CONFIG_TWL4030_CORE is not set # CONFIG_MFD_TMIO is not set # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC6387XB is not set # CONFIG_MFD_TC6393XB is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_MC13783 is not set +# CONFIG_AB3100_CORE is not set # CONFIG_EZX_PCAP is not set # CONFIG_REGULATOR is not set # CONFIG_MEDIA_SUPPORT is not set @@ -758,9 +859,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y # Frame buffer hardware drivers # # CONFIG_FB_S1D13XXX is not set -CONFIG_FB_PXA=y -# CONFIG_FB_PXA_SMARTPANEL is not set -# CONFIG_FB_PXA_PARAMETERS is not set +# CONFIG_FB_PXA is not set # CONFIG_FB_MBX is not set CONFIG_FB_W100=y # CONFIG_FB_VIRTUAL is not set @@ -769,7 +868,7 @@ CONFIG_FB_W100=y # CONFIG_FB_BROADSHEET is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=y -# CONFIG_LCD_CORGI is not set +CONFIG_LCD_CORGI=y # CONFIG_LCD_LMS283GF05 is not set # CONFIG_LCD_LTV350QV is not set # CONFIG_LCD_ILI9320 is not set @@ -791,7 +890,7 @@ CONFIG_BACKLIGHT_GENERIC=y CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y # CONFIG_FONT_8x8 is not set CONFIG_FONT_8x16=y @@ -803,13 +902,16 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -# CONFIG_LOGO is not set +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_SOUND is not set # CONFIG_HID_SUPPORT is not set # CONFIG_USB_SUPPORT is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set -CONFIG_MMC_UNSAFE_RESUME=y +# CONFIG_MMC_UNSAFE_RESUME is not set # # MMC/SD/SDIO Card Drivers @@ -834,16 +936,21 @@ CONFIG_LEDS_CLASS=y # # LED drivers # +# CONFIG_LEDS_PCA9532 is not set CONFIG_LEDS_GPIO=y CONFIG_LEDS_GPIO_PLATFORM=y +# CONFIG_LEDS_LP3944 is not set +# CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_DAC124S085 is not set +# CONFIG_LEDS_BD2802 is not set # # LED Triggers # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +CONFIG_LEDS_TRIGGER_IDE_DISK=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set # CONFIG_LEDS_TRIGGER_GPIO is not set # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set @@ -853,52 +960,7 @@ CONFIG_LEDS_TRIGGER_TIMER=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 - -# -# RTC interfaces -# -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 - -# -# 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 -# CONFIG_RTC_DRV_PCF2123 is not set - -# -# Platform RTC drivers -# -# CONFIG_RTC_DRV_CMOS is not set -# 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_SA1100=y -# CONFIG_RTC_DRV_PXA is not set +# CONFIG_RTC_CLASS is not set # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set @@ -1048,7 +1110,6 @@ CONFIG_FRAME_WARN=2048 CONFIG_FRAME_POINTER=y # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_LATENCYTOP is not set -# CONFIG_SYSCTL_SYSCALL_CHECK is not set CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set @@ -1171,6 +1232,7 @@ CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_LZMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y -- cgit v1.2.3 From 54ba2e73a49c2104087e9aa2c5d69f6c84cfb405 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 7 Jan 2010 20:35:39 +0100 Subject: fso2-console-image: fso-autorev.inc has to be included for this image to compile --- recipes/images/fso2-console-image.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/images/fso2-console-image.bb b/recipes/images/fso2-console-image.bb index 60bd6fc720..8510aa8539 100644 --- a/recipes/images/fso2-console-image.bb +++ b/recipes/images/fso2-console-image.bb @@ -3,6 +3,7 @@ #------------------------------------------------------ require fso-image.inc +require conf/distro/include/fso-autorev.inc PV = "1.1" PR = "r1" -- cgit v1.2.3 From ffa2af84261d4330b577373153bec96084065a02 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 7 Jan 2010 21:47:23 +0000 Subject: iw: New package: nl80211 based CLI configuration utility for wireless devices. --- recipes/iw/iw_0.9.18.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 recipes/iw/iw_0.9.18.bb diff --git a/recipes/iw/iw_0.9.18.bb b/recipes/iw/iw_0.9.18.bb new file mode 100644 index 0000000000..9b4af15758 --- /dev/null +++ b/recipes/iw/iw_0.9.18.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "nl80211 based CLI configuration utility for wireless devices" +HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/iw" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "BSD" +PR = "r0" + +DEPENDS = "libnl pkgconfig" + +SRC_URI = "http://wireless.kernel.org/download/iw/${P}.tar.bz2" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR=${D} install +} -- cgit v1.2.3 From 5c9878edf28117ed1a2e976bb98797f9b6f506e6 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 7 Jan 2010 21:51:47 +0000 Subject: mc: Properly pass *_FOR_BUILD variables. --- recipes/mc/mc.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes/mc/mc.inc b/recipes/mc/mc.inc index f7db53ffd0..24ea3944c0 100644 --- a/recipes/mc/mc.inc +++ b/recipes/mc/mc.inc @@ -17,6 +17,7 @@ ac_cv_path_PERL=${bindir}/perl \ ac_cv_path_ZIP=${bindir}/zip \ ac_cv_path_UNZIP=${bindir}/unzip \ " +EXTRA_OEMAKE = 'GLIB_CFLAGS_FOR_BUILD="$GLIB_CFLAGS_FOR_BUILD" GLIB_LIBS_FOR_BUILD="$GLIB_LIBS_FOR_BUILD" CC_FOR_BUILD="$CC_FOR_BUILD"' PACKAGES += "${PN}-extfs ${PN}-hilite" FILES_${PN} = "${bindir}/ ${libexecdir}/mc ${datadir}/mc/*.charsets ${datadir}/mc/*.ext ${datadir}/mc/*.hint ${datadir}/mc/*.hlp ${datadir}/mc/*.lib ${datadir}/mc/*.menu ${datadir}/mc/*.rc ${datadir}/mc/bin /etc/profile.d" @@ -33,8 +34,10 @@ export CC_FOR_BUILD = "${BUILD_CC}" export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" export LD_FOR_BUILD = "${BUILD_CC}" do_compile_prepend() { - export GLIB_CFLAGS_FOR_BUILD="`${STAGING_BINDIR_NATIVE}/pkg-config --cflags glib-2.0`" - export GLIB_LIBS_FOR_BUILD="`${STAGING_BINDIR_NATIVE}/pkg-config --libs glib-2.0`" + # FIXME: Ugly! Should be done globally with respect to the host system (in classes) instead of NATIVE_PKGCONFIG_PATH: + export HOST_PKG_CONFIG_PATH= + export GLIB_CFLAGS_FOR_BUILD="`PKG_CONFIG_PATH="$HOST_PKG_CONFIG_PATH" PKG_CONFIG_SYSROOT_DIR="" pkg-config --cflags glib-2.0`" + export GLIB_LIBS_FOR_BUILD="`PKG_CONFIG_PATH="$HOST_PKG_CONFIG_PATH" PKG_CONFIG_SYSROOT_DIR="" pkg-config --libs glib-2.0`" } do_install_append() { -- cgit v1.2.3 From 928760831e33bd42d4f02d9dc4855c7ae623c5af Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Thu, 7 Jan 2010 22:57:16 +0100 Subject: vdr: fix libintl problem now the right way * bump PR --- recipes/vdr/files/libintl.patch | 8 ++++---- recipes/vdr/files/linkerflags.patch | 40 ++++++++++++++++++------------------- recipes/vdr/vdr_1.7.10.bb | 6 ++++-- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/recipes/vdr/files/libintl.patch b/recipes/vdr/files/libintl.patch index 53540408d2..57b258166e 100644 --- a/recipes/vdr/files/libintl.patch +++ b/recipes/vdr/files/libintl.patch @@ -1,13 +1,13 @@ Index: vdr-1.7.10/Makefile =================================================================== ---- vdr-1.7.10.orig/Makefile 2010-01-03 17:37:34.481503866 +0100 -+++ vdr-1.7.10/Makefile 2010-01-03 17:37:46.708168016 +0100 +--- vdr-1.7.10.orig/Makefile 2010-01-07 22:02:32.000000000 +0100 ++++ vdr-1.7.10/Makefile 2010-01-07 22:03:01.803824516 +0100 @@ -20,7 +20,7 @@ MANDIR = $(PREFIX)/share/man BINDIR = $(PREFIX)/bin LOCDIR = ./locale --LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig -+LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig -lintl +-LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig ${LDFLAGS} ++LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig -lintl ${LDFLAGS} INCLUDES = ${CFLAGS} PLUGINDIR= ./PLUGINS diff --git a/recipes/vdr/files/linkerflags.patch b/recipes/vdr/files/linkerflags.patch index 6ae2fef2cc..63c4477790 100644 --- a/recipes/vdr/files/linkerflags.patch +++ b/recipes/vdr/files/linkerflags.patch @@ -1,20 +1,20 @@ Index: vdr-1.7.10/Makefile =================================================================== ---- vdr-1.7.10.orig/Makefile 2010-01-03 18:32:17.621590237 +0100 -+++ vdr-1.7.10/Makefile 2010-01-03 18:32:35.494511992 +0100 +--- vdr-1.7.10.orig/Makefile 2010-01-07 22:01:54.000000000 +0100 ++++ vdr-1.7.10/Makefile 2010-01-07 22:02:32.167165564 +0100 @@ -20,7 +20,7 @@ MANDIR = $(PREFIX)/share/man BINDIR = $(PREFIX)/bin LOCDIR = ./locale --LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig -lintl -+LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig -lintl ${LDFLAGS} +-LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig ++LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig ${LDFLAGS} INCLUDES = ${CFLAGS} PLUGINDIR= ./PLUGINS Index: vdr-1.7.10/PLUGINS/src/hello/Makefile =================================================================== ---- vdr-1.7.10.orig/PLUGINS/src/hello/Makefile 2010-01-03 18:36:04.434906531 +0100 -+++ vdr-1.7.10/PLUGINS/src/hello/Makefile 2010-01-03 18:36:53.764486295 +0100 +--- vdr-1.7.10.orig/PLUGINS/src/hello/Makefile 2010-01-07 22:01:07.000000000 +0100 ++++ vdr-1.7.10/PLUGINS/src/hello/Makefile 2010-01-07 22:02:02.240496954 +0100 @@ -19,6 +19,7 @@ CXX ?= g++ @@ -34,8 +34,8 @@ Index: vdr-1.7.10/PLUGINS/src/hello/Makefile dist: clean Index: vdr-1.7.10/PLUGINS/src/osddemo/Makefile =================================================================== ---- vdr-1.7.10.orig/PLUGINS/src/osddemo/Makefile 2010-01-03 18:37:03.264901094 +0100 -+++ vdr-1.7.10/PLUGINS/src/osddemo/Makefile 2010-01-03 18:37:50.811562295 +0100 +--- vdr-1.7.10.orig/PLUGINS/src/osddemo/Makefile 2010-01-07 22:01:07.000000000 +0100 ++++ vdr-1.7.10/PLUGINS/src/osddemo/Makefile 2010-01-07 22:02:02.240496954 +0100 @@ -17,6 +17,7 @@ CXX ?= g++ @@ -55,8 +55,8 @@ Index: vdr-1.7.10/PLUGINS/src/osddemo/Makefile dist: clean Index: vdr-1.7.10/PLUGINS/src/pictures/Makefile =================================================================== ---- vdr-1.7.10.orig/PLUGINS/src/pictures/Makefile 2010-01-03 18:38:04.324891989 +0100 -+++ vdr-1.7.10/PLUGINS/src/pictures/Makefile 2010-01-03 18:38:28.857810076 +0100 +--- vdr-1.7.10.orig/PLUGINS/src/pictures/Makefile 2010-01-07 22:01:07.000000000 +0100 ++++ vdr-1.7.10/PLUGINS/src/pictures/Makefile 2010-01-07 22:02:02.240496954 +0100 @@ -19,6 +19,7 @@ CXX ?= g++ @@ -76,8 +76,8 @@ Index: vdr-1.7.10/PLUGINS/src/pictures/Makefile dist: clean Index: vdr-1.7.10/PLUGINS/src/servicedemo/Makefile =================================================================== ---- vdr-1.7.10.orig/PLUGINS/src/servicedemo/Makefile 2010-01-03 18:38:35.431552371 +0100 -+++ vdr-1.7.10/PLUGINS/src/servicedemo/Makefile 2010-01-03 18:39:08.001139005 +0100 +--- vdr-1.7.10.orig/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:01:07.000000000 +0100 ++++ vdr-1.7.10/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:02:02.240496954 +0100 @@ -19,6 +19,7 @@ CXX ?= g++ @@ -102,8 +102,8 @@ Index: vdr-1.7.10/PLUGINS/src/servicedemo/Makefile dist: clean Index: vdr-1.7.10/PLUGINS/src/skincurses/Makefile =================================================================== ---- vdr-1.7.10.orig/PLUGINS/src/skincurses/Makefile 2010-01-03 18:39:17.038217922 +0100 -+++ vdr-1.7.10/PLUGINS/src/skincurses/Makefile 2010-01-03 18:40:01.821133352 +0100 +--- vdr-1.7.10.orig/PLUGINS/src/skincurses/Makefile 2010-01-07 22:01:07.000000000 +0100 ++++ vdr-1.7.10/PLUGINS/src/skincurses/Makefile 2010-01-07 22:02:02.240496954 +0100 @@ -19,6 +19,7 @@ CXX ?= g++ @@ -123,8 +123,8 @@ Index: vdr-1.7.10/PLUGINS/src/skincurses/Makefile dist: clean Index: vdr-1.7.10/PLUGINS/src/sky/Makefile =================================================================== ---- vdr-1.7.10.orig/PLUGINS/src/sky/Makefile 2010-01-03 18:40:08.738209760 +0100 -+++ vdr-1.7.10/PLUGINS/src/sky/Makefile 2010-01-03 18:40:20.694465450 +0100 +--- vdr-1.7.10.orig/PLUGINS/src/sky/Makefile 2010-01-07 22:01:07.000000000 +0100 ++++ vdr-1.7.10/PLUGINS/src/sky/Makefile 2010-01-07 22:02:02.240496954 +0100 @@ -17,6 +17,7 @@ CXX ?= g++ @@ -144,8 +144,8 @@ Index: vdr-1.7.10/PLUGINS/src/sky/Makefile dist: clean Index: vdr-1.7.10/PLUGINS/src/status/Makefile =================================================================== ---- vdr-1.7.10.orig/PLUGINS/src/status/Makefile 2010-01-03 18:40:27.841126169 +0100 -+++ vdr-1.7.10/PLUGINS/src/status/Makefile 2010-01-03 18:40:41.844457953 +0100 +--- vdr-1.7.10.orig/PLUGINS/src/status/Makefile 2010-01-07 22:01:07.000000000 +0100 ++++ vdr-1.7.10/PLUGINS/src/status/Makefile 2010-01-07 22:02:02.240496954 +0100 @@ -17,6 +17,7 @@ CXX ?= g++ @@ -165,8 +165,8 @@ Index: vdr-1.7.10/PLUGINS/src/status/Makefile dist: clean Index: vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile =================================================================== ---- vdr-1.7.10.orig/PLUGINS/src/svdrpdemo/Makefile 2010-01-03 18:40:50.818205559 +0100 -+++ vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile 2010-01-03 18:41:01.831121904 +0100 +--- vdr-1.7.10.orig/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:01:07.000000000 +0100 ++++ vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:02:02.240496954 +0100 @@ -17,6 +17,7 @@ CXX ?= g++ diff --git a/recipes/vdr/vdr_1.7.10.bb b/recipes/vdr/vdr_1.7.10.bb index b4cc5ce5c9..a8fa82c13b 100644 --- a/recipes/vdr/vdr_1.7.10.bb +++ b/recipes/vdr/vdr_1.7.10.bb @@ -2,18 +2,20 @@ DESCRIPTION = "Video Disk Recorder (VDR) is a digital sat-receiver program using AUTHOR = "Klaus Schmidinger" LICENSE = "GPLv2" HOMEPAGE = "http://www.tvdr.de" -PR = "r1" +PR = "r2" DEPENDS = "fontconfig freetype gettext libcap jpeg virtual/libintl" SRC_URI = "ftp://ftp.tvdr.de/vdr/Developer/${P}.tar.bz2 \ file://fixpaths.patch;patch=1 \ file://cplusplus.patch;patch=1 \ - file://libintl.patch;patch=1 \ file://disable_plugin.patch;patch=1 \ file://linkerflags.patch;patch=1 \ " +SRC_URI_append_linux-uclibceabi = " file://libintl.patch;patch=1 " +SRC_URI_append_uclinux-uclibc = " file://libintl.patch;patch=1 " + CFLAGS_append += " -I${STAGING_INCDIR}/freetype2" PLUGINDIR = "${libdir}/vdr/plugins" -- cgit v1.2.3 From 6c309dec537c1736c2f5174dbab955671534dd68 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 7 Jan 2010 21:57:48 +0000 Subject: imagemagick: Add more probably wanted optional libraries to DEPENDS. --- recipes/imagemagick/imagemagick-native_6.3.5-10.bb | 3 +++ recipes/imagemagick/imagemagick_6.3.5-10.bb | 4 ++-- recipes/imagemagick/imagemagick_6.4.4-1.bb | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/recipes/imagemagick/imagemagick-native_6.3.5-10.bb b/recipes/imagemagick/imagemagick-native_6.3.5-10.bb index b03e18e9c1..0dcf8d4eca 100644 --- a/recipes/imagemagick/imagemagick-native_6.3.5-10.bb +++ b/recipes/imagemagick/imagemagick-native_6.3.5-10.bb @@ -1,3 +1,6 @@ require imagemagick_${PV}.bb DEPENDS ="libtool-native" +# FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results. +# tiff-native does not exist +DEPENDS += "bzip2-native jpeg-native libpng-native zlib-native" inherit native diff --git a/recipes/imagemagick/imagemagick_6.3.5-10.bb b/recipes/imagemagick/imagemagick_6.3.5-10.bb index 8bd25e9d5a..e23d11dc24 100644 --- a/recipes/imagemagick/imagemagick_6.3.5-10.bb +++ b/recipes/imagemagick/imagemagick_6.3.5-10.bb @@ -1,8 +1,8 @@ DESCRIPTION = "ImageMagick is an image convertion tools" SECTION = "console/utils" LICENSE = "GPL" -DEPENDS = "tiff" -PR = "r5" +DEPENDS = "tiff jpeg libpng tiff zlib" +PR = "r6" SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \ file://PerlMagic_MakePatch;patch=1 \ diff --git a/recipes/imagemagick/imagemagick_6.4.4-1.bb b/recipes/imagemagick/imagemagick_6.4.4-1.bb index 546defc4ad..c2216a21df 100644 --- a/recipes/imagemagick/imagemagick_6.4.4-1.bb +++ b/recipes/imagemagick/imagemagick_6.4.4-1.bb @@ -1,9 +1,10 @@ DESCRIPTION = "ImageMagick is an image convertion tools" SECTION = "console/utils" LICENSE = "GPL" -DEPENDS = "tiff" +# FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results. +DEPENDS = "bzip2 jpeg libpng tiff zlib" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \ file://PerlMagic_MakePatch;patch=1 \ -- cgit v1.2.3 From e9dac0c87c3c08d63553b2cde9d8e362d12639a1 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 7 Jan 2010 22:12:08 +0000 Subject: checksums.ini: Added missing iw. --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 2fad0b72d8..728d64bd8f 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -13066,6 +13066,10 @@ sha256=62a6f9cb90999694e48528e16f427433c13a99424b5dca4cb38cda99e13d10e8 md5=ebef12559268e2c5ea932cbb5aaa789e sha256=62a6f9cb90999694e48528e16f427433c13a99424b5dca4cb38cda99e13d10e8 +[http://wireless.kernel.org/download/iw/iw-0.9.18.tar.bz2] +md5=9734080d8a5c4b768c5e0da665a48950 +sha256=b02e26efc72cb23129431e478dbb2f2abd16e8cc4f4130762d98c54f106aabd0 + [http://www.kokkinizita.net/linuxaudio/downloads/jaaa-0.4.2.tar.bz2] md5=e3013bb1e287b495b0668f4b6e2887c7 sha256=0bae72d819963c40e0a202bb08bc55a600fe7c453749601a3836bc9272cffb3a -- cgit v1.2.3 From 6962a060a7daded4dd26ecb5a5aeb24e6f85bf3d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 7 Jan 2010 22:09:24 +0100 Subject: sane-srcrevs-fso: update to HEAD, remove autorev-fso from fso2-console-image as it should compile again Signed-off-by: Martin Jansa --- conf/distro/include/sane-srcrevs-fso.inc | 34 ++++++++++++++++---------------- recipes/images/fso2-console-image.bb | 1 - 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index d4dfd87521..726efec3b5 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -1,47 +1,47 @@ # To be included from sane-srcrevs.inc # FSO Projects -- Cornucopia -FSO_CORNUCOPIA_SRCREV ?= "1dcf546fb0423930f938129a51f538874c172226" +FSO_CORNUCOPIA_SRCREV ?= "70b87d6e8b04f0bf0078702f6467e037eb4fdb28" SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsodatad ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2" -SRCREV_pn-fsodeviced ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2" +SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsomusicd ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2" +SRCREV_pn-fsomusicd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsotdld ?= "5702931bf6a2a796fde6abdf1909d5901216bee7" -SRCREV_pn-fsousaged ?= "fe2ec3260b73233c414de584aa1b4a5e49c24a0d" -SRCREV_pn-libfsobasics ?= "18d4114d295617c6fb611f3c804e1980b896fc14" -SRCREV_pn-libfsoframework ?= "690dc75efcc8e4dbcb53e361d48c54e104955921" +SRCREV_pn-fsotdld ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}" # FSO Projects -- Misc SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb" -SRCREV_pn-frameworkd ?= "d48bd43c430322b26744e31829f9c76e9b725819" +SRCREV_pn-frameworkd ?= "439300083459fe66cb93aca20cee185f6fcc52f5" SRCREV_pn-frameworkd-config-shr_FSO_REV ?= ${SRCREV_pn-frameworkd} -SRCREV_pn-fso-abyss ?= "7f271311e2e0b63235139859169bd248920ade30" +SRCREV_pn-fso-abyss ?= "aaa3c48296c8589d845f2b6e4314b794750d91cc" SRCREV_pn-fso-term ?= "aa0b9c26dee3918a5e9d2809bb36335bda276a0d" SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6" SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44" SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815" -SRCREV_pn-fso-specs ?= "14de522adbea80416df811085b3112cd1d5d5336" +SRCREV_pn-fso-specs ?= "60580a3fc3e8b2c036f9734c59994a5175bfcc1e" SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8" -SRCREV_pn-libeflvala ?= "d07db4fbd24c9d5dfc9b1fd5024fd651b02f123e" -SRCREV_pn-libfso-glib ?= "9a627aa1c33f5a46ae4316fc274126ca5f37e979" +SRCREV_pn-libeflvala ?= "707ca862f11feb4fa6945c222a34272b8fd3aebb" +SRCREV_pn-libfso-glib ?= "4016a7ff20cf53403ab22877eef3a706607f25a3" SRCREV_pn-libframeworkd-glib ?= "bdea2ad33bb5c5aa2b996712b99e8dd9b58aed7d" SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166" -SRCREV_pn-libgsm0710mux ?= "e81ed512ec86e31d0d0119826afa9d1302651693" -SRCREV_pn-libpersistence ?= "26180fd3c0fe4eb6abb7440f10e51d997719b97a" +SRCREV_pn-libgsm0710mux ?= "b6793a8191f20adba31b93b2f337cc5451270cf9" +SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06" FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317" SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}" SRCREV_pn-mickeyterm ?= "${FSO_PYTHONHELPERS_SRCREV}" SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}" SRCREV_pn-python-pyrtc ?= "${FSO_PYTHONHELPERS_SRCREV}" SRCREV_pn-pycd ?= "${FSO_PYTHONHELPERS_SRCREV}" -SRCREV_pn-vala-dbus-binding-tool-native ?= "324a78c0cab484535ce5a7a33436e9c62311297d" +SRCREV_pn-vala-dbus-binding-tool-native ?= "11e5b817f569e3ce81fa94ed77ed529101368b7f" SRCREV_pn-vala-terminal ?= "932285d72e26b965c488f8aa99fe51f7a34231ad" -SRCREV_pn-vala-native ?= "2f14aed36765c842fe7b4035ba564d2c023ef0b0" +SRCREV_pn-vala-native ?= "a8aa50a80bcdc5f6c8183507f87b6c6fdfac8d9f" SRCREV_pn-zhone ?= "d654b3d15500a56c8e987e4d2cc2f8eef70b78c0" diff --git a/recipes/images/fso2-console-image.bb b/recipes/images/fso2-console-image.bb index 8510aa8539..60bd6fc720 100644 --- a/recipes/images/fso2-console-image.bb +++ b/recipes/images/fso2-console-image.bb @@ -3,7 +3,6 @@ #------------------------------------------------------ require fso-image.inc -require conf/distro/include/fso-autorev.inc PV = "1.1" PR = "r1" -- cgit v1.2.3 From db5e6144271564e5440339492d2ba148cdada8bc Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 7 Jan 2010 23:11:20 +0100 Subject: gtk+: unify --- recipes/gtk+/gtk+.inc | 20 ++++++++++++++------ recipes/gtk+/gtk+_2.12.0.bb | 12 +----------- recipes/gtk+/gtk+_2.12.11.bb | 12 +----------- recipes/gtk+/gtk+_2.12.3.bb | 12 +----------- recipes/gtk+/gtk+_2.14.1.bb | 12 ------------ recipes/gtk+/gtk+_2.14.2.bb | 12 +----------- recipes/gtk+/gtk+_2.16.4.bb | 11 ----------- recipes/gtk+/gtk+_2.16.6.bb | 11 ----------- recipes/gtk+/gtk+_2.18.0.bb | 11 ----------- recipes/gtk+/gtk+_2.18.3.bb | 11 ----------- 10 files changed, 18 insertions(+), 106 deletions(-) diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc index d47ace0c06..610428821f 100644 --- a/recipes/gtk+/gtk+.inc +++ b/recipes/gtk+/gtk+.inc @@ -5,14 +5,24 @@ SECTION = "libs" LICENSE = "LGPL" PRIORITY = "optional" DEPENDS = "glib-2.0 tiff pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cups \ - libxrandr libxdamage libxrender libxcomposite" + libxrandr libxdamage libxrender libxcomposite cairo jasper" PROVIDES = "gdk-pixbuf" -INC_PR = "r6" +MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" +SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.bz2 \ + file://hardcoded_libtool.patch;patch=1 \ + file://no-demos.patch;patch=1 \ + file://run-iconcache.patch;patch=1 \ + file://toggle-font.diff;patch=1;pnum=0 \ + file://xsettings.patch;patch=1 \ + " + +INC_PR = "r7" inherit autotools pkgconfig LEAD_SONAME = "libgtk-x11-2.0.so" +LIBV = "2.10.0" FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${bindir}/gtk-update-icon-cache \ @@ -23,7 +33,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ RDEPENDS_${PN} = "hicolor-icon-theme" FILES_${PN}-dev += " \ - ${datadir}/gtk-2.0/include \ + ${datadir}/gtk-2.0/include \ ${libdir}/gtk-2.0/include \ ${bindir}/gdk-pixbuf-csource \ ${bindir}/gtk-builder-convert" @@ -41,8 +51,6 @@ RRECOMMENDS_${PN} = " ${NEATSTUFF} " RRECOMMENDS_${PN}_linux = " ${NEATSTUFF} glibc-gconv-iso8859-1 " RRECOMMENDS_${PN}_linux-gnueabi = " ${NEATSTUFF} glibc-gconv-iso8859-1" - - do_stage () { oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR} oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR} @@ -56,7 +64,7 @@ do_stage () { mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h - # Copy over all headers, since the maemo stuff needs access to the private api. *sigh* + # Copy over all headers, since the maemo stuff needs access to the private api. *sigh* cp gtk/*.h ${STAGING_INCDIR}/gtk-2.0/gtk/ install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/ diff --git a/recipes/gtk+/gtk+_2.12.0.bb b/recipes/gtk+/gtk+_2.12.0.bb index f5741b65c3..0378040656 100644 --- a/recipes/gtk+/gtk+_2.12.0.bb +++ b/recipes/gtk+/gtk+_2.12.0.bb @@ -2,20 +2,12 @@ require gtk+.inc PR = "${INC_PR}.0" -DEPENDS += "cairo" - # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" -SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ - file://xsettings.patch;patch=1 \ - file://run-iconcache.patch;patch=1 \ - file://disable-print.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://no-demos.patch;patch=1 \ +SRC_URI += "file://disable-print.patch;patch=1 \ file://cellrenderer-cairo.patch;patch=1;pnum=0 \ file://entry-cairo.patch;patch=1;pnum=0 \ - file://toggle-font.diff;patch=1;pnum=0 \ file://scrolled-placement.patch;patch=1;pnum=0" # temporary # file://gtklabel-resize-patch;patch=1 \ @@ -26,8 +18,6 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration" -LIBV = "2.10.0" - PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" python populate_packages_prepend () { diff --git a/recipes/gtk+/gtk+_2.12.11.bb b/recipes/gtk+/gtk+_2.12.11.bb index 8a0db74ac5..1e04c2b319 100644 --- a/recipes/gtk+/gtk+_2.12.11.bb +++ b/recipes/gtk+/gtk+_2.12.11.bb @@ -2,19 +2,11 @@ require gtk+.inc PR = "${INC_PR}.0" -DEPENDS += "cairo" - # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" -SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ - file://xsettings.patch;patch=1 \ - file://run-iconcache.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://no-demos.patch;patch=1 \ - file://cellrenderer-cairo.patch;patch=1;pnum=0 \ +SRC_URI += "file://cellrenderer-cairo.patch;patch=1;pnum=0 \ file://entry-cairo.patch;patch=1;pnum=0 \ - file://toggle-font.diff;patch=1;pnum=0 \ file://scrolled-placement.patch;patch=1;pnum=0" # temporary # file://gtklabel-resize-patch;patch=1 \ @@ -25,8 +17,6 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration" -LIBV = "2.10.0" - PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" python populate_packages_prepend () { diff --git a/recipes/gtk+/gtk+_2.12.3.bb b/recipes/gtk+/gtk+_2.12.3.bb index 8a0db74ac5..1e04c2b319 100644 --- a/recipes/gtk+/gtk+_2.12.3.bb +++ b/recipes/gtk+/gtk+_2.12.3.bb @@ -2,19 +2,11 @@ require gtk+.inc PR = "${INC_PR}.0" -DEPENDS += "cairo" - # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" -SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ - file://xsettings.patch;patch=1 \ - file://run-iconcache.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://no-demos.patch;patch=1 \ - file://cellrenderer-cairo.patch;patch=1;pnum=0 \ +SRC_URI += "file://cellrenderer-cairo.patch;patch=1;pnum=0 \ file://entry-cairo.patch;patch=1;pnum=0 \ - file://toggle-font.diff;patch=1;pnum=0 \ file://scrolled-placement.patch;patch=1;pnum=0" # temporary # file://gtklabel-resize-patch;patch=1 \ @@ -25,8 +17,6 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration" -LIBV = "2.10.0" - PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" python populate_packages_prepend () { diff --git a/recipes/gtk+/gtk+_2.14.1.bb b/recipes/gtk+/gtk+_2.14.1.bb index dc4f2f254a..2d78edb4a4 100644 --- a/recipes/gtk+/gtk+_2.14.1.bb +++ b/recipes/gtk+/gtk+_2.14.1.bb @@ -2,23 +2,11 @@ require gtk+.inc PR = "${INC_PR}.0" -DEPENDS += "cairo jasper" - # disable per default - this uses as little patches as possible DEFAULT_PREFERENCE = "-1" -SRC_URI = "http://download.gnome.org/sources/gtk+/2.14/gtk+-${PV}.tar.bz2 \ - file://xsettings.patch;patch=1 \ - file://run-iconcache.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://no-demos.patch;patch=1 \ - file://toggle-font.diff;patch=1;pnum=0 \ - " - EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes" -LIBV = "2.10.0" - PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" python populate_packages_prepend () { diff --git a/recipes/gtk+/gtk+_2.14.2.bb b/recipes/gtk+/gtk+_2.14.2.bb index bc4a5869ac..a6ba9ce12f 100644 --- a/recipes/gtk+/gtk+_2.14.2.bb +++ b/recipes/gtk+/gtk+_2.14.2.bb @@ -2,21 +2,11 @@ require gtk+.inc PR = "${INC_PR}.0" -DEPENDS += "cairo jasper" - -SRC_URI = "http://download.gnome.org/sources/gtk+/2.14/gtk+-${PV}.tar.bz2 \ - file://xsettings.patch;patch=1 \ - file://run-iconcache.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://no-demos.patch;patch=1 \ - file://toggle-font.diff;patch=1;pnum=0 \ - file://smallscreen_filechooser.patch;patch=1 \ +SRC_URI += "file://smallscreen_filechooser.patch;patch=1 \ " EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes" -LIBV = "2.10.0" - PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" python populate_packages_prepend () { diff --git a/recipes/gtk+/gtk+_2.16.4.bb b/recipes/gtk+/gtk+_2.16.4.bb index 890a27f724..77595c3309 100644 --- a/recipes/gtk+/gtk+_2.16.4.bb +++ b/recipes/gtk+/gtk+_2.16.4.bb @@ -1,23 +1,12 @@ require gtk+.inc -DEPENDS += "cairo jasper" PR = "${INC_PR}.0" # disabled per default - this uses as little patches as possible DEFAULT_PREFERENCE = "-1" -SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \ - file://xsettings.patch;patch=1 \ - file://run-iconcache.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://no-demos.patch;patch=1 \ - file://toggle-font.diff;patch=1;pnum=0 \ - " - EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes" -LIBV = "2.10.0" - PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" python populate_packages_prepend () { diff --git a/recipes/gtk+/gtk+_2.16.6.bb b/recipes/gtk+/gtk+_2.16.6.bb index 890a27f724..77595c3309 100644 --- a/recipes/gtk+/gtk+_2.16.6.bb +++ b/recipes/gtk+/gtk+_2.16.6.bb @@ -1,23 +1,12 @@ require gtk+.inc -DEPENDS += "cairo jasper" PR = "${INC_PR}.0" # disabled per default - this uses as little patches as possible DEFAULT_PREFERENCE = "-1" -SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \ - file://xsettings.patch;patch=1 \ - file://run-iconcache.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://no-demos.patch;patch=1 \ - file://toggle-font.diff;patch=1;pnum=0 \ - " - EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes" -LIBV = "2.10.0" - PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" python populate_packages_prepend () { diff --git a/recipes/gtk+/gtk+_2.18.0.bb b/recipes/gtk+/gtk+_2.18.0.bb index d2cf4c6858..77595c3309 100644 --- a/recipes/gtk+/gtk+_2.18.0.bb +++ b/recipes/gtk+/gtk+_2.18.0.bb @@ -1,23 +1,12 @@ require gtk+.inc -DEPENDS += "cairo jasper" PR = "${INC_PR}.0" # disabled per default - this uses as little patches as possible DEFAULT_PREFERENCE = "-1" -SRC_URI = "http://download.gnome.org/sources/gtk+/2.18/gtk+-${PV}.tar.bz2 \ - file://xsettings.patch;patch=1 \ - file://run-iconcache.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://no-demos.patch;patch=1 \ - file://toggle-font.diff;patch=1;pnum=0 \ - " - EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes" -LIBV = "2.10.0" - PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" python populate_packages_prepend () { diff --git a/recipes/gtk+/gtk+_2.18.3.bb b/recipes/gtk+/gtk+_2.18.3.bb index d2cf4c6858..77595c3309 100644 --- a/recipes/gtk+/gtk+_2.18.3.bb +++ b/recipes/gtk+/gtk+_2.18.3.bb @@ -1,23 +1,12 @@ require gtk+.inc -DEPENDS += "cairo jasper" PR = "${INC_PR}.0" # disabled per default - this uses as little patches as possible DEFAULT_PREFERENCE = "-1" -SRC_URI = "http://download.gnome.org/sources/gtk+/2.18/gtk+-${PV}.tar.bz2 \ - file://xsettings.patch;patch=1 \ - file://run-iconcache.patch;patch=1 \ - file://hardcoded_libtool.patch;patch=1 \ - file://no-demos.patch;patch=1 \ - file://toggle-font.diff;patch=1;pnum=0 \ - " - EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes" -LIBV = "2.10.0" - PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" python populate_packages_prepend () { -- cgit v1.2.3 From 2cada8a1fd757b17dca27255326bda6e0237c69d Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 7 Jan 2010 23:12:30 +0000 Subject: lzma: Stage lzma binary, initramfs-kexecboot-image depends on it (removed do_stage and added NATIVE_INSTALL_WORKS). --- recipes/lzma/lzma-native_4.65.bb | 1 + recipes/lzma/lzma.inc | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/recipes/lzma/lzma-native_4.65.bb b/recipes/lzma/lzma-native_4.65.bb index 0bb42ea462..da05dfa7e0 100644 --- a/recipes/lzma/lzma-native_4.65.bb +++ b/recipes/lzma/lzma-native_4.65.bb @@ -1,4 +1,5 @@ inherit native +NATIVE_INSTALL_WORKS = "1" require lzma.inc PR = "${INC_PR}.1" diff --git a/recipes/lzma/lzma.inc b/recipes/lzma/lzma.inc index 4d31a44cd0..e51de9596a 100644 --- a/recipes/lzma/lzma.inc +++ b/recipes/lzma/lzma.inc @@ -2,7 +2,7 @@ DESCRIPTION = "LZMA is a general compression method. LZMA provides high compress HOMEPAGE = "http://www.7-zip.org/" LICENSE = "LGPL" DEPENDS = "zlib" -INC_PR = "r3" +INC_PR = "r4" SRC_URI = "http://downloads.sourceforge.net/sevenzip/lzma${@bb.data.getVar('PV',d,1).replace('.','')}.tar.bz2 \ file://001-large_files.patch;patch=1 \ @@ -36,9 +36,3 @@ do_install() { install -m 0755 CPP/7zip/Compress/LZMA_Alone/lzma ${D}${bindir} oe_libinstall -a -C C/LzmaUtil liblzma ${D}${libdir} } - -do_stage () { - install --d ${STAGING_INCDIR}/lzma - install -m 0644 C/*.h ${STAGING_INCDIR}/lzma - oe_libinstall -a -C C/LzmaUtil liblzma ${STAGING_LIBDIR} -} -- cgit v1.2.3 From a3a6a36b29379a8e34cfa8eda38a8148cb02b73b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 8 Jan 2010 00:17:37 +0100 Subject: vala: bump to 0.7.9.4, needed for latest fsonetworkd --- conf/checksums.ini | 4 ++++ recipes/vala/vala-native_0.7.9.3.bb | 3 --- recipes/vala/vala-native_0.7.9.4.bb | 3 +++ recipes/vala/vala_0.7.9.3.bb | 2 -- recipes/vala/vala_0.7.9.4.bb | 2 ++ 5 files changed, 9 insertions(+), 5 deletions(-) delete mode 100644 recipes/vala/vala-native_0.7.9.3.bb create mode 100644 recipes/vala/vala-native_0.7.9.4.bb delete mode 100644 recipes/vala/vala_0.7.9.3.bb create mode 100644 recipes/vala/vala_0.7.9.4.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 728d64bd8f..e34841c44d 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -27398,6 +27398,10 @@ sha256=5f810c66d35ecea5f77ca6ed87fb3ba394c700dcbcaec5f04872a4c5340a5622 md5=22eb478f18a623a2983bd401a3de0683 sha256=a074f50cf1ee3bb4118c2639ad600baa789f5bfe35d1e6f3377179ab02b52af8 +[http://www.freesmartphone.org/sources/vala-0.7.9.4.tar.bz2] +md5=036faac08ab0898811e6bb92b5fba8de +sha256=debefbb3ea7ae8318f6f5a064e593ecd1d93ba6c5c86c14019800f724c46690e + [http://www.freesmartphone.org/sources/vala-0.7.9.tar.bz2] md5=f2f8b2914361db599fd6392ec27f7042 sha256=a71d59cfed750ff402fece5e7d4b656caf3377d5a6bfe5339894f1b13769d58d diff --git a/recipes/vala/vala-native_0.7.9.3.bb b/recipes/vala/vala-native_0.7.9.3.bb deleted file mode 100644 index d6c239f7bf..0000000000 --- a/recipes/vala/vala-native_0.7.9.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require vala_${PV}.bb -inherit native -DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala-native_0.7.9.4.bb b/recipes/vala/vala-native_0.7.9.4.bb new file mode 100644 index 0000000000..d6c239f7bf --- /dev/null +++ b/recipes/vala/vala-native_0.7.9.4.bb @@ -0,0 +1,3 @@ +require vala_${PV}.bb +inherit native +DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala_0.7.9.3.bb b/recipes/vala/vala_0.7.9.3.bb deleted file mode 100644 index a5b1958f2c..0000000000 --- a/recipes/vala/vala_0.7.9.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -require vala.inc -PR = "${INC_PR}.0" diff --git a/recipes/vala/vala_0.7.9.4.bb b/recipes/vala/vala_0.7.9.4.bb new file mode 100644 index 0000000000..a5b1958f2c --- /dev/null +++ b/recipes/vala/vala_0.7.9.4.bb @@ -0,0 +1,2 @@ +require vala.inc +PR = "${INC_PR}.0" -- cgit v1.2.3 From ae0eaaddcb1408a1dc54b0428e7ec1c39ea5092e Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 7 Jan 2010 23:25:17 +0000 Subject: initramfs-kexecboot-image: DEPENDS on lzma-native. --- recipes/kexecboot/initramfs-kexecboot-image.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/kexecboot/initramfs-kexecboot-image.bb b/recipes/kexecboot/initramfs-kexecboot-image.bb index cdf0861285..890287d3f6 100644 --- a/recipes/kexecboot/initramfs-kexecboot-image.bb +++ b/recipes/kexecboot/initramfs-kexecboot-image.bb @@ -4,6 +4,7 @@ PR = "r2" ONLINE_PACKAGE_MANAGEMENT = "none" IMAGE_FSTYPES = "cpio.gz cpio.lzma" +DEPENDS = "lzma-native" # Deprecated: device nodes are populated by kexecboot now # These devices need mmcblk* to be 254 instead of 179 -- cgit v1.2.3 From 81cbab0207547e07ce3bdb7b747307e96bfbd94b Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Fri, 8 Jan 2010 10:03:11 +0100 Subject: navit: don't RRECOMMEND 2 text2speech apps in svn, but only RSUGGESTS them. * Distros can always pick one by default if they want one by default Signed-off-by: Sebastian Spaeth --- recipes/navit/navit_svn.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb index 41d706666f..5979b7e46a 100644 --- a/recipes/navit/navit_svn.bb +++ b/recipes/navit/navit_svn.bb @@ -1,15 +1,16 @@ require navit.inc PV = "0.1.0+svnr${SRCPV}" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_shr = "1" S = "${WORKDIR}/navit" -# use espeak instead speechd -RRECOMMENDS = "gpsd espeak flite" +# override navit.inc RRECOMMENDS, we only suggest a text2speech app +RRECOMMENDS = "gpsd" +RSUGGESTS = "flite espeak DEPENDS_shr += " librsvg-native" RDEPENDS = " navit-icons" -- cgit v1.2.3 From 4fde7c59bf20296445bc47840da63d5773207443 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 8 Jan 2010 12:38:27 +0100 Subject: xf86-input-tslib 0.0.6: remove patch and bump PR * the patch seems to cause more problems than it solves --- recipes/xorg-driver/xf86-input-tslib_0.0.6.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb b/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb index e86f0c75e6..d19687fb3d 100644 --- a/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb +++ b/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb @@ -4,10 +4,9 @@ DESCRIPTION = "X.Org X server -- tslib input driver" RRECOMMENDS += "hal tslib-calibrate" DEPENDS += "tslib" -PR = "r2" +PR = "r3" SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2 \ - file://dontfloodevents006.patch;patch=1 \ file://10-x11-input-tslib.fdi" do_configure_prepend() { -- cgit v1.2.3 From 3a9b352acba24c78b562d8dc6527b774cbb86041 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 8 Jan 2010 12:44:47 +0100 Subject: xserver-xorg 1.7.3: fix regression where hal was disabled * this fixes the "my touchscreen isn't working anymore" bug --- recipes/xorg-xserver/xserver-xorg_1.7.3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.3.bb b/recipes/xorg-xserver/xserver-xorg_1.7.3.bb index af01a9024d..edede8b3ff 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.7.3.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.7.3.bb @@ -3,7 +3,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts" PE = "2" -PR = "r3" +PR = "r4" SRC_URI += "file://sysroot_fix.patch;patch=1 \ file://dolt-fix-1.7.0.patch;patch=1 \ @@ -20,7 +20,7 @@ do_install_prepend() { # The NVidia driver requires Xinerama support in the X server. Ion uses it. XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}" -EXTRA_OECONF += "--disable-xephyr --disable-config-hal ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " --enable-config-hal ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests " export LDFLAGS += " -ldl " -- cgit v1.2.3 From 78ddfea284e0e2e9ef3774c69ff7ca2fcd5a2d17 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 8 Jan 2010 12:48:52 +0100 Subject: linux-omap-zoomsync: add 2.6.32 recipe, fix dss-doc packaging --- .../linux-omap-zoomsync-2.6.32/omapzoom2/defconfig | 2032 ++++++++++++++++++++ recipes/linux/linux-omap-zoomsync_2.6.31.bb | 3 + recipes/linux/linux-omap-zoomsync_2.6.32.bb | 34 + 3 files changed, 2069 insertions(+) create mode 100644 recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig create mode 100644 recipes/linux/linux-omap-zoomsync_2.6.32.bb diff --git a/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig b/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig new file mode 100644 index 0000000000..f3edfd905a --- /dev/null +++ b/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig @@ -0,0 +1,2032 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.32-rc7 +# Fri Jan 8 12:29:00 2010 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_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_ARCH_HAS_CPUFREQ=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +# CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_GROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set +# CONFIG_CGROUPS is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_EXTRA_PASS=y +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y + +# +# Kernel Performance Events And Counters +# +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_COMPAT_BRK=y +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_KRETPROBES=y +CONFIG_HAVE_CLK=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +# CONFIG_SLOW_WORK is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" +CONFIG_FREEZER=y + +# +# System Type +# +CONFIG_MMU=y +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_GEMINI is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_STMP3XXX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_NOMADIK is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_MMP is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_W90X900 is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_S5PC1XX is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_U300 is not set +# CONFIG_ARCH_DAVINCI is not set +CONFIG_ARCH_OMAP=y +# CONFIG_ARCH_BCMRING is not set + +# +# TI OMAP Implementations +# +CONFIG_ARCH_OMAP_OTG=y +# CONFIG_ARCH_OMAP1 is not set +# CONFIG_ARCH_OMAP2 is not set +CONFIG_ARCH_OMAP3=y +# CONFIG_ARCH_OMAP4 is not set + +# +# OMAP Feature Selections +# +# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set +# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set +# CONFIG_OMAP_SMARTREFLEX is not set +# CONFIG_OMAP_RESET_CLOCKS is not set +CONFIG_OMAP_MUX=y +CONFIG_OMAP_MUX_DEBUG=y +CONFIG_OMAP_MUX_WARNINGS=y +CONFIG_OMAP_MCBSP=y +# CONFIG_OMAP_MBOX_FWK is not set +CONFIG_OMAP_IOMMU=y +# CONFIG_OMAP_MPU_TIMER is not set +CONFIG_OMAP_32K_TIMER=y +# CONFIG_OMAP3_DEBOBS is not set +# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set +CONFIG_OMAP_32K_TIMER_HZ=128 +CONFIG_OMAP_DM_TIMER=y +# CONFIG_OMAP_LL_DEBUG_UART1 is not set +# CONFIG_OMAP_LL_DEBUG_UART2 is not set +# CONFIG_OMAP_LL_DEBUG_UART3 is not set +CONFIG_OMAP_LL_DEBUG_NONE=y +# CONFIG_OMAP_PM_NONE is not set +CONFIG_OMAP_PM_NOOP=y +# CONFIG_OMAP_PM_SRF is not set +CONFIG_ARCH_OMAP34XX=y +CONFIG_ARCH_OMAP3430=y + +# +# OMAP Board Type +# +# CONFIG_MACH_OMAP3_BEAGLE is not set +# CONFIG_MACH_OMAP_LDP is not set +# CONFIG_MACH_OVERO is not set +# CONFIG_MACH_OMAP3EVM is not set +# CONFIG_WLAN_1273 is not set +# CONFIG_MACH_OMAP3517EVM is not set +# CONFIG_MACH_OMAP3_PANDORA is not set +# CONFIG_MACH_OMAP_3430SDP is not set +# CONFIG_MACH_NOKIA_RX51 is not set +CONFIG_MACH_OMAP_ZOOM2=y +# CONFIG_MACH_CM_T35 is not set +# CONFIG_MACH_OMAP_ZOOM3 is not set +# CONFIG_WIFI_CONTROL_FUNC is not set +# CONFIG_TIWLAN_SDIO is not set +# CONFIG_MACH_OMAP_3630SDP is not set +# CONFIG_MACH_IGEP0020 is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_32v6K=y +CONFIG_CPU_V7=y +CONFIG_CPU_32v7=y +CONFIG_CPU_ABRT_EV7=y +CONFIG_CPU_PABRT_V7=y +CONFIG_CPU_CACHE_V7=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_TLB_V7=y +CONFIG_CPU_HAS_ASID=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_ARM_THUMBEE is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_HAS_TLS_REG=y +CONFIG_ARM_L1_CACHE_SHIFT=6 +# CONFIG_ARM_ERRATA_430973 is not set +# CONFIG_ARM_ERRATA_458693 is not set +# CONFIG_ARM_ERRATA_460075 is not set +CONFIG_COMMON_CLKDEV=y + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +CONFIG_HZ=128 +# CONFIG_THUMB2_KERNEL is not set +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_HIGHMEM is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_VIRT_TO_BUS=y +CONFIG_HAVE_MLOCK=y +CONFIG_HAVE_MLOCKED_PAGE_BIT=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_UACCESS_WITH_MEMCPY is not set + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE=" debug " +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set + +# +# CPU Power Management +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +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=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +# CONFIG_CPU_IDLE is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_NEON=y + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_MISC=y + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_DEBUG=y +CONFIG_PM_VERBOSE=y +CONFIG_CAN_PM_TRACE=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_SUSPEND_FREEZER=y +# CONFIG_APM_EMULATION is not set +# CONFIG_PM_RUNTIME is not set +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=y +# CONFIG_XFRM_SUB_POLICY is not set +CONFIG_XFRM_MIGRATE=y +# CONFIG_XFRM_STATISTICS is not set +CONFIG_NET_KEY=y +CONFIG_NET_KEY_MIGRATE=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE 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=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_LRO is not set +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_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_RDS is not set +# 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 +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +# CONFIG_NET_SCHED is not set +# 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_AF_RXRPC is not set +# CONFIG_WIRELESS is not set +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_TESTS is not set +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# 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 +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_GPIO is not set +CONFIG_MTD_NAND_OMAP2=y +CONFIG_MTD_NAND_OMAP_PREFETCH=y +# CONFIG_MTD_NAND_OMAP_PREFETCH_DMA is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ALAUDA is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_MG_DISK is not set +CONFIG_MISC_DEVICES=y +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_ISL29003 is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +# CONFIG_ATA is not set +# CONFIG_MD is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# 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=y +# 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_AX88796 is not set +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_ENC28J60 is not set +# CONFIG_ETHOC is not set +# CONFIG_SMC911X is not set +CONFIG_SMSC911X=y +# 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_KS8842 is not set +# CONFIG_KS8851 is not set +# CONFIG_KS8851_MLL is not set +CONFIG_NETDEV_1000=y +CONFIG_NETDEV_10000=y +CONFIG_WLAN=y +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set +# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_ISDN is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_QT2160 is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_KEYBOARD_MATRIX is not set +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +CONFIG_KEYBOARD_TWL4030=y +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set +# CONFIG_TOUCHSCREEN_AD7879_I2C is not set +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_EETI is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI=y +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_TOUCHSCREEN_W90X900 is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_MAX3100 is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_OMAP is not set +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=y +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_OMAP=y +# CONFIG_I2C_SIMTEC is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_DS1682 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_TWL4030_MADC 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 + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_GPIO is not set +CONFIG_SPI_OMAP24XX=y + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set + +# +# PPS support +# +# CONFIG_PPS 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 +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set +CONFIG_GPIO_TWL4030=y + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set + +# +# AC97 GPIO expanders: +# +CONFIG_W1=y +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +# CONFIG_W1_MASTER_DS2490 is not set +# CONFIG_W1_MASTER_DS2482 is not set +# CONFIG_W1_MASTER_DS1WM is not set +# CONFIG_W1_MASTER_GPIO is not set +# CONFIG_HDQ_MASTER_OMAP is not set + +# +# 1-wire Slaves +# +# CONFIG_W1_SLAVE_THERM is not set +# CONFIG_W1_SLAVE_SMEM is not set +# CONFIG_W1_SLAVE_DS2431 is not set +# CONFIG_W1_SLAVE_DS2433 is not set +# CONFIG_W1_SLAVE_DS2760 is not set +# CONFIG_W1_SLAVE_BQ27000 is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +# CONFIG_BATTERY_DS2760 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_HWMON is not set +# CONFIG_THERMAL is not set +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_OMAP_WATCHDOG=y +# CONFIG_TWL4030_WATCHDOG is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_TPS65010 is not set +CONFIG_TWL4030_CORE=y +# CONFIG_TWL4030_POWER is not set +# CONFIG_TWL4030_CODEC is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_MC13783 is not set +# CONFIG_AB3100_CORE is not set +# CONFIG_EZX_PCAP is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_BQ24022 is not set +# CONFIG_REGULATOR_MAX1586 is not set +CONFIG_REGULATOR_TWL4030=y +# CONFIG_REGULATOR_LP3971 is not set +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set +CONFIG_MEDIA_SUPPORT=y + +# +# Multimedia core support +# +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_COMMON=y +# CONFIG_VIDEO_ALLOW_V4L1 is not set +CONFIG_VIDEO_V4L1_COMPAT=y +# CONFIG_DVB_CORE is not set +CONFIG_VIDEO_MEDIA=y + +# +# Multimedia drivers +# +# CONFIG_MEDIA_ATTACH is not set +CONFIG_MEDIA_TUNER=y +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_MEDIA_TUNER_SIMPLE=y +CONFIG_MEDIA_TUNER_TDA8290=y +CONFIG_MEDIA_TUNER_TDA9887=y +CONFIG_MEDIA_TUNER_TEA5761=y +CONFIG_MEDIA_TUNER_TEA5767=y +CONFIG_MEDIA_TUNER_MT20XX=y +CONFIG_MEDIA_TUNER_XC2028=y +CONFIG_MEDIA_TUNER_XC5000=y +CONFIG_MEDIA_TUNER_MC44S803=y +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEOBUF_GEN=y +CONFIG_VIDEOBUF_DMA_SG=y +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set + +# +# Encoders/decoders and other helper chips +# + +# +# Audio decoders +# +# CONFIG_VIDEO_TVAUDIO is not set +# CONFIG_VIDEO_TDA7432 is not set +# CONFIG_VIDEO_TDA9840 is not set +# CONFIG_VIDEO_TDA9875 is not set +# CONFIG_VIDEO_TEA6415C is not set +# CONFIG_VIDEO_TEA6420 is not set +# CONFIG_VIDEO_MSP3400 is not set +# CONFIG_VIDEO_CS5345 is not set +# CONFIG_VIDEO_CS53L32A is not set +# CONFIG_VIDEO_M52790 is not set +# CONFIG_VIDEO_TLV320AIC23B is not set +# CONFIG_VIDEO_WM8775 is not set +# CONFIG_VIDEO_WM8739 is not set +# CONFIG_VIDEO_VP27SMPX is not set + +# +# RDS decoders +# +# CONFIG_VIDEO_SAA6588 is not set + +# +# Video decoders +# +# CONFIG_VIDEO_ADV7180 is not set +# CONFIG_VIDEO_BT819 is not set +# CONFIG_VIDEO_BT856 is not set +# CONFIG_VIDEO_BT866 is not set +# CONFIG_VIDEO_KS0127 is not set +# CONFIG_VIDEO_OV7670 is not set +# CONFIG_VIDEO_MT9V011 is not set +# CONFIG_VIDEO_TCM825X is not set +# CONFIG_VIDEO_MT9P012 is not set +# CONFIG_VIDEO_DW9710 is not set +# CONFIG_VIDEO_OV3640 is not set +CONFIG_VIDEO_IMX046=y +CONFIG_VIDEO_LV8093=y +# CONFIG_VIDEO_SAA7110 is not set +# CONFIG_VIDEO_SAA711X is not set +# CONFIG_VIDEO_SAA717X is not set +# CONFIG_VIDEO_TVP514X is not set +# CONFIG_VIDEO_TVP5150 is not set +# CONFIG_VIDEO_VPX3220 is not set + +# +# Video and audio decoders +# +# CONFIG_VIDEO_CX25840 is not set + +# +# MPEG video encoders +# +# CONFIG_VIDEO_CX2341X is not set + +# +# Video encoders +# +# CONFIG_VIDEO_SAA7127 is not set +# CONFIG_VIDEO_SAA7185 is not set +# CONFIG_VIDEO_ADV7170 is not set +# CONFIG_VIDEO_ADV7175 is not set +# CONFIG_VIDEO_THS7303 is not set +# CONFIG_VIDEO_ADV7343 is not set + +# +# Video improvement chips +# +# CONFIG_VIDEO_UPD64031A is not set +# CONFIG_VIDEO_UPD64083 is not set +# CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +CONFIG_VIDEO_OMAP3_OUT=y +CONFIG_VIDEO_OMAP3=y +CONFIG_VIDEO_OMAP34XX_ISP_PREVIEWER=y +CONFIG_VIDEO_OMAP34XX_ISP_RESIZER=y +# CONFIG_SOC_CAMERA is not set +CONFIG_V4L_USB_DRIVERS=y +# CONFIG_USB_VIDEO_CLASS is not set +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +# CONFIG_USB_M5602 is not set +# CONFIG_USB_STV06XX is not set +# CONFIG_USB_GL860 is not set +# CONFIG_USB_GSPCA_CONEX is not set +# CONFIG_USB_GSPCA_ETOMS is not set +# CONFIG_USB_GSPCA_FINEPIX is not set +# CONFIG_USB_GSPCA_JEILINJ is not set +# CONFIG_USB_GSPCA_MARS is not set +# CONFIG_USB_GSPCA_MR97310A is not set +# CONFIG_USB_GSPCA_OV519 is not set +# CONFIG_USB_GSPCA_OV534 is not set +# CONFIG_USB_GSPCA_PAC207 is not set +# CONFIG_USB_GSPCA_PAC7311 is not set +# CONFIG_USB_GSPCA_SN9C20X is not set +# CONFIG_USB_GSPCA_SONIXB is not set +# CONFIG_USB_GSPCA_SONIXJ is not set +# CONFIG_USB_GSPCA_SPCA500 is not set +# CONFIG_USB_GSPCA_SPCA501 is not set +# CONFIG_USB_GSPCA_SPCA505 is not set +# CONFIG_USB_GSPCA_SPCA506 is not set +# CONFIG_USB_GSPCA_SPCA508 is not set +# CONFIG_USB_GSPCA_SPCA561 is not set +# CONFIG_USB_GSPCA_SQ905 is not set +# CONFIG_USB_GSPCA_SQ905C is not set +# CONFIG_USB_GSPCA_STK014 is not set +# CONFIG_USB_GSPCA_SUNPLUS is not set +# CONFIG_USB_GSPCA_T613 is not set +# CONFIG_USB_GSPCA_TV8532 is not set +# CONFIG_USB_GSPCA_VC032X is not set +# CONFIG_USB_GSPCA_ZC3XX is not set +# CONFIG_VIDEO_PVRUSB2 is not set +# CONFIG_VIDEO_HDPVR is not set +# CONFIG_VIDEO_EM28XX is not set +# CONFIG_VIDEO_CX231XX is not set +# CONFIG_VIDEO_USBVISION is not set +# CONFIG_USB_ET61X251 is not set +# CONFIG_USB_SN9C102 is not set +# CONFIG_USB_ZC0301 is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +# CONFIG_USB_ZR364XX is not set +# CONFIG_USB_STKWEBCAM is not set +# CONFIG_USB_S2255 is not set +CONFIG_RADIO_ADAPTERS=y +# CONFIG_I2C_SI4713 is not set +# CONFIG_RADIO_SI4713 is not set +# CONFIG_USB_DSBR is not set +# CONFIG_RADIO_SI470X is not set +# CONFIG_USB_MR800 is not set +# CONFIG_RADIO_TEA5764 is not set +CONFIG_DAB=y +# CONFIG_USB_DABUSB is not set + +# +# Graphics support +# +# CONFIG_VGASTATE is not set +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_UVESA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_OMAP2_VRAM=y +CONFIG_OMAP2_VRFB=y +CONFIG_OMAP2_DSS=y +CONFIG_OMAP2_VRAM_SIZE=16 +CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y +# CONFIG_OMAP2_DSS_RFBI is not set +CONFIG_OMAP2_DSS_VENC=y +# CONFIG_OMAP2_DSS_SDI is not set +# CONFIG_OMAP2_DSS_DSI is not set +# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set +CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 +CONFIG_FB_OMAP2=y +CONFIG_FB_OMAP2_DEBUG_SUPPORT=y +CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE=y +CONFIG_FB_OMAP2_NUM_FBS=3 + +# +# OMAP2/3 Display Device Drivers +# +CONFIG_PANEL_GENERIC=y +# CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C is not set +# CONFIG_PANEL_SHARP_LS037V7DW01 is not set +# CONFIG_PANEL_SHARP_LQ043T1DG01 is not set +CONFIG_PANEL_NEC_NL8048HL11_01B=y +# CONFIG_SIL9022 is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=y +# CONFIG_LCD_LMS283GF05 is not set +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI9320 is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set +CONFIG_LCD_PLATFORM=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_GENERIC=y + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE is not set +CONFIG_FONT_8x16=y +# CONFIG_LOGO is not set +CONFIG_SOUND=y +# CONFIG_SOUND_OSS_CORE is not set +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +# CONFIG_SND_SEQUENCER is not set +# CONFIG_SND_MIXER_OSS is not set +# CONFIG_SND_PCM_OSS is not set +# CONFIG_SND_HRTIMER is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +# CONFIG_SND_RAWMIDI_SEQ is not set +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +CONFIG_SND_ARM=y +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +# CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_CAIAQ is not set +CONFIG_SND_SOC=y +CONFIG_SND_OMAP_SOC=y +CONFIG_SND_OMAP_SOC_MCBSP=y +CONFIG_SND_OMAP_SOC_ZOOM2=y +CONFIG_SND_SOC_I2C_AND_SPI=y +# CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_TWL4030=y +# CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# Special HID drivers +# +# CONFIG_HID_A4TECH is not set +# CONFIG_HID_APPLE is not set +# CONFIG_HID_BELKIN is not set +# CONFIG_HID_CHERRY is not set +# CONFIG_HID_CHICONY is not set +# CONFIG_HID_CYPRESS is not set +# CONFIG_HID_DRAGONRISE is not set +# CONFIG_HID_EZKEY is not set +# CONFIG_HID_KYE is not set +# CONFIG_HID_GYRATION is not set +# CONFIG_HID_TWINHAN is not set +# CONFIG_HID_KENSINGTON is not set +# CONFIG_HID_LOGITECH is not set +# CONFIG_HID_MICROSOFT is not set +# CONFIG_HID_MONTEREY is not set +# CONFIG_HID_NTRIG is not set +# CONFIG_HID_PANTHERLORD is not set +# CONFIG_HID_PETALYNX is not set +# CONFIG_HID_SAMSUNG is not set +# CONFIG_HID_SONY is not set +# CONFIG_HID_SUNPLUS is not set +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_ZEROPLUS is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_USB=y +CONFIG_USB_DEBUG=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +# CONFIG_USB_DEVICEFS is not set +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +CONFIG_USB_SUSPEND=y +CONFIG_USB_OTG=y +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_MON=y +# CONFIG_USB_WUSB is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_ISP1362_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_HWA_HCD is not set +CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_MUSB_SOC=y + +# +# OMAP 343x high speed USB support +# +# CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MUSB_PERIPHERAL is not set +CONFIG_USB_MUSB_OTG=y +CONFIG_USB_GADGET_MUSB_HDRC=y +CONFIG_USB_MUSB_HDRC_HCD=y +# CONFIG_MUSB_PIO_ONLY is not set +CONFIG_USB_INVENTRA_DMA=y +# CONFIG_USB_TI_CPPI_DMA is not set +CONFIG_USB_MUSB_DEBUG=y + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_BERRY_CHARGE=m +CONFIG_USB_LED=m +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +CONFIG_USB_SISUSBVGA=m +CONFIG_USB_SISUSBVGA_CON=y +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_VST is not set +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DEBUG=y +CONFIG_USB_GADGET_DEBUG_FILES=y +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=20 +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_ATMEL_USBA is not set +# 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_R8A66597 is not set +# CONFIG_USB_GADGET_PXA27X is not set +# CONFIG_USB_GADGET_S3C_HSOTG is not set +# CONFIG_USB_GADGET_IMX is not set +# CONFIG_USB_GADGET_S3C2410 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_LANGWELL is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +CONFIG_USB_ZERO=m +# CONFIG_USB_ZERO_HNPTEST is not set +CONFIG_USB_AUDIO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_ETH_EEM=y +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_FILE_STORAGE_TEST=y +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m +CONFIG_USB_G_PRINTER=m +CONFIG_USB_CDC_COMPOSITE=m + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_ISP1301_OMAP is not set +CONFIG_TWL4030_USB=y +# CONFIG_NOP_USB_XCEIV is not set +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_UNSAFE_RESUME=y + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +# CONFIG_MMC_OMAP is not set +CONFIG_MMC_OMAP_HS=y +# CONFIG_MMC_AT91 is not set +# CONFIG_MMC_ATMELMCI is not set +# CONFIG_MMC_SPI is not set +# CONFIG_MEMSTICK is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +# CONFIG_LEDS_PCA9532 is not set +# CONFIG_LEDS_GPIO is not set +# CONFIG_LEDS_LP3944 is not set +# CONFIG_LEDS_PCA955X is not set +# CONFIG_LEDS_DAC124S085 is not set +# CONFIG_LEDS_BD2802 is not set + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_GPIO=m +# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set + +# +# iptables trigger is under Netfilter config (LED target) +# +# 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 + +# +# RTC interfaces +# +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 + +# +# I2C RTC drivers +# +# 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_TWL4030=y +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set + +# +# 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 +# CONFIG_RTC_DRV_PCF2123 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# 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_DMADEVICES is not set +# CONFIG_AUXDISPLAY is not set +# CONFIG_UIO is not set + +# +# TI VLYNQ +# +# CONFIG_STAGING is not set +CONFIG_MPU_BRIDGE=y +CONFIG_BRIDGE_MEMPOOL_SIZE=0x600000 +# CONFIG_BRIDGE_DEBUG is not set + +# +# Bridge Hacking +# +# CONFIG_BRIDGE_CHECK_ALIGN_128 is not set + +# +# Bridge Notifications +# +# CONFIG_BRIDGE_NTFY_PWRERR is not set + +# +# CBUS support +# +# CONFIG_CBUS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +# CONFIG_EXT3_FS_XATTR is not set +# CONFIG_EXT4_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +CONFIG_FS_POSIX_ACL=y +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +# CONFIG_QUOTA_NETLINK_INTERFACE is not set +CONFIG_PRINT_QUOTA_WARNING=y +CONFIG_QUOTA_TREE=y +# CONFIG_QFMT_V1 is not set +CONFIG_QFMT_V2=y +CONFIG_QUOTACTL=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=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_CONFIGFS_FS is not set +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_SQUASHFS is not set +# 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 +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y +# CONFIG_NFSD is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# 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_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set +# CONFIG_DLM is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +# CONFIG_STRIP_ASM_SYMS is not set +# 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_DETECT_SOFTLOCKUP=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y +CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# 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 is not set +CONFIG_DEBUG_INFO=y +# 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_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_PAGE_POISONING is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +# CONFIG_FUNCTION_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_ENABLE_DEFAULT_TRACERS is not set +# CONFIG_BOOT_TRACER is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +# CONFIG_STACK_TRACER is not set +# CONFIG_KMEMTRACE is not set +# CONFIG_WORKQUEUE_TRACER is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_ARM_UNWIND=y +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_ERRORS is not set +# CONFIG_DEBUG_STACK_USAGE is not set +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC 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_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +CONFIG_CRYPTO_WORKQUEUE=y +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +CONFIG_CRYPTO_ECB=m +# CONFIG_CRYPTO_LRW is not set +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=y +# CONFIG_CRYPTO_GHASH is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +# 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 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_ANUBIS is not set +# 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_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_ZLIB is not set +# CONFIG_CRYPTO_LZO is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_HW=y +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_CRC_CCITT=y +# CONFIG_CRC16 is not set +CONFIG_CRC_T10DIF=y +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +CONFIG_LIBCRC32C=y +CONFIG_ZLIB_INFLATE=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y diff --git a/recipes/linux/linux-omap-zoomsync_2.6.31.bb b/recipes/linux/linux-omap-zoomsync_2.6.31.bb index 0dea2bfc73..6f075f2380 100644 --- a/recipes/linux/linux-omap-zoomsync_2.6.31.bb +++ b/recipes/linux/linux-omap-zoomsync_2.6.31.bb @@ -26,3 +26,6 @@ SRC_URI_append = " \ S = "${WORKDIR}/git" +PACKAGES =+ "omap-dss-doc" +FILES_omap-dss-doc = "/boot/DSS" + diff --git a/recipes/linux/linux-omap-zoomsync_2.6.32.bb b/recipes/linux/linux-omap-zoomsync_2.6.32.bb new file mode 100644 index 0000000000..f9aff13258 --- /dev/null +++ b/recipes/linux/linux-omap-zoomsync_2.6.32.bb @@ -0,0 +1,34 @@ +require linux.inc + +DESCRIPTION = "Linux kernel for OMAP processors" +KERNEL_IMAGETYPE = "uImage" + +FILESPATHPKG_prepend = "${PN}-2.6.32:" + +COMPATIBLE_MACHINE = "omapzoom2" + +DEFAULT_PREFERENCE = "-1" +#DEFAULT_PREFERENCE_omapzoom2 = "1" + +LOBRANCH?= "master" + +SRCREV = "69eb2b26cc8b4d0a0db963a100c02d1acbfd90eb" +OEV = "oe1" +PE = "1" + +# The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc +PV = "2.6.31+2.6.32-rc7-${OEV}" +PR_append = "+gitr${SRCREV}" + +SRC_URI = "git://dev.omapzoom.org/pub/scm/integration/kernel-omap3.git;branch=${LOBRANCH};protocol=http \ + file://defconfig" + +SRC_URI_append = " \ +" + +S = "${WORKDIR}/git" + +PACKAGES =+ "omap-dss-doc" +FILES_omap-dss-doc = "/boot/DSS" + + -- cgit v1.2.3 From 61f4bbb47788611a9375a36e83ab907dcc945547 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 8 Jan 2010 13:03:41 +0100 Subject: libcanberra 0.17: bump PR --- recipes/pulseaudio/libcanberra_0.17.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pulseaudio/libcanberra_0.17.bb b/recipes/pulseaudio/libcanberra_0.17.bb index def42e6d0a..7453c8deab 100644 --- a/recipes/pulseaudio/libcanberra_0.17.bb +++ b/recipes/pulseaudio/libcanberra_0.17.bb @@ -5,7 +5,7 @@ DEPENDS = "alsa-lib gstreamer gtk+ libtool libvorbis" SECTION = "libs/multimedia" AUTHOR = "Lennart Poettering" HOMEPAGE = "http://0pointer.de/lennart/projects/libcanberra" -PR = "r3" +PR = "r4" inherit autotools_stage vala AUTOTOOLS_STAGE_PKGCONFIG = "1" -- cgit v1.2.3 From bd69ee7dac894fb1f269e16b76ef616ee9ab3106 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 8 Jan 2010 13:23:43 +0100 Subject: linux-omap-zoomsync 2.6.31: enable cpufreq, cpuidle, powertop options and fix XV --- .../linux/linux-omap-zoomsync/omapzoom2/defconfig | 50 ++++++++++++++-------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/recipes/linux/linux-omap-zoomsync/omapzoom2/defconfig b/recipes/linux/linux-omap-zoomsync/omapzoom2/defconfig index 5666bc9785..41a2b1f58e 100755 --- a/recipes/linux/linux-omap-zoomsync/omapzoom2/defconfig +++ b/recipes/linux/linux-omap-zoomsync/omapzoom2/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.31-rc7-omap1 -# Fri Sep 18 11:52:16 2009 +# Fri Jan 8 12:58:46 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -31,14 +31,17 @@ CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set -# CONFIG_TASKSTATS is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y # CONFIG_AUDIT is not set # @@ -284,7 +287,7 @@ CONFIG_PAGE_OFFSET=0xC0000000 # CONFIG_PREEMPT is not set CONFIG_HZ=128 CONFIG_AEABI=y -CONFIG_OABI_COMPAT=y +# CONFIG_OABI_COMPAT is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_HIGHMEM is not set @@ -311,15 +314,31 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/home/user/buildroot ip=192.168.0.2:192.168.0.1:192.168.0.1:255.255.255.0:tgt:eth0:off rw console=ttyS2,115200n8" +CONFIG_CMDLINE=" debug " # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set # # CPU Power Management # -# CONFIG_CPU_FREQ is not set -# CONFIG_CPU_IDLE is not set +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +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=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y # # Floating point emulation @@ -328,9 +347,6 @@ CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/home/user/buildroot ip=192.16 # # At least one emulation must be selected # -CONFIG_FPE_NWFPE=y -# CONFIG_FPE_NWFPE_XP is not set -# CONFIG_FPE_FASTFPE is not set CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_NEON=y @@ -831,6 +847,7 @@ CONFIG_I2C_OMAP=y # CONFIG_PCF8575 is not set # CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_TSL2550 is not set +# CONFIG_TWL4030_MADC is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -1158,7 +1175,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y CONFIG_OMAP2_VRAM=y CONFIG_OMAP2_VRFB=y CONFIG_OMAP2_DSS=y -CONFIG_OMAP2_VRAM_SIZE=4 +CONFIG_OMAP2_VRAM_SIZE=12 CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y # CONFIG_OMAP2_DSS_RFBI is not set CONFIG_OMAP2_DSS_VENC=y @@ -1169,7 +1186,7 @@ CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 CONFIG_FB_OMAP2=y CONFIG_FB_OMAP2_DEBUG_SUPPORT=y # CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE is not set -CONFIG_FB_OMAP2_NUM_FBS=1 +CONFIG_FB_OMAP2_NUM_FBS=3 # # OMAP2/3 Display Device Drivers @@ -1191,10 +1208,7 @@ CONFIG_PANEL_NEC=y # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y # CONFIG_FRAMEBUFFER_CONSOLE is not set -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set CONFIG_SND=y @@ -1718,8 +1732,8 @@ CONFIG_DETECT_HUNG_TASK=y # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_SCHED_DEBUG=y -# CONFIG_SCHEDSTATS is not set -# CONFIG_TIMER_STATS is not set +CONFIG_SCHEDSTATS=y +CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_KMEMLEAK is not set -- cgit v1.2.3 From 26672294a02fb82a6b164a89a2bd3a43ddb7e611 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 8 Jan 2010 13:26:02 +0100 Subject: omap3 machines: bump MACHINE_KERNEL_PR --- conf/machine/include/omap3.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 9ff7b91ad9..dd1188b7c5 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -3,7 +3,7 @@ SOC_FAMILY = "omap3" require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r50" +MACHINE_KERNEL_PR = "r51" KERNEL_IMAGETYPE = "uImage" -- cgit v1.2.3 From ff17a06fbdc21e20953330a91c5cbb7d70ddf554 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 8 Jan 2010 14:22:47 +0100 Subject: e-wm: package illume-home config in ${PN} for the time being --- recipes/e17/e-wm_svn.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb index b4e35b6890..602f78e335 100644 --- a/recipes/e17/e-wm_svn.bb +++ b/recipes/e17/e-wm_svn.bb @@ -3,7 +3,7 @@ DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" SRCNAME = "e" PV = "0.16.999.060+svnr${SRCPV}" -PR = "r9" +PR = "r10" inherit e update-alternatives @@ -125,7 +125,9 @@ FILES_${PN} = "\ ${datadir}/enlightenment/COPYING \ ${datadir}/xsessions/enlightenment.desktop \ ${sysconfdir}/xdg \ + ${datadir}/enlightenment/data/config/illume-home \ " + FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default" FILES_${PN}-config-illume = "${datadir}/enlightenment/data/config/illume" FILES_${PN}-config-minimalist = "${datadir}/enlightenment/data/config/minimalist" -- cgit v1.2.3 From 8e2871088dd22c7131c3818ec6055acedd961779 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Fri, 8 Jan 2010 18:55:18 +0100 Subject: vala: bump to 0.7.9.5 which fixes a regression in type comparison --- conf/checksums.ini | 4 ++++ recipes/vala/vala-native_0.7.9.4.bb | 3 --- recipes/vala/vala-native_0.7.9.5.bb | 3 +++ recipes/vala/vala_0.7.9.4.bb | 2 -- recipes/vala/vala_0.7.9.5.bb | 2 ++ 5 files changed, 9 insertions(+), 5 deletions(-) delete mode 100644 recipes/vala/vala-native_0.7.9.4.bb create mode 100644 recipes/vala/vala-native_0.7.9.5.bb delete mode 100644 recipes/vala/vala_0.7.9.4.bb create mode 100644 recipes/vala/vala_0.7.9.5.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index e34841c44d..1ce93ced4a 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -27402,6 +27402,10 @@ sha256=a074f50cf1ee3bb4118c2639ad600baa789f5bfe35d1e6f3377179ab02b52af8 md5=036faac08ab0898811e6bb92b5fba8de sha256=debefbb3ea7ae8318f6f5a064e593ecd1d93ba6c5c86c14019800f724c46690e +[http://www.freesmartphone.org/sources/vala-0.7.9.5.tar.bz2] +md5=147b5b9c37d4e2d814f582d6cf78c96a +sha256=e1d6e89eb8689fb3422502a9020a39fff0a5e6ddb3eb47eed9ac9a00636e06b0 + [http://www.freesmartphone.org/sources/vala-0.7.9.tar.bz2] md5=f2f8b2914361db599fd6392ec27f7042 sha256=a71d59cfed750ff402fece5e7d4b656caf3377d5a6bfe5339894f1b13769d58d diff --git a/recipes/vala/vala-native_0.7.9.4.bb b/recipes/vala/vala-native_0.7.9.4.bb deleted file mode 100644 index d6c239f7bf..0000000000 --- a/recipes/vala/vala-native_0.7.9.4.bb +++ /dev/null @@ -1,3 +0,0 @@ -require vala_${PV}.bb -inherit native -DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala-native_0.7.9.5.bb b/recipes/vala/vala-native_0.7.9.5.bb new file mode 100644 index 0000000000..d6c239f7bf --- /dev/null +++ b/recipes/vala/vala-native_0.7.9.5.bb @@ -0,0 +1,3 @@ +require vala_${PV}.bb +inherit native +DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala_0.7.9.4.bb b/recipes/vala/vala_0.7.9.4.bb deleted file mode 100644 index a5b1958f2c..0000000000 --- a/recipes/vala/vala_0.7.9.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -require vala.inc -PR = "${INC_PR}.0" diff --git a/recipes/vala/vala_0.7.9.5.bb b/recipes/vala/vala_0.7.9.5.bb new file mode 100644 index 0000000000..a5b1958f2c --- /dev/null +++ b/recipes/vala/vala_0.7.9.5.bb @@ -0,0 +1,2 @@ +require vala.inc +PR = "${INC_PR}.0" -- cgit v1.2.3 From 0f5fd96b66e2551d9599726e3d26f51fe93471c2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 6 Jan 2010 22:25:00 +0100 Subject: shr.conf: switch to release DISTRO_TYPE Signed-off-by: Martin Jansa --- conf/distro/shr.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index b99c895dc2..74526d0296 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -25,8 +25,8 @@ DISTRO_NAME = "shr" DISTRO_VERSION = "-${DATE}" DISTRO_REVISION = "2" DISTRO_PR = ".4" -#DISTRO_TYPE = "release" -DISTRO_TYPE = "debug" +DISTRO_TYPE = "release" +#DISTRO_TYPE = "debug" DISTRO = "shr" DISTRO_SSH_DAEMON = "openssh" -- cgit v1.2.3 From 1f191e529ec4f2eae846ce727b71837951c762a0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 7 Jan 2010 16:25:05 +0100 Subject: gpe-icons: use u-a and postinst merger for gpe-icons only for SHR Signed-off-by: Martin Jansa --- recipes/gpe-icons/gpe-icons.inc | 8 +++++--- recipes/gpe-icons/gpe-icons_0.25.bb | 11 +++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/recipes/gpe-icons/gpe-icons.inc b/recipes/gpe-icons/gpe-icons.inc index 0c23814b41..27adffa8b8 100644 --- a/recipes/gpe-icons/gpe-icons.inc +++ b/recipes/gpe-icons/gpe-icons.inc @@ -1,16 +1,18 @@ SECTION = "gpe" RDEPENDS += "gdk-pixbuf-loader-png" -inherit update-alternatives +INHERIT = "gpe" +INHERIT_shr = "update-alternatives" +inherit ${INHERIT} -INC_PR = "r3" +INC_PR = "r4" ALTERNATIVE_NAME = "gpe-pixmaps" ALTERNATIVE_LINK = "${datadir}/gpe/pixmaps" ALTERNATIVE_PATH = "${datadir}/gpe/pixmaps.${PN}" ALTERNATIVE_PRIORITY ?= 1 -pkg_postinst() { +pkg_postinst_shr() { if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!" echo "warn: It will be replaced with link managed by update-alternatives" diff --git a/recipes/gpe-icons/gpe-icons_0.25.bb b/recipes/gpe-icons/gpe-icons_0.25.bb index 6276e9510b..7070e12c2b 100644 --- a/recipes/gpe-icons/gpe-icons_0.25.bb +++ b/recipes/gpe-icons/gpe-icons_0.25.bb @@ -4,12 +4,15 @@ SECTION = "gpe" RDEPENDS = "gdk-pixbuf-loader-png" - -inherit gpe - -PR = "r1" +PR = "${INC_PR}.0" #only icons present in the package PACKAGE_ARCH = "all" FILES_${PN} = "${datadir}/gpe" +#Only SHR is using u-a for gpe-icons +do_configure_prepend_shr() { + sed -i "s| \$(DESTDIR)\$(PREFIX)/share/gpe/pixmaps/| \$(DESTDIR)\$(PREFIX)/share/gpe/pixmaps.${PN}/|g" Makefile +} + +require gpe-icons.inc -- cgit v1.2.3 From ca36362ebdf04b4afc95ff6b320f9bcf4628ef9f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 8 Jan 2010 11:12:45 +0100 Subject: shr-theme: bump srcrev for navitD icon Signed-off-by: Martin Jansa --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 9283a3ad9d..34ce856a8e 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -303,7 +303,7 @@ SRCREV_pn-shr-splash-theme-logo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-shr-splash-theme-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-shr-splash-theme-simple ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-shr-splash-theme-tux ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" -SRCREV_pn-shr-theme ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" +SRCREV_pn-shr-theme ?= "730da87ad75c814c16c856ca138605d985b6efdb" SRCREV_pn-shr-theme-gtk-e17lookalike ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-shr-today ?= "7b69649a9df0e85f0c0f7985fd1d93543c3b11e2" SRCREV_pn-shr-wizard ?= "24450cba257e7057045ad576530f158a03bd0f8b" -- cgit v1.2.3 From b24aa1e1916b828d683ac588588aa03a986501db Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 8 Jan 2010 12:56:59 +0100 Subject: linux-openmoko-2.6.32: update to 2.6.32.3 Signed-off-by: Martin Jansa --- recipes/linux/linux-openmoko-2.6.32_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/linux/linux-openmoko-2.6.32_git.bb b/recipes/linux/linux-openmoko-2.6.32_git.bb index 63b049695a..30c124b070 100644 --- a/recipes/linux/linux-openmoko-2.6.32_git.bb +++ b/recipes/linux/linux-openmoko-2.6.32_git.bb @@ -3,7 +3,7 @@ require linux-openmoko.inc DESCRIPTION_${PN} = "Linux ${KERNEL_RELEASE} kernel for the Openmoko Neo GSM Smartphones" -KERNEL_RELEASE="2.6.32" +KERNEL_RELEASE="2.6.32.3" OEV = "oe1" PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}" @@ -12,7 +12,7 @@ PR = "r4" SRC_URI = "\ git://git.openmoko.org/git/kernel.git;protocol=git;branch=om-gta02-2.6.32 \ # latest stable patch for ubi fix 943e167cb3e8fb191894bde8a4a75db78531a7c8 - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.2.bz2;patch=1;name=stablepatch \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1;name=stablepatch \ file://defconfig \ # build fix file://0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch;patch=1 \ @@ -26,8 +26,8 @@ SRC_URI = "\ file://0002-glamo-drm-select-DRM_KMS_HELPER-for-crtc-functions.patch;patch=1 \ " -SRC_URI[stablepatch.md5sum] = "924b7aa0fcd6e54c12ecc9b3c3082f59" -SRC_URI[stablepatch.sha256sum] = "d207f4217c4b3fef9c5a19620b6ca90dbd9b9583ed9c686b5636eec973a7cc60" +SRC_URI[stablepatch.md5sum] = "6bd3c5fea1e88bb4d0948ec3688bd8f6" +SRC_URI[stablepatch.sha256sum] = "e7526a7ae7210bc7c4f4837e9d8a666f9b126d59bee16015c41c5850d29c841f" S = "${WORKDIR}/git" -- cgit v1.2.3 From f0ff8d706ce2012b22f5c71c6910a399ddfbbb9f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 8 Jan 2010 20:57:43 +0100 Subject: gpe-icons.inc: readd gpe inherit for shr --- recipes/gpe-icons/gpe-icons.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/gpe-icons/gpe-icons.inc b/recipes/gpe-icons/gpe-icons.inc index 27adffa8b8..18dd39bd04 100644 --- a/recipes/gpe-icons/gpe-icons.inc +++ b/recipes/gpe-icons/gpe-icons.inc @@ -2,7 +2,7 @@ SECTION = "gpe" RDEPENDS += "gdk-pixbuf-loader-png" INHERIT = "gpe" -INHERIT_shr = "update-alternatives" +INHERIT_shr = "gpe update-alternatives" inherit ${INHERIT} INC_PR = "r4" -- cgit v1.2.3 From 68be910ff169e8095fe2f1b3270bd89323a064af Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 8 Jan 2010 21:27:37 +0100 Subject: u-boot git: update beagleboard uboot for rev C4 --- recipes/u-boot/u-boot-git/beagleboard/720MHz.patch | 262 +++++++++ .../u-boot/u-boot-git/beagleboard/armv7-a.patch | 11 - .../u-boot-git/beagleboard/beagle-600MHz.diff | 21 - recipes/u-boot/u-boot-git/beagleboard/dss.patch | 603 +++++++++++++++++++++ recipes/u-boot/u-boot-git/beagleboard/i2c.patch | 141 +++++ recipes/u-boot/u-boot-git/beagleboard/mru-256.diff | 192 ------- recipes/u-boot/u-boot-git/beagleboard/name.patch | 14 - .../beagleboard/revision-detection.patch | 241 ++++++++ recipes/u-boot/u-boot_git.bb | 9 +- 9 files changed, 1254 insertions(+), 240 deletions(-) create mode 100644 recipes/u-boot/u-boot-git/beagleboard/720MHz.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/armv7-a.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/beagle-600MHz.diff create mode 100644 recipes/u-boot/u-boot-git/beagleboard/dss.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/i2c.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/mru-256.diff delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/name.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/revision-detection.patch diff --git a/recipes/u-boot/u-boot-git/beagleboard/720MHz.patch b/recipes/u-boot/u-boot-git/beagleboard/720MHz.patch new file mode 100644 index 0000000000..5fe56f37a4 --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/720MHz.patch @@ -0,0 +1,262 @@ +Delivered-To: koen@beagleboard.org +Received: by 10.216.36.75 with SMTP id v53cs218072wea; + Fri, 8 Jan 2010 07:40:21 -0800 (PST) +Received: by 10.142.4.39 with SMTP id 39mr2584681wfd.128.1262965220278; + Fri, 08 Jan 2010 07:40:20 -0800 (PST) +Return-Path: <33FFHSwYPC8Aqngyoshkgmrkhugxj.uxmhkgmrkhugxjmuumrkmxu0vy.ius@listserv.bounces.google.com> +Received: from mail-pw0-f72.google.com (mail-pw0-f72.google.com [209.85.160.72]) + by mx.google.com with ESMTP id 38si23195897pzk.46.2010.01.08.07.40.18; + Fri, 08 Jan 2010 07:40:19 -0800 (PST) +Received-SPF: pass (google.com: domain of 33FFHSwYPC8Aqngyoshkgmrkhugxj.uxmhkgmrkhugxjmuumrkmxu0vy.ius@listserv.bounces.google.com designates 209.85.160.72 as permitted sender) client-ip=209.85.160.72; +Authentication-Results: mx.google.com; spf=pass (google.com: domain of 33FFHSwYPC8Aqngyoshkgmrkhugxj.uxmhkgmrkhugxjmuumrkmxu0vy.ius@listserv.bounces.google.com designates 209.85.160.72 as permitted sender) smtp.mail=33FFHSwYPC8Aqngyoshkgmrkhugxj.uxmhkgmrkhugxjmuumrkmxu0vy.ius@listserv.bounces.google.com; dkim=pass (test mode) header.i=@googlegroups.com +Received: by pwj4 with SMTP id 4sf2565630pwj.11 + for ; Fri, 08 Jan 2010 07:40:18 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=googlegroups.com; s=beta; + h=domainkey-signature:received:x-beenthere:received:received:received + :received:received-spf:received:mime-version:received:date + :message-id:subject:from:to:x-original-authentication-results + :x-original-sender:reply-to:precedence:mailing-list:list-id + :list-post:list-help:list-archive:x-thread-url:x-message-url:sender + :list-unsubscribe:list-subscribe:content-type; + bh=sLkJYeKXFIX8TOTxLWasbW6XSWbNbihsEqHqajWruOU=; + b=hNYYuHunIzWspBNr+rsCpj+cl3TfrJP/qRi2OR8S8fvW1ATmUGwE3UcFxBx/cz4C47 + rPcDSOVMOKJn2ybeb7z12kDUV7FLPbzI26BjmBUXoLC4yYdCeiwS+pR/gCEP/CZsVNam + 0/sgZd6Zfnui2nrHnqHFA/eBwvBmNr8njjhzc= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=googlegroups.com; s=beta; + h=x-beenthere:received-spf:mime-version:date:message-id:subject:from + :to:x-original-authentication-results:x-original-sender:reply-to + :precedence:mailing-list:list-id:list-post:list-help:list-archive + :x-thread-url:x-message-url:sender:list-unsubscribe:list-subscribe + :content-type; + b=kvIhKL3OOVUlwb+XfiZuzkLNRQqtf4QLC8FZStrd2J1zfvTSjTuxtFrU2bqN6OVn+6 + s9CW3qnGQKNfIuBNUfuQirfG7O/QkdVxGx8nXYPwcm1xL9mJa70CGUoNA4gnwZSFXEmA + v3N+BsCQs8InO9VHQxTmTP1pW4DH9HIPqIjFs= +Received: by 10.115.67.15 with SMTP id u15mr3692522wak.15.1262965212711; + Fri, 08 Jan 2010 07:40:12 -0800 (PST) +X-BeenThere: beagleboard@googlegroups.com +Received: by 10.114.19.19 with SMTP id 19ls485387was.0.p; Fri, 08 Jan 2010 + 07:40:07 -0800 (PST) +Received: by 10.114.3.19 with SMTP id 19mr7029424wac.17.1262965207675; + Fri, 08 Jan 2010 07:40:07 -0800 (PST) +Received: by 10.114.3.19 with SMTP id 19mr7029423wac.17.1262965207655; + Fri, 08 Jan 2010 07:40:07 -0800 (PST) +Return-Path: +Received: from mail-px0-f196.google.com (mail-px0-f196.google.com [209.85.216.196]) + by gmr-mx.google.com with ESMTP id 23si8245940pxi.8.2010.01.08.07.40.07; + Fri, 08 Jan 2010 07:40:07 -0800 (PST) +Received-SPF: neutral (google.com: 209.85.216.196 is neither permitted nor denied by best guess record for domain of khasim@beagleboard.org) client-ip=209.85.216.196; +Received: by pxi34 with SMTP id 34so11355653pxi.8 + for ; Fri, 08 Jan 2010 07:40:07 -0800 (PST) +MIME-Version: 1.0 +Received: by 10.142.75.10 with SMTP id x10mr1272361wfa.153.1262965205948; Fri, + 08 Jan 2010 07:40:05 -0800 (PST) +Date: Fri, 8 Jan 2010 21:10:05 +0530 +Message-ID: +Subject: [beagleboard] TI:OMAP: [PATCH 3/4] Support 720Mhz configuration for + OMAP35xx +From: Khasim Syed Mohammed +To: u-boot@lists.denx.de, beagleboard@googlegroups.com +X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: + 209.85.216.196 is neither permitted nor denied by best guess record for + domain of khasim@beagleboard.org) smtp.mail=khasim@beagleboard.org +X-Original-Sender: khasim@beagleboard.org +Reply-To: beagleboard@googlegroups.com +Precedence: list +Mailing-list: list beagleboard@googlegroups.com; contact beagleboard+owners@googlegroups.com +List-ID: +List-Post: , + +List-Help: , +List-Archive: +X-Thread-Url: http://groups.google.com/group/beagleboard/t/1d8e4b923e126fcb +X-Message-Url: http://groups.google.com/group/beagleboard/msg/b8825bed3084009a +Sender: beagleboard@googlegroups.com +List-Unsubscribe: , + +List-Subscribe: , + +Content-Type: multipart/mixed; boundary=001636b2ac6d98250e047ca900e4 + +--001636b2ac6d98250e047ca900e4 +Content-Type: text/plain; charset=ISO-8859-1 + +From bba669562fa208d12f4c7cd8188446e8576cd6ee Mon Sep 17 00:00:00 2001 +From: Syed Mohammed Khasim +Date: Fri, 8 Jan 2010 20:34:37 +0530 +Subject: [PATCH] Support 720Mhz configuration for OMAP35xx + +Adds a new API "twl4030_pmrecv_vsel_cfg" to select voltage and group +Adds support for 720Mhz in clock.c +Board file modified to use these new APIs and boot at 720Mhz + +Signed-off-by: Syed Mohammed Khasim +--- + board/ti/beagle/beagle.c | 20 ++++++++++++++++++-- + cpu/arm_cortexa8/omap3/clock.c | 21 +++++++++++++++++++++ + drivers/power/twl4030.c | 24 +++++++++++++++--------- + include/twl4030.h | 16 ++++++++++++++++ + 4 files changed, 70 insertions(+), 11 deletions(-) + +diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c +index 0def5a6..7985ee9 100644 +--- a/board/ti/beagle/beagle.c ++++ b/board/ti/beagle/beagle.c +@@ -122,9 +122,27 @@ int misc_init_r(void) + struct gpio *gpio5_base = (struct gpio *)OMAP34XX_GPIO5_BASE; + struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE; + ++ beagle_identify(); ++ + twl4030_power_init(); + twl4030_led_init(); + ++ if (beagle_revision == REVISION_C4) { ++ ++ /* Select TWL4030 VSEL to support 720Mhz */ ++ twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED, ++ VAUX2_VSEL_18, ++ TWL4030_PM_RECEIVER_VAUX2_DEV_GRP, ++ DEV_GRP_P1); ++ ++ twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VDD1_VSEL, ++ VDD1_VSEL_14, ++ TWL4030_PM_RECEIVER_VDD1_DEV_GRP, ++ DEV_GRP_P1); ++ ++ prcm_config_720mhz(); ++ } ++ + /* Configure GPIOs to output */ + writel(~(GPIO23 | GPIO10 | GPIO8 | GPIO2 | GPIO1), &gpio6_base->oe); + writel(~(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 | +@@ -136,8 +154,6 @@ int misc_init_r(void) + writel(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 | + GPIO15 | GPIO14 | GPIO13 | GPIO12, &gpio5_base->setdataout); + +- beagle_identify(); +- + dieid_num_r(); + + return 0; +diff --git a/cpu/arm_cortexa8/omap3/clock.c b/cpu/arm_cortexa8/omap3/clock.c +index 174c453..d67517a 100644 +--- a/cpu/arm_cortexa8/omap3/clock.c ++++ b/cpu/arm_cortexa8/omap3/clock.c +@@ -402,3 +402,24 @@ void per_clocks_enable(void) + + sdelay(1000); + } ++ ++/* ++ * Configure PRCM registers to get 720 Mhz ++ * ++ * NOTE: N value doesn't change, only M gets affected ++ */ ++void prcm_config_720mhz(void) ++{ ++ struct prcm *prcm_base = (struct prcm *)PRCM_BASE; ++ ++ /* Unlock MPU DPLL (slows things down, and needed later) */ ++ sr32(&prcm_base->clken_pll_mpu, 0, 3, PLL_LOW_POWER_BYPASS); ++ wait_on_value(ST_MPU_CLK, 0, &prcm_base->idlest_pll_mpu, LDELAY); ++ ++ /* Set M */ ++ sr32(&prcm_base->clksel1_pll_mpu, 8, 11, 0x2D0); ++ ++ /* lock mode */ ++ sr32(&prcm_base->clken_pll_mpu, 0, 3, PLL_LOCK); ++ wait_on_value(ST_MPU_CLK, 1, &prcm_base->idlest_pll_mpu, LDELAY); ++} +diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c +index eb066cb..d68e515 100644 +--- a/drivers/power/twl4030.c ++++ b/drivers/power/twl4030.c +@@ -59,16 +59,9 @@ void twl4030_power_reset_init(void) + } + } + +- + /* + * Power Init + */ +-#define DEV_GRP_P1 0x20 +-#define VAUX3_VSEL_28 0x03 +-#define DEV_GRP_ALL 0xE0 +-#define VPLL2_VSEL_18 0x05 +-#define VDAC_VSEL_18 0x03 +- + void twl4030_power_init(void) + { + unsigned char byte; +@@ -98,8 +91,6 @@ void twl4030_power_init(void) + TWL4030_PM_RECEIVER_VDAC_DEDICATED); + } + +-#define VMMC1_VSEL_30 0x02 +- + void twl4030_power_mmc_init(void) + { + unsigned char byte; +@@ -113,3 +104,18 @@ void twl4030_power_mmc_init(void) + twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte, + TWL4030_PM_RECEIVER_VMMC1_DEDICATED); + } ++ ++/* ++ * Generic function to select Device Group and Voltage ++ */ ++void twl4030_pmrecv_vsel_cfg(u8 vsel_reg, u8 vsel_val, ++ u8 dev_grp, u8 dev_grp_sel) ++{ ++ /* Select the Device Group */ ++ twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, dev_grp_sel, ++ dev_grp); ++ ++ /* Select the Voltage */ ++ twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, vsel_val, ++ vsel_reg); ++} +diff --git a/include/twl4030.h b/include/twl4030.h +index f260ecb..b96c96c 100644 +--- a/include/twl4030.h ++++ b/include/twl4030.h +@@ -359,6 +359,22 @@ + #define TWL4030_USB_PHY_DPLL_CLK (1 << 0) + + /* ++ * Voltage Selection in PM Receiver Module ++ */ ++#define VAUX2_VSEL_18 0x05 ++#define VDD1_VSEL_14 0x40 ++#define VAUX3_VSEL_28 0x03 ++#define VPLL2_VSEL_18 0x05 ++#define VDAC_VSEL_18 0x03 ++#define VMMC1_VSEL_30 0x02 ++ ++/* ++ * Device Selection ++ */ ++#define DEV_GRP_P1 0x20 ++#define DEV_GRP_ALL 0xE0 ++ ++/* + * Convience functions to read and write from TWL4030 + * + * chip_no is the i2c address, it must be one of the chip addresses +-- +1.5.6.3 + +--001636b2ac6d98250e047ca900e4 +Content-Type: text/plain; charset=ISO-8859-1 + +-- +You received this message because you are subscribed to the Google Groups "Beagle Board" group. +To post to this group, send email to beagleboard@googlegroups.com. +To unsubscribe from this group, send email to beagleboard+unsubscribe@googlegroups.com. +For more options, visit this group at http://groups.google.com/group/beagleboard?hl=en. + + + +--001636b2ac6d98250e047ca900e4-- diff --git a/recipes/u-boot/u-boot-git/beagleboard/armv7-a.patch b/recipes/u-boot/u-boot-git/beagleboard/armv7-a.patch deleted file mode 100644 index 49f8de0879..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/armv7-a.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- u-boot/cpu/omap3/config.mk-orig 2008-05-27 16:46:45.000000000 -0700 -+++ u-boot/cpu/omap3/config.mk 2008-05-29 12:50:49.000000000 -0700 -@@ -23,7 +23,7 @@ - PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \ - -msoft-float - --PLATFORM_CPPFLAGS += -march=armv7a -+PLATFORM_CPPFLAGS += -march=armv7-a - # ========================================================================= - # - # Supply options according to compiler version diff --git a/recipes/u-boot/u-boot-git/beagleboard/beagle-600MHz.diff b/recipes/u-boot/u-boot-git/beagleboard/beagle-600MHz.diff deleted file mode 100644 index fe183ddb77..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/beagle-600MHz.diff +++ /dev/null @@ -1,21 +0,0 @@ -From: Mans Rullgard -Date: Mon, 29 Sep 2008 19:56:45 +0000 (+0100) -Subject: OMAP3: Set MPU clock to 600 MHz -X-Git-Url: http://git.mansr.com/?p=u-boot;a=commitdiff_plain;h=caccdb772c3028a3e3e801fb1554788150752ffc - -OMAP3: Set MPU clock to 600 MHz ---- - -diff --git a/cpu/omap3/lowlevel_init.S b/cpu/omap3/lowlevel_init.S -index 1f9a0e9..f95a65f 100644 ---- a/cpu/omap3/lowlevel_init.S -+++ b/cpu/omap3/lowlevel_init.S -@@ -208,7 +208,7 @@ mpu_dpll_param: - /* ES1 */ - .word 0x17D,0x0C,0x03,0x01 - /* ES2 */ --.word 0x1F4,0x0C,0x03,0x01 -+.word 0x258,0x0C,0x03,0x01 - /* 3410 */ - .word 0x10A,0x0C,0x03,0x01 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/dss.patch b/recipes/u-boot/u-boot-git/beagleboard/dss.patch new file mode 100644 index 0000000000..ddb248d410 --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/dss.patch @@ -0,0 +1,603 @@ +Delivered-To: koen@beagleboard.org +Received: by 10.216.36.75 with SMTP id v53cs218128wea; + Fri, 8 Jan 2010 07:41:11 -0800 (PST) +Received: by 10.142.248.6 with SMTP id v6mr837899wfh.348.1262965269333; + Fri, 08 Jan 2010 07:41:09 -0800 (PST) +Return-Path: <3DVJHSwYPC_EdaTlbfUXTZeXUhTkW.hkZUXTZeXUhTkWZhhZeXZkhnil.Vhf@listserv.bounces.google.com> +Received: from mail-pw0-f72.google.com (mail-pw0-f72.google.com [209.85.160.72]) + by mx.google.com with ESMTP id 27si55059178pzk.111.2010.01.08.07.41.07; + Fri, 08 Jan 2010 07:41:08 -0800 (PST) +Received-SPF: pass (google.com: domain of 3DVJHSwYPC_EdaTlbfUXTZeXUhTkW.hkZUXTZeXUhTkWZhhZeXZkhnil.Vhf@listserv.bounces.google.com designates 209.85.160.72 as permitted sender) client-ip=209.85.160.72; +Authentication-Results: mx.google.com; spf=pass (google.com: domain of 3DVJHSwYPC_EdaTlbfUXTZeXUhTkW.hkZUXTZeXUhTkWZhhZeXZkhnil.Vhf@listserv.bounces.google.com designates 209.85.160.72 as permitted sender) smtp.mail=3DVJHSwYPC_EdaTlbfUXTZeXUhTkW.hkZUXTZeXUhTkWZhhZeXZkhnil.Vhf@listserv.bounces.google.com; dkim=pass (test mode) header.i=@googlegroups.com +Received: by pwj4 with SMTP id 4sf2565752pwj.11 + for ; Fri, 08 Jan 2010 07:41:07 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=googlegroups.com; s=beta; + h=domainkey-signature:received:x-beenthere:received:received:received + :received:received-spf:received:mime-version:received:date + :message-id:subject:from:to:x-original-authentication-results + :x-original-sender:reply-to:precedence:mailing-list:list-id + :list-post:list-help:list-archive:x-thread-url:x-message-url:sender + :list-unsubscribe:list-subscribe:content-type; + bh=Azv3WMaP3GKXHoMJ2/vginhj7wOeX5TlN5X7nCS8wp0=; + b=LF8lteGh2daaC9Ac0TDfXj2fH1Y3NoBdTTBGEU4j3rbZM7CgFz+xRiRAARCMtnUVjG + 3qeMGgb9yhI7dH2fbH6aB70zDtmgUNIbwcaSWKNvbTT8pBlz8Z82KSVpKswYKP89GHi3 + 2hU5QIOaRt7J0SJ0yWh/HKnGmZ4I0Nd01X4DY= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=googlegroups.com; s=beta; + h=x-beenthere:received-spf:mime-version:date:message-id:subject:from + :to:x-original-authentication-results:x-original-sender:reply-to + :precedence:mailing-list:list-id:list-post:list-help:list-archive + :x-thread-url:x-message-url:sender:list-unsubscribe:list-subscribe + :content-type; + b=fZSOB8OsOa3FWGDo3j/ZPvGc8gBJNCnn5HDfoXJ4dn20+E9uPor8pBjLYBT2g4HTQU + p1c+JMUWsCnxuxs4I5gw4HV71a7/l4x/omsEUlo0OkmcetlLiZPp1NVOR7IjW/D+A6iv + 9FV2iRcf1VBNXgTXmqrUwGG8jkfQUfqxSxszI= +Received: by 10.115.39.9 with SMTP id r9mr3707425waj.19.1262965261756; + Fri, 08 Jan 2010 07:41:01 -0800 (PST) +X-BeenThere: beagleboard@googlegroups.com +Received: by 10.115.116.23 with SMTP id t23ls486459wam.1.p; Fri, 08 Jan 2010 + 07:40:57 -0800 (PST) +Received: by 10.114.50.7 with SMTP id x7mr686211wax.10.1262965256947; + Fri, 08 Jan 2010 07:40:56 -0800 (PST) +Received: by 10.114.50.7 with SMTP id x7mr686210wax.10.1262965256891; + Fri, 08 Jan 2010 07:40:56 -0800 (PST) +Return-Path: +Received: from mail-px0-f201.google.com (mail-px0-f201.google.com [209.85.216.201]) + by gmr-mx.google.com with ESMTP id 23si8246086pxi.8.2010.01.08.07.40.56; + Fri, 08 Jan 2010 07:40:56 -0800 (PST) +Received-SPF: neutral (google.com: 209.85.216.201 is neither permitted nor denied by domain of khasim@beagleboard.org) client-ip=209.85.216.201; +Received: by pxi39 with SMTP id 39so14792542pxi.2 + for ; Fri, 08 Jan 2010 07:40:56 -0800 (PST) +MIME-Version: 1.0 +Received: by 10.142.66.15 with SMTP id o15mr4290107wfa.145.1262965256802; Fri, + 08 Jan 2010 07:40:56 -0800 (PST) +Date: Fri, 8 Jan 2010 21:10:56 +0530 +Message-ID: +Subject: [beagleboard] TI:OMAP: [PATCH 4/4] Minimal Display driver for OMAP3 +From: Khasim Syed Mohammed +To: u-boot@lists.denx.de, beagleboard@googlegroups.com +X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: + 209.85.216.201 is neither permitted nor denied by domain of + khasim@beagleboard.org) smtp.mail=khasim@beagleboard.org +X-Original-Sender: khasim@beagleboard.org +Reply-To: beagleboard@googlegroups.com +Precedence: list +Mailing-list: list beagleboard@googlegroups.com; contact beagleboard+owners@googlegroups.com +List-ID: +List-Post: , + +List-Help: , +List-Archive: +X-Thread-Url: http://groups.google.com/group/beagleboard/t/fd7e94fa2f751bb7 +X-Message-Url: http://groups.google.com/group/beagleboard/msg/d61a66a471b5b113 +Sender: beagleboard@googlegroups.com +List-Unsubscribe: , + +List-Subscribe: , + +Content-Type: multipart/mixed; boundary=0016e64cc3d48ed9db047ca903b2 + +--0016e64cc3d48ed9db047ca903b2 +Content-Type: text/plain; charset=ISO-8859-1 + +From 239c47a4180fb4d5b5217f892955524d476916cf Mon Sep 17 00:00:00 2001 +From: Syed Mohammed Khasim +Date: Fri, 8 Jan 2010 21:01:44 +0530 +Subject: [PATCH] Minimal Display driver for OMAP3 + +Supports dynamic configuration of Panel and Video Encoder +Supports Background color on DVID +Supports Color bar on S-Video + +Signed-off-by: Syed Mohammed Khasim +--- + board/ti/beagle/beagle.c | 13 +++ + board/ti/beagle/beagle.h | 73 ++++++++++++++ + drivers/video/Makefile | 1 + + drivers/video/omap3_dss.c | 128 +++++++++++++++++++++++++ + include/asm-arm/arch-omap3/dss.h | 193 ++++++++++++++++++++++++++++++++++++++ + include/configs/omap3_beagle.h | 1 + + 6 files changed, 409 insertions(+), 0 deletions(-) + create mode 100644 drivers/video/omap3_dss.c + create mode 100644 include/asm-arm/arch-omap3/dss.h + +diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c +index 7985ee9..29e47c8 100644 +--- a/board/ti/beagle/beagle.c ++++ b/board/ti/beagle/beagle.c +@@ -114,6 +114,17 @@ void beagle_identify(void) + } + + /* ++ * Configure DSS to display background color on DVID ++ * Configure VENC to display color bar on S-Video ++ */ ++void display_init(void) ++{ ++ omap3_dss_venc_config(&venc_config_std_tv); ++ omap3_dss_panel_config(&dvid_cfg); ++ omap3_dss_set_background_col(DVI_BEAGLE_ORANGE_COL); ++} ++ ++/* + * Routine: misc_init_r + * Description: Configure board specific parts + */ +@@ -122,6 +133,7 @@ int misc_init_r(void) + struct gpio *gpio5_base = (struct gpio *)OMAP34XX_GPIO5_BASE; + struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE; + ++ display_init(); + beagle_identify(); + + twl4030_power_init(); +@@ -154,6 +166,7 @@ int misc_init_r(void) + writel(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 | + GPIO15 | GPIO14 | GPIO13 | GPIO12, &gpio5_base->setdataout); + ++ omap3_dss_enable(); + dieid_num_r(); + + return 0; +diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h +index b1720c9..7f6769f 100644 +--- a/board/ti/beagle/beagle.h ++++ b/board/ti/beagle/beagle.h +@@ -23,6 +23,8 @@ + #ifndef _BEAGLE_H_ + #define _BEAGLE_H_ + ++#include ++ + const omap3_sysinfo sysinfo = { + DDR_STACKED, + "OMAP3 Beagle board", +@@ -385,4 +387,75 @@ const omap3_sysinfo sysinfo = { + MUX_VAL(CP(UART2_RTS), (IDIS | PTD | DIS | M0)) /*UART2_RTS*/\ + MUX_VAL(CP(UART2_TX), (IDIS | PTD | DIS | M0)) /*UART2_TX*/ + ++/* ++ * Display Configuration ++ */ ++ ++#define DVI_BEAGLE_ORANGE_COL 0x00FF8000 ++ ++/* ++ * Configure VENC in DSS for Beagle to generate Color Bar ++ * ++ * Kindly refer to OMAP TRM for definition of these values. ++ */ ++static const struct venc_config venc_config_std_tv = { ++ .status = 0x0000001B, ++ .f_control = 0x00000040, ++ .vidout_ctrl = 0x00000000, ++ .sync_ctrl = 0x00008000, ++ .llen = 0x00008359, ++ .flens = 0x0000020C, ++ .hfltr_ctrl = 0x00000000, ++ .cc_carr_wss_carr = 0x043F2631, ++ .c_phase = 0x00000024, ++ .gain_u = 0x00000130, ++ .gain_v = 0x00000198, ++ .gain_y = 0x000001C0, ++ .black_level = 0x0000006A, ++ .blank_level = 0x0000005C, ++ .x_color = 0x00000000, ++ .m_control = 0x00000001, ++ .bstamp_wss_data = 0x0000003F, ++ .s_carr = 0x21F07C1F, ++ .line21 = 0x00000000, ++ .ln_sel = 0x00000015, ++ .l21__wc_ctl = 0x00001400, ++ .htrigger_vtrigger = 0x00000000, ++ .savid__eavid = 0x069300F4, ++ .flen__fal = 0x0016020C, ++ .lal__phase_reset = 0x00060107, ++ .hs_int_start_stop_x = 0x008D034E, ++ .hs_ext_start_stop_x = 0x000F0359, ++ .vs_int_start_x = 0x01A00000, ++ .vs_int_stop_x__vs_int_start_y = 0x020501A0, ++ .vs_int_stop_y__vs_ext_start_x = 0x01AC0024, ++ .vs_ext_stop_x__vs_ext_start_y = 0x020D01AC, ++ .vs_ext_stop_y = 0x00000006, ++ .avid_start_stop_x = 0x03480079, ++ .avid_start_stop_y = 0x02040024, ++ .fid_int_start_x__fid_int_start_y = 0x0001008A, ++ .fid_int_offset_y__fid_ext_start_x = 0x01AC0106, ++ .fid_ext_start_y__fid_ext_offset_y = 0x01060006, ++ .tvdetgp_int_start_stop_x = 0x00140001, ++ .tvdetgp_int_start_stop_y = 0x00010001, ++ .gen_ctrl = 0x00FF0000, ++ .output_control = 0x0000000D, ++ .dac_b__dac_c = 0x00000000, ++ .height_width = 0x00ef027f ++}; ++ ++/* ++ * Configure Timings for DVI D ++ */ ++static const struct panel_config dvid_cfg = { ++ .timing_h = 0x0ff03f31, /* Horizantal timing */ ++ .timing_v = 0x01400504, /* Vertical timing */ ++ .pol_freq = 0x00007028, /* Pol Freq */ ++ .divisor = 0x00010006, /* 72Mhz Pixel Clock */ ++ .lcd_size = 0x02ff03ff, /* 1024x768 */ ++ .panel_type = 0x01, /* TFT */ ++ .data_lines = 0x03, /* 24 Bit RGB */ ++ .load_mode = 0x02 /* Frame Mode */ ++}; ++ + #endif +diff --git a/drivers/video/Makefile b/drivers/video/Makefile +index bb6b5a0..cb15dc2 100644 +--- a/drivers/video/Makefile ++++ b/drivers/video/Makefile +@@ -37,6 +37,7 @@ COBJS-$(CONFIG_SED156X) += sed156x.o + COBJS-$(CONFIG_VIDEO_SM501) += sm501.o + COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o + COBJS-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o ++COBJS-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o + COBJS-y += videomodes.o + + COBJS := $(COBJS-y) +diff --git a/drivers/video/omap3_dss.c b/drivers/video/omap3_dss.c +new file mode 100644 +index 0000000..2ead7b9 +--- /dev/null ++++ b/drivers/video/omap3_dss.c +@@ -0,0 +1,128 @@ ++/* ++ * (C) Copyright 2010 ++ * Texas Instruments, ++ * Syed Mohammed Khasim ++ * ++ * Referred to Linux DSS driver files for OMAP3 ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation's version 2 of ++ * the License. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#include ++#include ++#include ++ ++/* ++ * VENC configuration ++ */ ++void omap3_dss_venc_config(const struct venc_config *venc_cfg) ++{ ++ dss_write_reg(VENC_STATUS, venc_cfg->status); ++ dss_write_reg(VENC_F_CONTROL, venc_cfg->f_control); ++ dss_write_reg(VENC_VIDOUT_CTRL, venc_cfg->vidout_ctrl); ++ dss_write_reg(VENC_SYNC_CTRL, venc_cfg->sync_ctrl); ++ dss_write_reg(VENC_LLEN, venc_cfg->llen); ++ dss_write_reg(VENC_FLENS, venc_cfg->flens); ++ dss_write_reg(VENC_HFLTR_CTRL, venc_cfg->hfltr_ctrl); ++ dss_write_reg(VENC_CC_CARR_WSS_CARR, venc_cfg->cc_carr_wss_carr); ++ dss_write_reg(VENC_C_PHASE, venc_cfg->c_phase); ++ dss_write_reg(VENC_GAIN_U, venc_cfg->gain_u); ++ dss_write_reg(VENC_GAIN_V, venc_cfg->gain_v); ++ dss_write_reg(VENC_GAIN_Y, venc_cfg->gain_y); ++ dss_write_reg(VENC_BLACK_LEVEL, venc_cfg->black_level); ++ dss_write_reg(VENC_BLANK_LEVEL, venc_cfg->blank_level); ++ dss_write_reg(VENC_X_COLOR, venc_cfg->x_color); ++ dss_write_reg(VENC_M_CONTROL, venc_cfg->m_control); ++ dss_write_reg(VENC_BSTAMP_WSS_DATA, venc_cfg->bstamp_wss_data); ++ dss_write_reg(VENC_S_CARR, venc_cfg->s_carr); ++ dss_write_reg(VENC_LINE21, venc_cfg->line21); ++ dss_write_reg(VENC_LN_SEL, venc_cfg->ln_sel); ++ dss_write_reg(VENC_L21__WC_CTL, venc_cfg->l21__wc_ctl); ++ dss_write_reg(VENC_HTRIGGER_VTRIGGER, venc_cfg->htrigger_vtrigger); ++ dss_write_reg(VENC_SAVID__EAVID, venc_cfg->savid__eavid); ++ dss_write_reg(VENC_FLEN__FAL, venc_cfg->flen__fal); ++ dss_write_reg(VENC_LAL__PHASE_RESET, venc_cfg->lal__phase_reset); ++ dss_write_reg(VENC_HS_INT_START_STOP_X, ++ venc_cfg->hs_int_start_stop_x); ++ dss_write_reg(VENC_HS_EXT_START_STOP_X, ++ venc_cfg->hs_ext_start_stop_x); ++ dss_write_reg(VENC_VS_INT_START_X, venc_cfg->vs_int_start_x); ++ dss_write_reg(VENC_VS_INT_STOP_X__VS_INT_START_Y, ++ venc_cfg->vs_int_stop_x__vs_int_start_y); ++ dss_write_reg(VENC_VS_INT_STOP_Y__VS_EXT_START_X, ++ venc_cfg->vs_int_stop_y__vs_ext_start_x); ++ dss_write_reg(VENC_VS_EXT_STOP_X__VS_EXT_START_Y, ++ venc_cfg->vs_ext_stop_x__vs_ext_start_y); ++ dss_write_reg(VENC_VS_EXT_STOP_Y, venc_cfg->vs_ext_stop_y); ++ dss_write_reg(VENC_AVID_START_STOP_X, venc_cfg->avid_start_stop_x); ++ dss_write_reg(VENC_AVID_START_STOP_Y, venc_cfg->avid_start_stop_y); ++ dss_write_reg(VENC_FID_INT_START_X__FID_INT_START_Y, ++ venc_cfg->fid_int_start_x__fid_int_start_y); ++ dss_write_reg(VENC_FID_INT_OFFSET_Y__FID_EXT_START_X, ++ venc_cfg->fid_int_offset_y__fid_ext_start_x); ++ dss_write_reg(VENC_FID_EXT_START_Y__FID_EXT_OFFSET_Y, ++ venc_cfg->fid_ext_start_y__fid_ext_offset_y); ++ dss_write_reg(VENC_TVDETGP_INT_START_STOP_X, ++ venc_cfg->tvdetgp_int_start_stop_x); ++ dss_write_reg(VENC_TVDETGP_INT_START_STOP_Y, ++ venc_cfg->tvdetgp_int_start_stop_y); ++ dss_write_reg(VENC_GEN_CTRL, venc_cfg->gen_ctrl); ++ dss_write_reg(VENC_OUTPUT_CONTROL, venc_cfg->output_control); ++ dss_write_reg(VENC_DAC_B__DAC_C, venc_cfg->dac_b__dac_c); ++ dss_write_reg(DISPC_SIZE_DIG, venc_cfg->height_width); ++ dss_write_reg(DSS_CONTROL, VENC_DSS_CONFIG); ++} ++ ++/* ++ * Configure Panel Specific parameters ++ */ ++void omap3_dss_panel_config(const struct panel_config *panel_cfg) ++{ ++ dss_write_reg(DISPC_TIMING_H, panel_cfg->timing_h); ++ dss_write_reg(DISPC_TIMING_V, panel_cfg->timing_v); ++ dss_write_reg(DISPC_POL_FREQ, panel_cfg->pol_freq); ++ dss_write_reg(DISPC_DIVISOR, panel_cfg->divisor); ++ dss_write_reg(DISPC_SIZE_LCD, panel_cfg->lcd_size); ++ dss_write_reg(DISPC_CONFIG, ++ (panel_cfg->load_mode << FRAME_MODE_OFFSET)); ++ dss_write_reg(DISPC_CONTROL, ++ ((panel_cfg->panel_type << TFTSTN_OFFSET) | ++ (panel_cfg->data_lines << DATALINES_OFFSET))); ++} ++ ++/* ++ * Enable LCD and DIGITAL OUT in DSS ++ */ ++void omap3_dss_enable(void) ++{ ++ u32 l = 0; ++ ++ l = dss_read_reg(DISPC_CONTROL); ++ l |= DISPC_ENABLE; ++ ++ dss_write_reg(DISPC_CONTROL, l); ++} ++ ++/* ++ * Set Background Color in DISPC ++ */ ++void omap3_dss_set_background_col(u32 color) ++{ ++ dss_write_reg(DISPC_DEFAULT_COLOR0, color); ++} +diff --git a/include/asm-arm/arch-omap3/dss.h b/include/asm-arm/arch-omap3/dss.h +new file mode 100644 +index 0000000..08c7d8d +--- /dev/null ++++ b/include/asm-arm/arch-omap3/dss.h +@@ -0,0 +1,193 @@ ++/* ++ * (C) Copyright 2010 ++ * Texas Instruments, ++ * Syed Mohammed Khasim ++ * ++ * Referred to Linux DSS driver files for OMAP3 ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation's version 2 of ++ * the License. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#ifndef DSS_H ++#define DSS_H ++ ++/* VENC Register address */ ++#define VENC_REV_ID 0x48050C00 ++#define VENC_STATUS 0x48050C04 ++#define VENC_F_CONTROL 0x48050C08 ++#define VENC_VIDOUT_CTRL 0x48050C10 ++#define VENC_SYNC_CTRL 0x48050C14 ++#define VENC_LLEN 0x48050C1C ++#define VENC_FLENS 0x48050C20 ++#define VENC_HFLTR_CTRL 0x48050C24 ++#define VENC_CC_CARR_WSS_CARR 0x48050C28 ++#define VENC_C_PHASE 0x48050C2C ++#define VENC_GAIN_U 0x48050C30 ++#define VENC_GAIN_V 0x48050C34 ++#define VENC_GAIN_Y 0x48050C38 ++#define VENC_BLACK_LEVEL 0x48050C3C ++#define VENC_BLANK_LEVEL 0x48050C40 ++#define VENC_X_COLOR 0x48050C44 ++#define VENC_M_CONTROL 0x48050C48 ++#define VENC_BSTAMP_WSS_DATA 0x48050C4C ++#define VENC_S_CARR 0x48050C50 ++#define VENC_LINE21 0x48050C54 ++#define VENC_LN_SEL 0x48050C58 ++#define VENC_L21__WC_CTL 0x48050C5C ++#define VENC_HTRIGGER_VTRIGGER 0x48050C60 ++#define VENC_SAVID__EAVID 0x48050C64 ++#define VENC_FLEN__FAL 0x48050C68 ++#define VENC_LAL__PHASE_RESET 0x48050C6C ++#define VENC_HS_INT_START_STOP_X 0x48050C70 ++#define VENC_HS_EXT_START_STOP_X 0x48050C74 ++#define VENC_VS_INT_START_X 0x48050C78 ++#define VENC_VS_INT_STOP_X__VS_INT_START_Y 0x48050C7C ++#define VENC_VS_INT_STOP_Y__VS_EXT_START_X 0x48050C80 ++#define VENC_VS_EXT_STOP_X__VS_EXT_START_Y 0x48050C84 ++#define VENC_VS_EXT_STOP_Y 0x48050C88 ++#define VENC_AVID_START_STOP_X 0x48050C90 ++#define VENC_AVID_START_STOP_Y 0x48050C94 ++#define VENC_FID_INT_START_X__FID_INT_START_Y 0x48050CA0 ++#define VENC_FID_INT_OFFSET_Y__FID_EXT_START_X 0x48050CA4 ++#define VENC_FID_EXT_START_Y__FID_EXT_OFFSET_Y 0x48050CA8 ++#define VENC_TVDETGP_INT_START_STOP_X 0x48050CB0 ++#define VENC_TVDETGP_INT_START_STOP_Y 0x48050CB4 ++#define VENC_GEN_CTRL 0x48050CB8 ++#define VENC_OUTPUT_CONTROL 0x48050CC4 ++#define VENC_DAC_B__DAC_C 0x48050CC8 ++ ++/* DSS register addresses */ ++#define DSS_SYSCONFIG 0x48050010 ++#define DSS_CONTROL 0x48050040 ++ ++/* DISPC register addresses */ ++#define DISPC_SYSCONFIG 0x48050410 ++#define DISPC_SYSSTATUS 0x48050414 ++#define DISPC_CONTROL 0x48050440 ++#define DISPC_CONFIG 0x48050444 ++#define DISPC_DEFAULT_COLOR0 0x4805044c ++#define DISPC_DEFAULT_COLOR1 0x48050450 ++#define DISPC_TRANS_COLOR0 0x48050454 ++#define DISPC_TRANS_COLOR1 0x48050458 ++#define DISPC_TIMING_H 0x48050464 ++#define DISPC_TIMING_V 0x48050468 ++#define DISPC_POL_FREQ 0x4805046c ++#define DISPC_DIVISOR 0x48050470 ++#define DISPC_SIZE_DIG 0x48050478 ++#define DISPC_SIZE_LCD 0x4805047c ++ ++/* Few Register Offsets */ ++#define FRAME_MODE_OFFSET 1 ++#define TFTSTN_OFFSET 3 ++#define DATALINES_OFFSET 8 ++ ++/* Enabling Display controller */ ++#define LCD_ENABLE 1 ++#define DIG_ENABLE (1 << 1) ++#define GO_LCD (1 << 5) ++#define GO_DIG (1 << 6) ++#define GP_OUT0 (1 << 15) ++#define GP_OUT1 (1 << 16) ++ ++#define DISPC_ENABLE (LCD_ENABLE | \ ++ DIG_ENABLE | \ ++ GO_LCD | \ ++ GO_DIG | \ ++ GP_OUT0| \ ++ GP_OUT1) ++/* Configure VENC DSS Params */ ++#define VENC_CLK_ENABLE (1 << 3) ++#define DAC_DEMEN (1 << 4) ++#define DAC_POWERDN (1 << 5) ++#define VENC_OUT_SEL (1 << 6) ++ ++#define VENC_DSS_CONFIG (VENC_CLK_ENABLE | \ ++ DAC_DEMEN | \ ++ DAC_POWERDN | \ ++ VENC_OUT_SEL) ++ ++struct venc_config { ++ u32 status; ++ u32 f_control; ++ u32 vidout_ctrl; ++ u32 sync_ctrl; ++ u32 llen; ++ u32 flens; ++ u32 hfltr_ctrl; ++ u32 cc_carr_wss_carr; ++ u32 c_phase; ++ u32 gain_u; ++ u32 gain_v; ++ u32 gain_y; ++ u32 black_level; ++ u32 blank_level; ++ u32 x_color; ++ u32 m_control; ++ u32 bstamp_wss_data; ++ u32 s_carr; ++ u32 line21; ++ u32 ln_sel; ++ u32 l21__wc_ctl; ++ u32 htrigger_vtrigger; ++ u32 savid__eavid; ++ u32 flen__fal; ++ u32 lal__phase_reset; ++ u32 hs_int_start_stop_x; ++ u32 hs_ext_start_stop_x; ++ u32 vs_int_start_x; ++ u32 vs_int_stop_x__vs_int_start_y; ++ u32 vs_int_stop_y__vs_ext_start_x; ++ u32 vs_ext_stop_x__vs_ext_start_y; ++ u32 vs_ext_stop_y; ++ u32 avid_start_stop_x; ++ u32 avid_start_stop_y; ++ u32 fid_int_start_x__fid_int_start_y; ++ u32 fid_int_offset_y__fid_ext_start_x; ++ u32 fid_ext_start_y__fid_ext_offset_y; ++ u32 tvdetgp_int_start_stop_x; ++ u32 tvdetgp_int_start_stop_y; ++ u32 gen_ctrl; ++ u32 output_control; ++ u32 dac_b__dac_c; ++ u32 height_width; ++}; ++ ++struct panel_config { ++ u32 timing_h; ++ u32 timing_v; ++ u32 pol_freq; ++ u32 divisor; ++ u32 lcd_size; ++ u32 panel_type; ++ u32 data_lines; ++ u32 load_mode; ++}; ++ ++static inline void dss_write_reg(int reg, u32 val) ++{ ++ __raw_writel(val, reg); ++} ++ ++static inline u32 dss_read_reg(int reg) ++{ ++ u32 l = __raw_readl(reg); ++ return l; ++} ++ ++#endif /* DSS_H */ +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index ff6d432..2c15df9 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -120,6 +120,7 @@ + #define CONFIG_CMD_I2C /* I2C serial bus support */ + #define CONFIG_CMD_MMC /* MMC support */ + #define CONFIG_CMD_NAND /* NAND support */ ++#define CONFIG_VIDEO_OMAP3 /* DSS Support */ + + #undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ + #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ +-- +1.5.6.3 + +--0016e64cc3d48ed9db047ca903b2 +Content-Type: text/plain; charset=ISO-8859-1 + +-- +You received this message because you are subscribed to the Google Groups "Beagle Board" group. +To post to this group, send email to beagleboard@googlegroups.com. +To unsubscribe from this group, send email to beagleboard+unsubscribe@googlegroups.com. +For more options, visit this group at http://groups.google.com/group/beagleboard?hl=en. + + + +--0016e64cc3d48ed9db047ca903b2-- diff --git a/recipes/u-boot/u-boot-git/beagleboard/i2c.patch b/recipes/u-boot/u-boot-git/beagleboard/i2c.patch new file mode 100644 index 0000000000..e4b466af1b --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/i2c.patch @@ -0,0 +1,141 @@ +Delivered-To: koen@beagleboard.org +Received: by 10.216.36.75 with SMTP id v53cs218006wea; + Fri, 8 Jan 2010 07:39:19 -0800 (PST) +Received: by 10.115.103.23 with SMTP id f23mr12356197wam.226.1262965158521; + Fri, 08 Jan 2010 07:39:18 -0800 (PST) +Return-Path: <3n1FHSwYPC4Mrohzptilhnslivhyk.vynilhnslivhyknvvnslnyv1wz.jvt@listserv.bounces.google.com> +Received: from mail-pz0-f138.google.com (mail-pz0-f138.google.com [209.85.222.138]) + by mx.google.com with ESMTP id 9si7274234pzk.15.2010.01.08.07.39.16; + Fri, 08 Jan 2010 07:39:17 -0800 (PST) +Received-SPF: pass (google.com: domain of 3n1FHSwYPC4Mrohzptilhnslivhyk.vynilhnslivhyknvvnslnyv1wz.jvt@listserv.bounces.google.com designates 209.85.222.138 as permitted sender) client-ip=209.85.222.138; +Authentication-Results: mx.google.com; spf=pass (google.com: domain of 3n1FHSwYPC4Mrohzptilhnslivhyk.vynilhnslivhyknvvnslnyv1wz.jvt@listserv.bounces.google.com designates 209.85.222.138 as permitted sender) smtp.mail=3n1FHSwYPC4Mrohzptilhnslivhyk.vynilhnslivhyknvvnslnyv1wz.jvt@listserv.bounces.google.com; dkim=pass (test mode) header.i=@googlegroups.com +Received: by pzk2 with SMTP id 2sf6049133pzk.27 + for ; Fri, 08 Jan 2010 07:39:16 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=googlegroups.com; s=beta; + h=domainkey-signature:received:x-beenthere:received:received:received + :received:received-spf:received:mime-version:received:date + :message-id:subject:from:to:x-original-authentication-results + :x-original-sender:reply-to:precedence:mailing-list:list-id + :list-post:list-help:list-archive:x-thread-url:x-message-url:sender + :list-unsubscribe:list-subscribe:content-type; + bh=NrT5b+hNQLcUxuuUxSE9xgP8l6ppaVDT/n2MbfizXXg=; + b=yBQ3bq0ciS6qKoPZPcLLFORPxwQxMLQ8fCRLMIKRzXLFudf7oKso90LmSLTOdBPG1/ + VtP5SHwH94/9qMfiBt6tP/ctGmRgaiInagDDK6Vm9HPeFwlSnw3vEs+us9uS8+M0nq0r + w4fZBAVg88EjhyYye8sR9HTxWqoD6MmoFZ8xw= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=googlegroups.com; s=beta; + h=x-beenthere:received-spf:mime-version:date:message-id:subject:from + :to:x-original-authentication-results:x-original-sender:reply-to + :precedence:mailing-list:list-id:list-post:list-help:list-archive + :x-thread-url:x-message-url:sender:list-unsubscribe:list-subscribe + :content-type; + b=MC8JBr0AHWoi6cJVeRDSuaJByBiotlgA7WEQNSwY8VNKj//50+GmZE2JfItV+S56wH + IHiW5gpkGyoK+x1iSfjl6RGBaI5S6hdKPtzI4VszemAIGI0NlxZmQAnOQPF3WQCyXcGX + elyK18i6/LeZeK8Ct1BaANDnPfNgkbBGoStpw= +Received: by 10.114.6.29 with SMTP id 29mr2535635waf.24.1262965151011; + Fri, 08 Jan 2010 07:39:11 -0800 (PST) +X-BeenThere: beagleboard@googlegroups.com +Received: by 10.115.116.23 with SMTP id t23ls486004wam.1.p; Fri, 08 Jan 2010 + 07:39:00 -0800 (PST) +Received: by 10.114.187.11 with SMTP id k11mr2703732waf.28.1262965139892; + Fri, 08 Jan 2010 07:38:59 -0800 (PST) +Received: by 10.114.187.11 with SMTP id k11mr2703731waf.28.1262965139862; + Fri, 08 Jan 2010 07:38:59 -0800 (PST) +Return-Path: +Received: from mail-px0-f198.google.com (mail-px0-f198.google.com [209.85.216.198]) + by gmr-mx.google.com with ESMTP id 16si3405078pxi.3.2010.01.08.07.38.59; + Fri, 08 Jan 2010 07:38:59 -0800 (PST) +Received-SPF: neutral (google.com: 209.85.216.198 is neither permitted nor denied by best guess record for domain of khasim@beagleboard.org) client-ip=209.85.216.198; +Received: by pxi36 with SMTP id 36so13875651pxi.26 + for ; Fri, 08 Jan 2010 07:38:59 -0800 (PST) +MIME-Version: 1.0 +Received: by 10.142.250.5 with SMTP id x5mr2689870wfh.341.1262965139614; Fri, + 08 Jan 2010 07:38:59 -0800 (PST) +Date: Fri, 8 Jan 2010 21:08:59 +0530 +Message-ID: +Subject: [beagleboard] TI:OMAP: [PATCH 2/4] Enable I2C bus switching +From: Khasim Syed Mohammed +To: u-boot@lists.denx.de, beagleboard@googlegroups.com +X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: + 209.85.216.198 is neither permitted nor denied by best guess record for + domain of khasim@beagleboard.org) smtp.mail=khasim@beagleboard.org +X-Original-Sender: khasim@beagleboard.org +Reply-To: beagleboard@googlegroups.com +Precedence: list +Mailing-list: list beagleboard@googlegroups.com; contact beagleboard+owners@googlegroups.com +List-ID: +List-Post: , + +List-Help: , +List-Archive: +X-Thread-Url: http://groups.google.com/group/beagleboard/t/806cd9676271c3e3 +X-Message-Url: http://groups.google.com/group/beagleboard/msg/d4cf808abcb065f9 +Sender: beagleboard@googlegroups.com +List-Unsubscribe: , + +List-Subscribe: , + +Content-Type: multipart/mixed; boundary=0016e64cc3d48ce7bb047ca8fca8 + +--0016e64cc3d48ce7bb047ca8fca8 +Content-Type: text/plain; charset=ISO-8859-1 + +From 9045377f255e8a59450a6957e63366b4963281ae Mon Sep 17 00:00:00 2001 +From: Syed Mohammed Khasim +Date: Fri, 8 Jan 2010 20:20:41 +0530 +Subject: [PATCH] Enable I2C bus switching + +OMAP3 supports Multiple I2C channels, this patch allows +us to use i2c dev command to switch between busses. + +Signed-off-by: Syed Mohammed Khasim +Acked-by: Heiko Schocher +--- + drivers/i2c/omap24xx_i2c.c | 5 +++++ + include/configs/omap3_beagle.h | 4 ++++ + 2 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c +index ff18991..e8c8184 100644 +--- a/drivers/i2c/omap24xx_i2c.c ++++ b/drivers/i2c/omap24xx_i2c.c +@@ -435,3 +435,8 @@ int i2c_set_bus_num(unsigned int bus) + + return 0; + } ++ ++int i2c_get_bus_num(void) ++{ ++ return (int) current_bus; ++} +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index d1c9cd0..ff6d432 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -100,6 +100,10 @@ + /* DDR - I use Micron DDR */ + #define CONFIG_OMAP3_MICRON_DDR 1 + ++/* Enable Multi Bus support for I2C */ ++#define CONFIG_I2C_MULTI_BUS 1 ++#define CONFIG_SYS_I2C_NOPROBES {0x0, 0x0} ++ + /* commands to include */ + #include + +-- +1.5.6.3 + +--0016e64cc3d48ce7bb047ca8fca8 +Content-Type: text/plain; charset=ISO-8859-1 + +-- +You received this message because you are subscribed to the Google Groups "Beagle Board" group. +To post to this group, send email to beagleboard@googlegroups.com. +To unsubscribe from this group, send email to beagleboard+unsubscribe@googlegroups.com. +For more options, visit this group at http://groups.google.com/group/beagleboard?hl=en. + + + +--0016e64cc3d48ce7bb047ca8fca8-- diff --git a/recipes/u-boot/u-boot-git/beagleboard/mru-256.diff b/recipes/u-boot/u-boot-git/beagleboard/mru-256.diff deleted file mode 100644 index 6099fe6c9d..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/mru-256.diff +++ /dev/null @@ -1,192 +0,0 @@ -From: Mans Rullgard -Date: Thu, 2 Oct 2008 01:25:35 +0000 (+0100) -Subject: OMAP3: Beagleboard can have dual-chip RAM -X-Git-Url: http://git.mansr.com/?p=u-boot;a=commitdiff_plain;h=ef6ee5af8d584bddadb2d45ad4320cef96b8a934;hp=caccdb772c3028a3e3e801fb1554788150752ffc - -OMAP3: Beagleboard can have dual-chip RAM - -Some Beagleboards are fitted with dual-chip RAM. Returning DDR_STACKED -from get_mem_type() causes the second chip (on CS1) to be enabled. - -FIXME: need a better way to configure this. - -Signed-off-by: Mans Rullgard ---- - -diff --git a/cpu/omap3/board.c b/cpu/omap3/board.c -index 804021f..f7cf289 100644 ---- a/cpu/omap3/board.c -+++ b/cpu/omap3/board.c -@@ -265,15 +265,17 @@ int dram_init(void) - * where it can be started. Early init code will init - * memory on CS0. - */ -- if ((mtype == DDR_COMBO) || (mtype == DDR_STACKED)) -+ if ((mtype == DDR_COMBO) || (mtype == DDR_STACKED)) { - do_sdrc_init(SDRC_CS1_OSET, NOT_EARLY); -+ make_cs1_contiguous(); -+ } - - size0 = get_sdr_cs_size(SDRC_CS0_OSET); - size1 = get_sdr_cs_size(SDRC_CS1_OSET); - - gd->bd->bi_dram[0].start = PHYS_SDRAM_1; - gd->bd->bi_dram[0].size = size0; -- gd->bd->bi_dram[1].start = PHYS_SDRAM_1 + size0; -+ gd->bd->bi_dram[1].start = PHYS_SDRAM_1 + get_sdr_cs_offset(1); - gd->bd->bi_dram[1].size = size1; - - return 0; -diff --git a/cpu/omap3/mem.c b/cpu/omap3/mem.c -index 955fa70..53687a5 100644 ---- a/cpu/omap3/mem.c -+++ b/cpu/omap3/mem.c -@@ -114,12 +114,12 @@ void make_cs1_contiguous(void) - * for a part. Helps in guessing which part - * we are currently using. - *******************************************************/ --u32 mem_ok(void) -+u32 mem_ok(u32 cs) - { - u32 val1, val2, addr; - u32 pattern = 0x12345678; - -- addr = OMAP34XX_SDRC_CS0; -+ addr = OMAP34XX_SDRC_CS0 + get_sdr_cs_offset(cs); - - __raw_writel(0x0, addr + 0x400); /* clear pos A */ - __raw_writel(pattern, addr); /* pattern to pos B */ -@@ -156,43 +156,40 @@ void sdrc_init(void) - - void do_sdrc_init(u32 offset, u32 early) - { -+ u32 actim_offs = offset? 0x28: 0; - -- /* reset sdrc controller */ -- __raw_writel(SOFTRESET, SDRC_SYSCONFIG); -- wait_on_value(BIT0, BIT0, SDRC_STATUS, 12000000); -- __raw_writel(0, SDRC_SYSCONFIG); -+ if (early) { -+ /* reset sdrc controller */ -+ __raw_writel(SOFTRESET, SDRC_SYSCONFIG); -+ wait_on_value(BIT0, BIT0, SDRC_STATUS, 12000000); -+ __raw_writel(0, SDRC_SYSCONFIG); - -- /* setup sdrc to ball mux */ -- __raw_writel(SDP_SDRC_SHARING, SDRC_SHARING); -+ /* setup sdrc to ball mux */ -+ __raw_writel(SDP_SDRC_SHARING, SDRC_SHARING); - -- /* SDRC_MCFG0 register */ -- (*(unsigned int *) 0x6D000080) = 0x02584099; /* from Micron */ -+ /* Disble Power Down of CKE cuz of 1 CKE on combo part */ -+ __raw_writel(0x00000081, SDRC_POWER); - -- /* SDRC_RFR_CTRL0 register */ -- (*(unsigned int *) 0x6D0000a4) = 0x54601; /* for 166M */ -+ __raw_writel(0x0000A, SDRC_DLLA_CTRL); -+ sdelay(0x20000); -+ } - -- /* SDRC_ACTIM_CTRLA0 register */ -- (*(unsigned int *) 0x6D00009c) = 0xa29db4c6; /* for 166M */ -+ __raw_writel(0x02584099, SDRC_MCFG_0 + offset); -+ __raw_writel(0x4e201, SDRC_RFR_CTRL + offset); -+ __raw_writel(0xaa9db4c6, SDRC_ACTIM_CTRLA_0 + actim_offs); -+ __raw_writel(0x11517, SDRC_ACTIM_CTRLB_0 + actim_offs); - -- /* SDRC_ACTIM_CTRLB0 register */ -- (*(unsigned int *) 0x6D0000a0) = 0x12214; /* for 166M */ -+ __raw_writel(CMD_NOP, SDRC_MANUAL_0 + offset); -+ __raw_writel(CMD_PRECHARGE, SDRC_MANUAL_0 + offset); -+ __raw_writel(CMD_AUTOREFRESH, SDRC_MANUAL_0 + offset); -+ __raw_writel(CMD_AUTOREFRESH, SDRC_MANUAL_0 + offset); - -- /* Disble Power Down of CKE cuz of 1 CKE on combo part */ -- (*(unsigned int *) 0x6D000070) = 0x00000081; -+ /* CAS latency 3, Write Burst = Read Burst, Serial Mode, -+ Burst length = 4 */ -+ __raw_writel(0x00000032, SDRC_MR_0 + offset); - -- /* SDRC_Manual command register */ -- (*(unsigned int *) 0x6D0000a8) = 0x00000000; /* NOP command */ -- (*(unsigned int *) 0x6D0000a8) = 0x00000001; /* Precharge command */ -- (*(unsigned int *) 0x6D0000a8) = 0x00000002; /* Auto-refresh command */ -- (*(unsigned int *) 0x6D0000a8) = 0x00000002; /* Auto-refresh command */ -- -- /* SDRC MR0 register */ -- (*(int *) 0x6D000084) = 0x00000032; /* Burst length = 4 */ -- /* CAS latency = 3, Write Burst = Read Burst Serial Mode */ -- -- /* SDRC DLLA control register */ -- (*(unsigned int *) 0x6D000060) = 0x0000A; -- sdelay(0x20000); -+ if (!mem_ok(offset)) -+ __raw_writel(0, SDRC_MCFG_0 + offset); - } - - void enable_gpmc_config(u32 *gpmc_config, u32 gpmc_base, u32 base, u32 size) -diff --git a/cpu/omap3/sys_info.c b/cpu/omap3/sys_info.c -index 12cf5ba..64d9e7e 100644 ---- a/cpu/omap3/sys_info.c -+++ b/cpu/omap3/sys_info.c -@@ -90,8 +90,11 @@ u32 is_mem_sdr(void) - ***********************************************************/ - u32 get_mem_type(void) - { -- /* Current SDP3430 uses 2x16 MDDR Infenion parts */ -+#ifdef CONFIG_OMAP3_BEAGLE -+ return DDR_STACKED; -+#else - return DDR_DISCRETE; -+#endif - } - - /*********************************************************************** -@@ -109,6 +112,22 @@ u32 get_sdr_cs_size(u32 offset) - } - - /*********************************************************************** -+ * get_sdr_cs_offset() - get offset of cs from cs0 start -+ ************************************************************************/ -+u32 get_sdr_cs_offset(u32 cs) -+{ -+ u32 offset; -+ -+ if (!cs) -+ return 0; -+ -+ offset = __raw_readl(SDRC_CS_CFG); -+ offset = (offset & 15) << 27 | (offset & 0x30) >> 17; -+ -+ return offset; -+} -+ -+/*********************************************************************** - * get_board_type() - get board type based on current production stats. - * - NOTE-1-: 2 I2C EEPROMs will someday be populated with proper info. - * when they are available we can get info from there. This should -diff --git a/include/asm-arm/arch-omap3/cpu.h b/include/asm-arm/arch-omap3/cpu.h -index d47defb..df2d150 100644 ---- a/include/asm-arm/arch-omap3/cpu.h -+++ b/include/asm-arm/arch-omap3/cpu.h -@@ -123,7 +123,6 @@ - #define SDRC_ACTIM_CTRLA_1 (OMAP34XX_SDRC_BASE+0xC4) - #define SDRC_ACTIM_CTRLB_1 (OMAP34XX_SDRC_BASE+0xC8) - #define SDRC_RFR_CTRL (OMAP34XX_SDRC_BASE+0xA4) --#define SDRC_RFR_CTRL (OMAP34XX_SDRC_BASE+0xA4) - #define SDRC_MANUAL_0 (OMAP34XX_SDRC_BASE+0xA8) - #define OMAP34XX_SDRC_CS0 0x80000000 - #define OMAP34XX_SDRC_CS1 0xA0000000 -diff --git a/include/asm-arm/arch-omap3/sys_proto.h b/include/asm-arm/arch-omap3/sys_proto.h -index 279bdce..5b0bd9e 100644 ---- a/include/asm-arm/arch-omap3/sys_proto.h -+++ b/include/asm-arm/arch-omap3/sys_proto.h -@@ -50,6 +50,7 @@ u32 get_gpmc0_width(void); - u32 get_board_type(void); - void display_board_info(u32); - u32 get_sdr_cs_size(u32 offset); -+u32 get_sdr_cs_offset(u32 cs); - u32 running_in_sdram(void); - u32 running_in_sram(void); - u32 running_in_flash(void); diff --git a/recipes/u-boot/u-boot-git/beagleboard/name.patch b/recipes/u-boot/u-boot-git/beagleboard/name.patch deleted file mode 100644 index ac03e47774..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/name.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- git/Makefile.orig 2008-07-25 16:21:22.000000000 -0700 -+++ git/Makefile 2008-07-27 06:49:08.000000000 -0700 -@@ -2582,8 +2582,8 @@ SMN42_config : unconfig - ######################################################################### - ## ARM CORTEX Systems - ######################################################################### --omap3530beagle_config : unconfig -- @$(MKCONFIG) $(@:_config=) arm omap3 omap3530beagle -+beagleboard_config : unconfig -+ @$(MKCONFIG) omap3530beagle arm omap3 omap3530beagle - - overo_config : unconfig - @$(MKCONFIG) $(@:_config=) arm omap3 overo - diff --git a/recipes/u-boot/u-boot-git/beagleboard/revision-detection.patch b/recipes/u-boot/u-boot-git/beagleboard/revision-detection.patch new file mode 100644 index 0000000000..c2a41bfcc7 --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/revision-detection.patch @@ -0,0 +1,241 @@ +Delivered-To: koen@beagleboard.org +Received: by 10.216.36.75 with SMTP id v53cs217947wea; + Fri, 8 Jan 2010 07:38:03 -0800 (PST) +Received: by 10.141.214.24 with SMTP id r24mr6834000rvq.27.1262965082475; + Fri, 08 Jan 2010 07:38:02 -0800 (PST) +Return-Path: <3UlFHSwYPCzYcZSkaeTWSYdWTgSjV.gjYTWSYdWTgSjVYggYdWYjgmhk.Uge@listserv.bounces.google.com> +Received: from mail-pw0-f72.google.com (mail-pw0-f72.google.com [209.85.160.72]) + by mx.google.com with ESMTP id 31si42836225pzk.96.2010.01.08.07.38.00; + Fri, 08 Jan 2010 07:38:01 -0800 (PST) +Received-SPF: pass (google.com: domain of 3UlFHSwYPCzYcZSkaeTWSYdWTgSjV.gjYTWSYdWTgSjVYggYdWYjgmhk.Uge@listserv.bounces.google.com designates 209.85.160.72 as permitted sender) client-ip=209.85.160.72; +Authentication-Results: mx.google.com; spf=pass (google.com: domain of 3UlFHSwYPCzYcZSkaeTWSYdWTgSjV.gjYTWSYdWTgSjVYggYdWYjgmhk.Uge@listserv.bounces.google.com designates 209.85.160.72 as permitted sender) smtp.mail=3UlFHSwYPCzYcZSkaeTWSYdWTgSjV.gjYTWSYdWTgSjVYggYdWYjgmhk.Uge@listserv.bounces.google.com; dkim=pass (test mode) header.i=@googlegroups.com +Received: by pwj4 with SMTP id 4sf2565182pwj.11 + for ; Fri, 08 Jan 2010 07:38:00 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=googlegroups.com; s=beta; + h=domainkey-signature:received:x-beenthere:received:received:received + :received:received-spf:received:mime-version:received:date + :message-id:subject:from:to:x-original-authentication-results + :x-original-sender:reply-to:precedence:mailing-list:list-id + :list-post:list-help:list-archive:x-thread-url:x-message-url:sender + :list-unsubscribe:list-subscribe:content-type; + bh=XdDWC3Pjbe6mfVpRg0Nyb4elMKzFUcLRQ+7/Tb3fHMQ=; + b=NiM6Z+/ubLFaxomCEKnZjYyFgB7ZbE4xWWwqF6i/H8BQiedPp1rBmQSdQ2EH4qDFgm + D3DR5jXVjtOALhgh/9cxU/S46ltiM5rtGnwtcjgV+Gv9r5/sfqhze9c81t7bzIo+bpqn + cg8yNHOFjwkPSWdSidIhKnZJGQRj/ZIgxJxCw= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=googlegroups.com; s=beta; + h=x-beenthere:received-spf:mime-version:date:message-id:subject:from + :to:x-original-authentication-results:x-original-sender:reply-to + :precedence:mailing-list:list-id:list-post:list-help:list-archive + :x-thread-url:x-message-url:sender:list-unsubscribe:list-subscribe + :content-type; + b=0jHA96QBedAxJl8vWrKHetbULCj+FIcyXTmI01rlbnfXOm8WuPhJDLyj7Qo34LiQXE + dYkeQ2RNv3L03nbVuPezNfUKHuKLONUQKVvAfxRDset7eLpsYuKQZADZ+loSfkeVlwDW + ai/7Z937On5tliSGUDPp+73oUNfje1ReYx+dc= +Received: by 10.115.87.31 with SMTP id p31mr3273178wal.7.1262965074762; + Fri, 08 Jan 2010 07:37:54 -0800 (PST) +X-BeenThere: beagleboard@googlegroups.com +Received: by 10.115.116.23 with SMTP id t23ls485636wam.1.p; Fri, 08 Jan 2010 + 07:37:51 -0800 (PST) +Received: by 10.114.3.19 with SMTP id 19mr7028808wac.17.1262965071286; + Fri, 08 Jan 2010 07:37:51 -0800 (PST) +Received: by 10.114.3.19 with SMTP id 19mr7028807wac.17.1262965071261; + Fri, 08 Jan 2010 07:37:51 -0800 (PST) +Return-Path: +Received: from mail-px0-f174.google.com (mail-px0-f174.google.com [209.85.216.174]) + by gmr-mx.google.com with ESMTP id 16si3405423pxi.11.2010.01.08.07.37.51; + Fri, 08 Jan 2010 07:37:51 -0800 (PST) +Received-SPF: neutral (google.com: 209.85.216.174 is neither permitted nor denied by best guess record for domain of khasim@beagleboard.org) client-ip=209.85.216.174; +Received: by mail-px0-f174.google.com with SMTP id 4so2127527pxi.33 + for ; Fri, 08 Jan 2010 07:37:51 -0800 (PST) +MIME-Version: 1.0 +Received: by 10.142.66.15 with SMTP id o15mr4287776wfa.145.1262965071051; Fri, + 08 Jan 2010 07:37:51 -0800 (PST) +Date: Fri, 8 Jan 2010 21:07:50 +0530 +Message-ID: +Subject: [beagleboard] TI:OMAP: [PATCH 1/4] OMAP3 Beagle Update revision + detection +From: Khasim Syed Mohammed +To: u-boot@lists.denx.de, beagleboard@googlegroups.com +X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: + 209.85.216.174 is neither permitted nor denied by best guess record for + domain of khasim@beagleboard.org) smtp.mail=khasim@beagleboard.org +X-Original-Sender: khasim@beagleboard.org +Reply-To: beagleboard@googlegroups.com +Precedence: list +Mailing-list: list beagleboard@googlegroups.com; contact beagleboard+owners@googlegroups.com +List-ID: +List-Post: , + +List-Help: , +List-Archive: +X-Thread-Url: http://groups.google.com/group/beagleboard/t/1d4ac362a651981d +X-Message-Url: http://groups.google.com/group/beagleboard/msg/8a2d1aa3c9c40beb +Sender: beagleboard@googlegroups.com +List-Unsubscribe: , + +List-Subscribe: , + +Content-Type: multipart/mixed; boundary=0016e64cc3d4779e0f047ca8f8bb + +--0016e64cc3d4779e0f047ca8f8bb +Content-Type: text/plain; charset=ISO-8859-1 + +From 15fbe5ff9ee2fd2f8da4c16805d6c7ccf7244bae Mon Sep 17 00:00:00 2001 +From: Syed Mohammed Khasim +Date: Fri, 8 Jan 2010 20:13:47 +0530 +Subject: [PATCH] OMAP3 Beagle Update revision detection + +New BeagleBoard revision C4 uses a new ID. Update revision detection. + +Signed-off-by: Dirk Behme +Signed-off-by: Syed Mohammed Khasim +--- + board/ti/beagle/beagle.c | 65 ++++++++++++++++++++++++++++----------------- + board/ti/beagle/beagle.h | 8 ++++- + 2 files changed, 46 insertions(+), 27 deletions(-) + +diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c +index 32d501e..0def5a6 100644 +--- a/board/ti/beagle/beagle.c ++++ b/board/ti/beagle/beagle.c +@@ -38,7 +38,7 @@ + #include + #include "beagle.h" + +-static int beagle_revision_c; ++static int beagle_revision; + + /* + * Routine: board_init +@@ -60,41 +60,57 @@ int board_init(void) + /* + * Routine: beagle_get_revision + * Description: Return the revision of the BeagleBoard this code is running on. +- * If it is a revision Ax/Bx board, this function returns 0, +- * on a revision C board you will get a 1. + */ + int beagle_get_revision(void) + { +- return beagle_revision_c; ++ return beagle_revision; + } + + /* + * Routine: beagle_identify +- * Description: Detect if we are running on a Beagle revision Ax/Bx or +- * Cx. This can be done by GPIO_171. If this is low, we are +- * running on a revision C board. ++ * Description: Detect if we are running on a Beagle revision Ax/Bx, ++ * C1/2/3, C4 or D. This can be done by reading ++ * the level of GPIO173, GPIO172 and GPIO171. This should ++ * result in ++ * GPIO173, GPIO172, GPIO171: 1 1 1 => Ax/Bx ++ * GPIO173, GPIO172, GPIO171: 1 1 0 => C1/2/3 ++ * GPIO173, GPIO172, GPIO171: 1 0 1 => C4 ++ * GPIO173, GPIO172, GPIO171: 0 0 0 => D + */ + void beagle_identify(void) + { +- beagle_revision_c = 0; +- if (!omap_request_gpio(171)) { +- unsigned int val; +- +- omap_set_gpio_direction(171, 1); +- val = omap_get_gpio_datain(171); +- omap_free_gpio(171); +- +- if (val) +- beagle_revision_c = 0; +- else +- beagle_revision_c = 1; +- } ++ omap_request_gpio(171); ++ omap_request_gpio(172); ++ omap_request_gpio(173); ++ omap_set_gpio_direction(171, 1); ++ omap_set_gpio_direction(172, 1); ++ omap_set_gpio_direction(173, 1); ++ ++ beagle_revision = omap_get_gpio_datain(173) << 2 | ++ omap_get_gpio_datain(172) << 1 | ++ omap_get_gpio_datain(171); ++ omap_free_gpio(171); ++ omap_free_gpio(172); ++ omap_free_gpio(173); + + printf("Board revision "); +- if (beagle_revision_c) +- printf("C\n"); +- else ++ ++ switch (beagle_revision) { ++ case REVISION_AXBX: + printf("Ax/Bx\n"); ++ break; ++ case REVISION_CX: ++ printf("C1/C2/C3\n"); ++ break; ++ case REVISION_C4: ++ printf("C4\n"); ++ break; ++ case REVISION_D: ++ printf("D\n"); ++ break; ++ default: ++ printf("unknown 0x%02x\n", beagle_revision); ++ } + } + + /* +@@ -137,7 +153,6 @@ void set_muxconf_regs(void) + { + MUX_BEAGLE(); + +- if (beagle_revision_c) { ++ if (beagle_revision != REVISION_AXBX) + MUX_BEAGLE_C(); +- } + } +diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h +index 7fe6275..b1720c9 100644 +--- a/board/ti/beagle/beagle.h ++++ b/board/ti/beagle/beagle.h +@@ -33,7 +33,11 @@ const omap3_sysinfo sysinfo = { + #endif + }; + +-#define BOARD_REVISION_MASK (0x1 << 11) ++/* BeagleBoard revisions */ ++#define REVISION_AXBX 0x7 ++#define REVISION_CX 0x6 ++#define REVISION_C4 0x5 ++#define REVISION_D 0x0 + + /* + * IEN - Input Enable +@@ -264,7 +268,7 @@ const omap3_sysinfo sysinfo = { + MUX_VAL(CP(HDQ_SIO), (IDIS | PTU | EN | M4)) /*GPIO_170*/\ + MUX_VAL(CP(MCSPI1_CLK), (IEN | PTU | EN | M4)) /*GPIO_171*/\ + MUX_VAL(CP(MCSPI1_SIMO), (IEN | PTU | EN | M4)) /*GPIO_172*/\ +- MUX_VAL(CP(MCSPI1_SOMI), (IEN | PTD | DIS | M0)) /*McSPI1_SOMI*/\ ++ MUX_VAL(CP(MCSPI1_SOMI), (IEN | PTU | EN | M4)) /*GPIO_173*/\ + MUX_VAL(CP(MCSPI1_CS0), (IEN | PTD | EN | M0)) /*McSPI1_CS0*/\ + MUX_VAL(CP(MCSPI1_CS1), (IDIS | PTD | EN | M0)) /*McSPI1_CS1*/\ + MUX_VAL(CP(MCSPI1_CS2), (IDIS | PTD | DIS | M4)) /*GPIO_176*/\ +-- +1.5.6.3 + +--0016e64cc3d4779e0f047ca8f8bb +Content-Type: text/plain; charset=ISO-8859-1 + +-- +You received this message because you are subscribed to the Google Groups "Beagle Board" group. +To post to this group, send email to beagleboard@googlegroups.com. +To unsubscribe from this group, send email to beagleboard+unsubscribe@googlegroups.com. +For more options, visit this group at http://groups.google.com/group/beagleboard?hl=en. + + + +--0016e64cc3d4779e0f047ca8f8bb-- diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 5fcf7c586a..8f21e7f484 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -19,9 +19,14 @@ SRC_URI_append_cm-t35 = "file://cm-t35/cm-t35.patch;patch=1" SRC_URI_beagleboard = "git://git.denx.de/u-boot-ti.git;protocol=git \ file://fw_env.config \ file://new-pinmux.patch;patch=1 \ +file://revision-detection.patch;patch=1 \ +file://i2c.patch;patch=1 \ +file://720MHz.patch;patch=1 \ +file://dss.patch;patch=1 \ " -SRCREV_beagleboard = "1590f84007e2b50ad346a482fff89195cb04ff4e" -PV_beagleboard = "2009.08+${PR}+gitr${SRCREV}" + +SRCREV_beagleboard = "a5cf522a91ba479d459f8221135bdb3e9ae97479" +PV_beagleboard = "2009.11-rc1+${PR}+gitr${SRCREV}" SRCREV_calamari = "f67066b6b0740b826ed862615c5ab022aaf4779a" PV_calamari = "2009.08+${PR}+gitr${SRCREV}" -- cgit v1.2.3 From 70ff05efe02d48875ddb1f01d04e3a815a4ac160 Mon Sep 17 00:00:00 2001 From: Philip Black Date: Fri, 8 Jan 2010 11:14:39 +0000 Subject: dm365-evm.conf: Call UBOOT_MACHINE davinci_dm365_evm_config on DM365 DVM * The machine conf for the davinci dm365 EVM board was wrong. This patch fixes it. Signed-off-by: Khem Raj --- conf/machine/dm365-evm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/dm365-evm.conf b/conf/machine/dm365-evm.conf index 1fd51234e2..5a5161673b 100644 --- a/conf/machine/dm365-evm.conf +++ b/conf/machine/dm365-evm.conf @@ -5,4 +5,4 @@ require conf/machine/include/davinci.inc require conf/machine/include/dm365.inc -UBOOT_MACHINE = "davinci_dm365evm_config" +UBOOT_MACHINE = "davinci_dm365_evm_config" -- cgit v1.2.3 From 3f4cd310ac5974fe95e018cd31dec85decaaad62 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 8 Jan 2010 14:09:39 -0800 Subject: proxy-libintl_20080418.bb: Add -fPIC to CFLAGS for mips. Signed-off-by: Khem Raj --- recipes/proxy-libintl/proxy-libintl_20080418.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/proxy-libintl/proxy-libintl_20080418.bb b/recipes/proxy-libintl/proxy-libintl_20080418.bb index c5336b222d..8f06810818 100644 --- a/recipes/proxy-libintl/proxy-libintl_20080418.bb +++ b/recipes/proxy-libintl/proxy-libintl_20080418.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/" SECTION = "libs" LICENSE = "LGPL" -PR = "r4" +PR = "r5" PROVIDES = "virtual/libintl" SRC_URI = " \ @@ -19,6 +19,8 @@ FILES_${PN} = "${libdir}/libintl.so" CFLAGS_append = " -Wall -I ../../include ${@['-DSTUB_ONLY', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']}" TARGET_CC_ARCH += "${LDFLAGS}" +CFLAGS_append_mips = " -fPIC" +CFLAGS_append_mipsel = " -fPIC" do_compile() { cd ${WORKDIR}/src/proxy-libintl -- cgit v1.2.3 From 4952f80b0925a3d25413617c57868544a70bc3b6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 8 Jan 2010 14:11:08 -0800 Subject: mips-linux-uclibc: Add mips linux siteinfo for ucliibc. Signed-off-by: Khem Raj --- site/mips-linux-uclibc | 116 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 site/mips-linux-uclibc diff --git a/site/mips-linux-uclibc b/site/mips-linux-uclibc new file mode 100644 index 0000000000..4f1297aeca --- /dev/null +++ b/site/mips-linux-uclibc @@ -0,0 +1,116 @@ + +ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes} +ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no} +ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} + +# tslib, others +ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes} + +# bash +ac_cv_c_long_double=${ac_cv_c_long_double=no} +bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present} + +# openssh +ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no} +ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no} +ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes} +ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=no} +ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_have_space_d_name_in_struct_dirent=yes} + +# fget +compat_cv_func_snprintf_works=${compat_cv_func_snprintf_works=yes} + +# glib +glib_cv___va_copy=${glib_cv___va_copy=yes} +glib_cv_has__inline=${glib_cv_has__inline=yes} +glib_cv_has__inline__=${glib_cv_has__inline__=yes} +glib_cv_hasinline=${glib_cv_hasinline=yes} +glib_cv_long_long_format=${glib_cv_long_long_format=ll} +glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no} +glib_cv_sane_realloc=${glib_cv_sane_realloc=yes} +glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} +glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} +glib_cv_stack_grows=${glib_cv_stack_grows=no} +glib_cv_uscore=${glib_cv_uscore=no} +glib_cv_va_copy=${glib_cv_va_copy=yes} +glib_cv_va_val_copy=${glib_cv_va_val_copy=yes} + +# glib-2.0 +glib_cv_stack_grows=${glib_cv_stack_grows=no} +utils_cv_sys_open_max=${utils_cv_sys_open_max=1015} +ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} +glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes} +ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} + +# libpcap +ac_cv_linux_vers=${ac_cv_linux_vers=2} +ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes} + +# slrn +slrn_cv___va_copy=${slrn_cv___va_copy=yes} +slrn_cv_va_copy=${slrn_cv_va_copy=yes} +slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} + +# startup-notification +lf_cv_sane_realloc=${lf_cv_sane_realloc=yes} + +# libidl +libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll} + +# ncftp +ac_cv_func_setpgrp_void=${ac_cv_func_setpgrp_void=yes} +wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long} +wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long} +wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes} + +# rp-pppoe +rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} + +# db3 +db_cv_align_t=${db_cv_align_t='unsigned long long'} +db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} +db_cv_mutex=${db_cv_mutex=POSIX/pthreads/library} +db_cv_posixmutexes=${db_cv_posixmutexes=no} +db_cv_uimutexes=${db_cv_uimutexes=no} +db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes} +db_cv_sprintf_count=${db_cv_sprintf_count=yes} +db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar} +db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod} +db_cv_path_cp=${db_cv_path_cp=/bin/cp} +db_cv_path_ln=${db_cv_path_ln=/bin/ln} +db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir} +db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib} +db_cv_path_rm=${db_cv_path_rm=/bin/rm} +db_cv_path_sh=${db_cv_path_sh=/bin/sh} +db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip} + +# rrdtool +rd_cv_ieee_works=${rd_cv_ieee_works=yes} +# ac_cv_path_PERL=${ac_cv_path_PERL=no} + +# gettext +am_cv_func_working_getline=${am_cv_func_working_getline=yes} + +# samba +samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes} + +# vim +ac_cv_sizeof_int=${ac_cv_sizeof_int=4} + +# sudo +sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10} + +# intercom +ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes} + +# lmbench +ac_cv_uint=${ac_cv_unit=yes} + +# D-BUS +ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} + +# mono +cv_mono_sizeof_sunpath=108 +mono_cv_sizeof_sunpath=108 +mono_cv_uscore=${mono_cv_uscore=no} + -- cgit v1.2.3 From c38a0f150a309231cfcfecc46e19ae67054b0c54 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 8 Jan 2010 14:12:13 -0800 Subject: uclibc-nptl: Add machine config parts for mips,x86 qemu. Signed-off-by: Khem Raj --- recipes/uclibc/uclibc-nptl/qemumips/uClibc.machine | 63 ++++++++++++++++++++ recipes/uclibc/uclibc-nptl/qemux86/uClibc.machine | 68 ++++++++++++++++++++++ 2 files changed, 131 insertions(+) create mode 100644 recipes/uclibc/uclibc-nptl/qemumips/uClibc.machine create mode 100644 recipes/uclibc/uclibc-nptl/qemux86/uClibc.machine diff --git a/recipes/uclibc/uclibc-nptl/qemumips/uClibc.machine b/recipes/uclibc/uclibc-nptl/qemumips/uClibc.machine new file mode 100644 index 0000000000..1cf1addca9 --- /dev/null +++ b/recipes/uclibc/uclibc-nptl/qemumips/uClibc.machine @@ -0,0 +1,63 @@ +# +# Automatically generated make config: don't edit +# Wed Jul 9 13:37:36 2008 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_avr32 is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +TARGET_mips=y +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set +# TARGET_xtensa is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="mips" +FORCE_OPTIONS_FOR_ARCH=y +ARCH_CFLAGS="-mno-split-addresses" +CONFIG_MIPS_O32_ABI=y +# CONFIG_MIPS_N32_ABI is not set +# CONFIG_MIPS_N64_ABI is not set +# CONFIG_MIPS_ISA_1 is not set +# CONFIG_MIPS_ISA_2 is not set +# CONFIG_MIPS_ISA_3 is not set +# CONFIG_MIPS_ISA_4 is not set +CONFIG_MIPS_ISA_MIPS32=y +# CONFIG_MIPS_ISA_MIPS64 is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +# ARCH_BIG_ENDIAN is not set +ARCH_WANTS_BIG_ENDIAN=y +# ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +# DO_C99_MATH is not set +# UCLIBC_HAS_FENV is not set +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/recipes/uclibc/uclibc-nptl/qemux86/uClibc.machine b/recipes/uclibc/uclibc-nptl/qemux86/uClibc.machine new file mode 100644 index 0000000000..44fec169c8 --- /dev/null +++ b/recipes/uclibc/uclibc-nptl/qemux86/uClibc.machine @@ -0,0 +1,68 @@ +# +# Automatically generated make config: don't edit +# Fri Nov 23 15:49:33 2007 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +TARGET_i386=y +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="i386" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_GENERIC_386=y +# CONFIG_386 is not set +# CONFIG_486 is not set +# CONFIG_586 is not set +# CONFIG_586MMX is not set +# CONFIG_686 is not set +# CONFIG_PENTIUMII is not set +# CONFIG_PENTIUMIII is not set +# CONFIG_PENTIUM4 is not set +# CONFIG_K6 is not set +# CONFIG_K7 is not set +# CONFIG_ELAN is not set +# CONFIG_CRUSOE is not set +# CONFIG_WINCHIPC6 is not set +# CONFIG_WINCHIP2 is not set +# CONFIG_CYRIXIII is not set +# CONFIG_NEHEMIAH is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_LITTLE_ENDIAN=y + +# +# Using Little Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + -- cgit v1.2.3 From decb589caaf190e3a6f98db2193117dbcf349a6b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 8 Jan 2010 14:13:10 -0800 Subject: gcc-svn.inc: Bump SRCREV now it can build and run qemux86 image Signed-off-by: Khem Raj --- recipes/gcc/gcc-svn.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/gcc/gcc-svn.inc b/recipes/gcc/gcc-svn.inc index 6885de3b31..8d7dec0e9d 100644 --- a/recipes/gcc/gcc-svn.inc +++ b/recipes/gcc/gcc-svn.inc @@ -1,7 +1,7 @@ DEFAULT_PREFERENCE = "-999" ARM_INSTRUCTION_SET = "arm" -SRCREV = "155631" +SRCREV = "155680" require gcc-common.inc -- cgit v1.2.3 From 6af085bc2658693a90299c7a4bf5026a7b8fd43d Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Fri, 8 Jan 2010 23:32:26 +0100 Subject: fsodeviced: add a general config file and one for om-gta02 machine Signed-off-by: Klaus Kurzmann --- recipes/freesmartphone/fsodeviced/fsodeviced.conf | 83 ++++++++++++++++++++ .../fsodeviced/om-gta02/fsodeviced.conf | 90 ++++++++++++++++++++++ recipes/freesmartphone/fsodeviced_git.bb | 11 ++- 3 files changed, 181 insertions(+), 3 deletions(-) create mode 100644 recipes/freesmartphone/fsodeviced/fsodeviced.conf create mode 100644 recipes/freesmartphone/fsodeviced/om-gta02/fsodeviced.conf diff --git a/recipes/freesmartphone/fsodeviced/fsodeviced.conf b/recipes/freesmartphone/fsodeviced/fsodeviced.conf new file mode 100644 index 0000000000..4e72778415 --- /dev/null +++ b/recipes/freesmartphone/fsodeviced/fsodeviced.conf @@ -0,0 +1,83 @@ +####################################################################################### +# FSO Device Daemon Configuration File -- for SYSTEM INTEGRATORS only +######################################################################################## +[logging] +# Log level: DEBUG, INFO (default), WARNING, ERROR +# Override via environment as FSO_LOG_LEVEL +log_level = DEBUG +# Where to log to: none (default), stderr, stderr:colors, file, syslog +# Override via environment as FSO_LOG_TO +log_to = stderr:colors +# Log Destination (valid only for log_to = file) +# Override via environment as FSO_LOG_DESTINATION +log_destination = /var/log/fsodeviced.log + +[fsodevice] +# No settings yet + +[fsodevice.accelerometer] +# Which accelerometer variant plugin to use: none (default), lis302 +device_type = lis302 + +[fsodevice.accelerometer_lis302] +# Which input node to read from +inputnode = /input/event2 +# How many samples to process, when in use +sample_rate = 100 +# Threshhold to program, when in use +threshold = 100 +# Scale to program, when in use +full_scale = 2.3 + +[fsodevice.player_alsa] +# No settings yet + +[fsodevice.player_canberra] +# No settings yet + +[fsodevice.player_gstreamer] +# No settings yet + +[fsodevice.alsa_audio] +# Which Audio Player variant plugin to use: none (default), alsa, canberra, gstreamer +player_type = alsa + +[fsodevice.kernel26_display] +# No settings yet + +[fsodevice.kernel26_leds] +# No settings yet + +[fsodevice.kernel26_powersupply] +# No settings yet + +[fsodevice.kernel26_rfkill] +# No settings yet + +[fsodevice.kernel26_rtc] +# No settings yet + +[fsodevice.kernel_info] +# No settings yet + +[fsodevice.kernel_input] +# Which input objects to ignore (by product id substring) +#ignore_by_id = Microsoft;Macintosh +# Which input objects to ignore (by physical path substring) +#ignore_by_path = usb +# Which buttons/switches to report. +# Format: ,,, +#report1 = AUX,key,169,1 +#report4 = HEADSET,switch,2,0 + +[fsodevice.kernel_idle] +# Which input objects to ignore (by product id substring) +#ignore_by_id = Microsoft;Macintosh +# Which input objects to ignore (by physical path substring) +#ignore_by_path = usb + +# Enable this on openmoko devices +#[fsodevice.powercontrol_openmoko] + +# Enable this on thinkpad devices +#[fsodevice.powercontrol.thinkpad] diff --git a/recipes/freesmartphone/fsodeviced/om-gta02/fsodeviced.conf b/recipes/freesmartphone/fsodeviced/om-gta02/fsodeviced.conf new file mode 100644 index 0000000000..e9ff0c5896 --- /dev/null +++ b/recipes/freesmartphone/fsodeviced/om-gta02/fsodeviced.conf @@ -0,0 +1,90 @@ +####################################################################################### +# FSO Device Daemon Configuration File -- for SYSTEM INTEGRATORS only +######################################################################################## +[logging] +# Log level: DEBUG, INFO (default), WARNING, ERROR +# Override via environment as FSO_LOG_LEVEL +log_level = INFO +# Where to log to: none (default), stderr, stderr:colors, file, syslog +# Override via environment as FSO_LOG_TO +log_to = file +# Log Destination (valid only for log_to = file) +# Override via environment as FSO_LOG_DESTINATION +log_destination = /var/log/fsodeviced.log + +[fsodevice] +# No settings yet + +[fsodevice.accelerometer_lis302] +# Which input node to read from +inputnode = /input/event2 +# How many samples to process, when in use +sample_rate = 100 +# Threshhold to program, when in use +threshold = 100 +# Scale to program, when in use +full_scale = 2.3 + +[fsodevice.accelerometer] +# Which accelerometer variant plugin to use: none (default), lis302 +device_type = lis302 + +[fsodevice.player_alsa] +# No settings yet + +[fsodevice.player_canberra] +# No settings yet + +[fsodevice.player_gstreamer] +# No settings yet + +[fsodevice.alsa_audio] +# Which Audio Player variant plugin to use: none (default), alsa, canberra, gstreamer +player_type = alsa + +[fsodevice.kernel26_display] +# No settings yet + +[fsodevice.kernel26_leds] +# No settings yet + +[fsodevice.kernel26_powersupply] +# No settings yet + +[fsodevice.kernel26_rfkill] +# No settings yet + +[fsodevice.kernel26_rtc] +# No settings yet + +[fsodevice.kernel_info] +# No settings yet + +[fsodevice.kernel_input] +# Which input objects to ignore (by product id substring) +ignore_by_id = lis302 +# Which input objects to ignore (by physical path substring) +#ignore_by_path = usb +# Which buttons/switches to report. +# Format: ,,, +report4 = HEADSET,switch,2,0 +report1 = AUX,key,169,1 +report3 = USB,key,356,0 +report2 = POWER,key,116,1 + +[fsodevice.kernel_idle] +# Which input objects to ignore (by product id substring) +ignore_by_id = lis302 +# Which input objects to ignore (by physical path substring) +#ignore_by_path = usb +idle = 5 +idle_dim = 15 +idle_prelock = 9 +idle_lock = 1 +suspend = 30 + +# Enable this on openmoko devices +#[fsodevice.powercontrol_openmoko] + +# Enable this on thinkpad devices +#[fsodevice.powercontrol.thinkpad] diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb index 2516c89aff..69c948f733 100644 --- a/recipes/freesmartphone/fsodeviced_git.bb +++ b/recipes/freesmartphone/fsodeviced_git.bb @@ -6,7 +6,7 @@ RDEPENDS += "libcanberra-alsa" RRECOMMENDS += "fso-alsa-data" PV = "0.9.0+gitr${SRCREV}" PE = "1" -PR = "${INC_PR}.6" +PR = "${INC_PR}.7" EXTRA_OECONF = "\ --enable-kernel26-rfkill \ @@ -18,11 +18,16 @@ inherit update-rc.d INITSCRIPT_NAME = "fsodeviced" INITSCRIPT_PARAMS = "defaults 27" -SRC_URI += "file://fsodeviced" +SRC_URI += "file://fsodeviced file://fsodeviced.conf" do_install_append() { install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/fsodeviced ${D}${sysconfdir}/init.d/ + install -d ${D}${sysconfdir}/freesmartphone/ + install -m 0644 ${WORKDIR}/fsodeviced.conf ${D}${sysconfdir}/freesmartphone/ } -FILES_${PN} += "${sysconfdir}/init.d/fsodeviced" +FILES_${PN} += " + ${sysconfdir}/init.d/fsodeviced \ + ${sysconfdir}/freesmartphone/fsodeviced.conf \ +" -- cgit v1.2.3 From 8ae6638c4e9f369d3ada8a2c4255b0810ffda8da Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Fri, 8 Jan 2010 23:32:46 +0100 Subject: fsonetworkd: add a config file Signed-off-by: Klaus Kurzmann --- recipes/freesmartphone/fsonetworkd/fsonetworkd.conf | 19 +++++++++++++++++++ recipes/freesmartphone/fsonetworkd_git.bb | 11 ++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 recipes/freesmartphone/fsonetworkd/fsonetworkd.conf diff --git a/recipes/freesmartphone/fsonetworkd/fsonetworkd.conf b/recipes/freesmartphone/fsonetworkd/fsonetworkd.conf new file mode 100644 index 0000000000..d8e5cee971 --- /dev/null +++ b/recipes/freesmartphone/fsonetworkd/fsonetworkd.conf @@ -0,0 +1,19 @@ +####################################################################################### +# FSO Network Daemon Configuration File -- for SYSTEM INTEGRATORS only +######################################################################################## +[logging] +# Log level: DEBUG, INFO (default), WARNING, ERROR +# Override via environment as FSO_LOG_LEVEL +log_level = INFO +# Where to log to: none (default), stderr, stderr:colors, file, syslog +# Override via environment as FSO_LOG_TO +log_to = file +# Log Destination (valid only for log_to = file) +# Override via environment as FSO_LOG_DESTINATION +log_destination = /var/log/fsonetworkd.log + +[fsonetwork] +# No settings yet + +[fsonetwork.sharing] +# No settings yet diff --git a/recipes/freesmartphone/fsonetworkd_git.bb b/recipes/freesmartphone/fsonetworkd_git.bb index 002624fc2b..50adeb86da 100644 --- a/recipes/freesmartphone/fsonetworkd_git.bb +++ b/recipes/freesmartphone/fsonetworkd_git.bb @@ -2,4 +2,13 @@ require cornucopia.inc inherit fso-plugin DEPENDS += "libnl2" PV = "0.1.0.0+gitr${SRCREV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" + +SRC_URI += "file://fsonetworkd.conf" + +do_install_append() { + install -d ${D}${sysconfdir}/freesmartphone/ + install -m 0644 ${WORKDIR}/fsonetworkd.conf ${D}${sysconfdir}/freesmartphone/ +} + +FILES_${PN} += "${sysconfdir}/freesmartphone/fsonetworkd.conf" -- cgit v1.2.3 From 220405a05589222ff56d8e09d61c75055d262b40 Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Fri, 8 Jan 2010 23:33:13 +0100 Subject: fsousaged: add a general config file and one for om-gta02 machine Signed-off-by: Klaus Kurzmann --- recipes/freesmartphone/fsousaged/fsousaged.conf | 32 ++++++++++++++++++++++ .../fsousaged/om-gta02/fsousaged.conf | 32 ++++++++++++++++++++++ recipes/freesmartphone/fsousaged_git.bb | 11 +++++++- 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 recipes/freesmartphone/fsousaged/fsousaged.conf create mode 100644 recipes/freesmartphone/fsousaged/om-gta02/fsousaged.conf diff --git a/recipes/freesmartphone/fsousaged/fsousaged.conf b/recipes/freesmartphone/fsousaged/fsousaged.conf new file mode 100644 index 0000000000..542bc7562f --- /dev/null +++ b/recipes/freesmartphone/fsousaged/fsousaged.conf @@ -0,0 +1,32 @@ +####################################################################################### +# FSO Usage Daemon Configuration File -- for SYSTEM INTEGRATORS only +######################################################################################## +[logging] +# Log level: DEBUG, INFO (default), WARNING, ERROR +# Override via environment as FSO_LOG_LEVEL +log_level = INFO +# Where to log to: none (default), stderr, stderr:colors, file, syslog +# Override via environment as FSO_LOG_TO +log_to = file +# Log Destination (valid only for log_to = file) +# Override via environment as FSO_LOG_DESTINATION +log_destination = /var/log/fsousaged.log + +[fsousage] +# Which low level suspend/resume variant to use: none (default), kernel26, openmoko +lowlevel_type = kernel26 +# FOR DEBUGGING ONLY: Do not suspend, but instead sleep a couple of seconds +debug_do_not_suspend = 0 +# FOR DEBUGGING ONLY: Enable every registered resource on startup +debug_enable_on_startup = 0 +# FOR DEBUGGING ONLY: Whether resource activation should be synchronized with the registration lifecycle: always (default), startup, shutdown, never +sync_resources_with_lifecycle = always + +[fsousage.lowlevel_kernel26] +# No settings yet + +[fsousage.lowlevel_openmoko] +# No settings yet + +[fsousage.dbus_service] +# No settings yet diff --git a/recipes/freesmartphone/fsousaged/om-gta02/fsousaged.conf b/recipes/freesmartphone/fsousaged/om-gta02/fsousaged.conf new file mode 100644 index 0000000000..1e5761330e --- /dev/null +++ b/recipes/freesmartphone/fsousaged/om-gta02/fsousaged.conf @@ -0,0 +1,32 @@ +####################################################################################### +# FSO Usage Daemon Configuration File -- for SYSTEM INTEGRATORS only +######################################################################################## +[logging] +# Log level: DEBUG, INFO (default), WARNING, ERROR +# Override via environment as FSO_LOG_LEVEL +log_level = INFO +# Where to log to: none (default), stderr, stderr:colors, file, syslog +# Override via environment as FSO_LOG_TO +log_to = file +# Log Destination (valid only for log_to = file) +# Override via environment as FSO_LOG_DESTINATION +log_destination = /var/log/fsousaged.log + +[fsousage] +# Which low level suspend/resume variant to use: none (default), kernel26, openmoko +lowlevel_type = openmoko +# FOR DEBUGGING ONLY: Do not suspend, but instead sleep a couple of seconds +debug_do_not_suspend = 0 +# FOR DEBUGGING ONLY: Enable every registered resource on startup +debug_enable_on_startup = 0 +# FOR DEBUGGING ONLY: Whether resource activation should be synchronized with the registration lifecycle: always (default), startup, shutdown, never +sync_resources_with_lifecycle = always + +[fsousage.lowlevel_kernel26] +# No settings yet + +[fsousage.lowlevel_openmoko] +# No settings yet + +[fsousage.dbus_service] +# No settings yet diff --git a/recipes/freesmartphone/fsousaged_git.bb b/recipes/freesmartphone/fsousaged_git.bb index a7e4a1c0ee..0157df5b77 100644 --- a/recipes/freesmartphone/fsousaged_git.bb +++ b/recipes/freesmartphone/fsousaged_git.bb @@ -1,4 +1,13 @@ require cornucopia.inc inherit fso-plugin PV = "0.9.0.1+gitr${SRCREV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" + +SRC_URI += "file://fsousaged.conf" + +do_install_append() { + install -d ${D}${sysconfdir}/freesmartphone/ + install -m 0644 ${WORKDIR}/fsousaged.conf ${D}${sysconfdir}/freesmartphone/ +} + +FILES_${PN} += "${sysconfdir}/freesmartphone/fsousaged.conf" -- cgit v1.2.3 From 83bbeb2722b8ecc8e4a862ced78a355e478d1829 Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Sat, 9 Jan 2010 00:32:55 +0100 Subject: fsodeviced: fix parsing error and disable accel and rfkill in om-gta02 config as fsodeviced segfaults with one of those two enabled. Signed-off-by: Klaus Kurzmann --- recipes/freesmartphone/fsodeviced/fsodeviced.conf | 24 +++++++++++------------ recipes/freesmartphone/fsodeviced_git.bb | 5 +---- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/recipes/freesmartphone/fsodeviced/fsodeviced.conf b/recipes/freesmartphone/fsodeviced/fsodeviced.conf index 4e72778415..0d7b43a3f8 100644 --- a/recipes/freesmartphone/fsodeviced/fsodeviced.conf +++ b/recipes/freesmartphone/fsodeviced/fsodeviced.conf @@ -17,17 +17,17 @@ log_destination = /var/log/fsodeviced.log [fsodevice.accelerometer] # Which accelerometer variant plugin to use: none (default), lis302 -device_type = lis302 - -[fsodevice.accelerometer_lis302] -# Which input node to read from -inputnode = /input/event2 -# How many samples to process, when in use -sample_rate = 100 -# Threshhold to program, when in use -threshold = 100 -# Scale to program, when in use -full_scale = 2.3 +#device_type = lis302 + +#[fsodevice.accelerometer_lis302] +## Which input node to read from +#inputnode = /input/event2 +## How many samples to process, when in use +#sample_rate = 100 +## Threshhold to program, when in use +#threshold = 100 +## Scale to program, when in use +#full_scale = 2.3 [fsodevice.player_alsa] # No settings yet @@ -51,7 +51,7 @@ player_type = alsa [fsodevice.kernel26_powersupply] # No settings yet -[fsodevice.kernel26_rfkill] +#[fsodevice.kernel26_rfkill] # No settings yet [fsodevice.kernel26_rtc] diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb index 69c948f733..640f9d9835 100644 --- a/recipes/freesmartphone/fsodeviced_git.bb +++ b/recipes/freesmartphone/fsodeviced_git.bb @@ -27,7 +27,4 @@ do_install_append() { install -m 0644 ${WORKDIR}/fsodeviced.conf ${D}${sysconfdir}/freesmartphone/ } -FILES_${PN} += " - ${sysconfdir}/init.d/fsodeviced \ - ${sysconfdir}/freesmartphone/fsodeviced.conf \ -" +FILES_${PN} += "${sysconfdir}/init.d/fsodeviced ${sysconfdir}/freesmartphone/fsodeviced.conf" -- cgit v1.2.3 From e663af41b4201e330522f71626cb817cc89af559 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 9 Jan 2010 02:28:54 +0100 Subject: vala: bump 0.7.9.6, fixes libfsoframework build Signed-off-by: Martin Jansa --- conf/checksums.ini | 4 ++++ recipes/vala/vala-native_0.7.9.5.bb | 3 --- recipes/vala/vala-native_0.7.9.6.bb | 3 +++ recipes/vala/vala_0.7.9.5.bb | 2 -- recipes/vala/vala_0.7.9.6.bb | 2 ++ 5 files changed, 9 insertions(+), 5 deletions(-) delete mode 100644 recipes/vala/vala-native_0.7.9.5.bb create mode 100644 recipes/vala/vala-native_0.7.9.6.bb delete mode 100644 recipes/vala/vala_0.7.9.5.bb create mode 100644 recipes/vala/vala_0.7.9.6.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 1ce93ced4a..1cc08703e6 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -27406,6 +27406,10 @@ sha256=debefbb3ea7ae8318f6f5a064e593ecd1d93ba6c5c86c14019800f724c46690e md5=147b5b9c37d4e2d814f582d6cf78c96a sha256=e1d6e89eb8689fb3422502a9020a39fff0a5e6ddb3eb47eed9ac9a00636e06b0 +[http://www.freesmartphone.org/sources/vala-0.7.9.6.tar.bz2] +md5=d13ead3d2926b9e7abd7fe61c3a48181 +sha256=48332dd1a31ac8cf29536111730d6710f79c5e825ca3acd8927e662fb0f25f48 + [http://www.freesmartphone.org/sources/vala-0.7.9.tar.bz2] md5=f2f8b2914361db599fd6392ec27f7042 sha256=a71d59cfed750ff402fece5e7d4b656caf3377d5a6bfe5339894f1b13769d58d diff --git a/recipes/vala/vala-native_0.7.9.5.bb b/recipes/vala/vala-native_0.7.9.5.bb deleted file mode 100644 index d6c239f7bf..0000000000 --- a/recipes/vala/vala-native_0.7.9.5.bb +++ /dev/null @@ -1,3 +0,0 @@ -require vala_${PV}.bb -inherit native -DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala-native_0.7.9.6.bb b/recipes/vala/vala-native_0.7.9.6.bb new file mode 100644 index 0000000000..d6c239f7bf --- /dev/null +++ b/recipes/vala/vala-native_0.7.9.6.bb @@ -0,0 +1,3 @@ +require vala_${PV}.bb +inherit native +DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala_0.7.9.5.bb b/recipes/vala/vala_0.7.9.5.bb deleted file mode 100644 index a5b1958f2c..0000000000 --- a/recipes/vala/vala_0.7.9.5.bb +++ /dev/null @@ -1,2 +0,0 @@ -require vala.inc -PR = "${INC_PR}.0" diff --git a/recipes/vala/vala_0.7.9.6.bb b/recipes/vala/vala_0.7.9.6.bb new file mode 100644 index 0000000000..a5b1958f2c --- /dev/null +++ b/recipes/vala/vala_0.7.9.6.bb @@ -0,0 +1,2 @@ +require vala.inc +PR = "${INC_PR}.0" -- cgit v1.2.3 From 814f07a935d8be208fa219c5f04a43a72bbd4ea6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 9 Jan 2010 02:10:49 +0100 Subject: shr: temporary disable libsdl-ttf_2.0.9 Signed-off-by: Martin Jansa --- conf/distro/include/preferred-shr-versions.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index c726e5fdf9..c826a79131 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -39,3 +39,6 @@ UDEV_GE_141 = "1" # Downgraded # python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py PREFERRED_VERSION_python-pygtk = "2.10.4" + +# 2.0.9 tries to use /usr/include/SDL from buildhost and fails with QA Cross Compile Badness +PREFERRED_VERSION_libsdl-ttf = "2.0.3" -- cgit v1.2.3 From 72946befb22063bc21be9b56c5c9179af7709ee4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 9 Jan 2010 02:02:24 +0100 Subject: fsodeviced: bump revision for fsodevice.accelerometer fix, reenable in config Signed-off-by: Martin Jansa --- conf/distro/include/sane-srcrevs-fso.inc | 2 +- recipes/freesmartphone/fsodeviced/fsodeviced.conf | 24 +++++++++++----------- .../fsodeviced/om-gta02/fsodeviced.conf | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index 726efec3b5..6b4c494684 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -4,7 +4,7 @@ FSO_CORNUCOPIA_SRCREV ?= "70b87d6e8b04f0bf0078702f6467e037eb4fdb28" SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-fsodeviced ?= "44a4aabf382995c9f3141ec09b202f0e569a484d" SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsomusicd ?= "${FSO_CORNUCOPIA_SRCREV}" diff --git a/recipes/freesmartphone/fsodeviced/fsodeviced.conf b/recipes/freesmartphone/fsodeviced/fsodeviced.conf index 0d7b43a3f8..4e72778415 100644 --- a/recipes/freesmartphone/fsodeviced/fsodeviced.conf +++ b/recipes/freesmartphone/fsodeviced/fsodeviced.conf @@ -17,17 +17,17 @@ log_destination = /var/log/fsodeviced.log [fsodevice.accelerometer] # Which accelerometer variant plugin to use: none (default), lis302 -#device_type = lis302 - -#[fsodevice.accelerometer_lis302] -## Which input node to read from -#inputnode = /input/event2 -## How many samples to process, when in use -#sample_rate = 100 -## Threshhold to program, when in use -#threshold = 100 -## Scale to program, when in use -#full_scale = 2.3 +device_type = lis302 + +[fsodevice.accelerometer_lis302] +# Which input node to read from +inputnode = /input/event2 +# How many samples to process, when in use +sample_rate = 100 +# Threshhold to program, when in use +threshold = 100 +# Scale to program, when in use +full_scale = 2.3 [fsodevice.player_alsa] # No settings yet @@ -51,7 +51,7 @@ player_type = alsa [fsodevice.kernel26_powersupply] # No settings yet -#[fsodevice.kernel26_rfkill] +[fsodevice.kernel26_rfkill] # No settings yet [fsodevice.kernel26_rtc] diff --git a/recipes/freesmartphone/fsodeviced/om-gta02/fsodeviced.conf b/recipes/freesmartphone/fsodeviced/om-gta02/fsodeviced.conf index e9ff0c5896..acee3f84ac 100644 --- a/recipes/freesmartphone/fsodeviced/om-gta02/fsodeviced.conf +++ b/recipes/freesmartphone/fsodeviced/om-gta02/fsodeviced.conf @@ -51,7 +51,7 @@ player_type = alsa [fsodevice.kernel26_powersupply] # No settings yet -[fsodevice.kernel26_rfkill] +#[fsodevice.kernel26_rfkill] # No settings yet [fsodevice.kernel26_rtc] @@ -84,7 +84,7 @@ idle_lock = 1 suspend = 30 # Enable this on openmoko devices -#[fsodevice.powercontrol_openmoko] +[fsodevice.powercontrol_openmoko] # Enable this on thinkpad devices #[fsodevice.powercontrol.thinkpad] -- cgit v1.2.3 From f6534b194ad1ea08ab6dee29c5a6296f564314e4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 9 Jan 2010 10:19:48 +0100 Subject: efl: nudge SRCREV up a bit --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 34ce856a8e..d4240bb050 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -334,7 +334,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "44908" +EFL_SRCREV ?= "44950" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" -- cgit v1.2.3 From f72efbb544c45594650cd5380d8dd417aa257f5f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 9 Jan 2010 11:46:55 +0100 Subject: linux-openmoko-devel: bump revision for NAND speedup Signed-off-by: Martin Jansa --- conf/distro/include/sane-srcrevs.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index d4240bb050..9bcb10b4c1 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -149,8 +149,8 @@ SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7" SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5" SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9" SRCREV_pn-linux-openmoko-2.6.32 ?= "5e5d518ecad86cc891d91c88d3b144eb30339bca" -SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12" -SRCREV_pn-linux-openmoko-shr-devel ?= "b90406de472c1aa5371ab593a2bb79136d5de658" +SRCREV_pn-linux-openmoko-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88" +SRCREV_pn-linux-openmoko-shr-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88" SRCREV_pn-linux-openmoko-shr-drm-devel ?= "dd6196f5cc0cd707e7f694f52d7e847e066a1967" SRCREV_pn-linux-sgh-i900 ?= "7e5f8bd3864485e5fc66cb946e09f18b5a32cebc" SRCREV_pn-llvm-gcc4 ?= "374" -- cgit v1.2.3 From eda60d48fa4f727f26d7b852695b45f2415475ec Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 9 Jan 2010 13:00:10 +0100 Subject: gtk+: remove DEFAULT_PREFERENCE -1. 2.18.3 is the new default. --- recipes/gtk+/gtk+_2.12.0.bb | 3 --- recipes/gtk+/gtk+_2.12.11.bb | 3 --- recipes/gtk+/gtk+_2.12.3.bb | 3 --- recipes/gtk+/gtk+_2.14.1.bb | 3 --- recipes/gtk+/gtk+_2.16.4.bb | 3 --- recipes/gtk+/gtk+_2.16.6.bb | 3 --- recipes/gtk+/gtk+_2.18.0.bb | 3 --- recipes/gtk+/gtk+_2.18.3.bb | 3 --- 8 files changed, 24 deletions(-) diff --git a/recipes/gtk+/gtk+_2.12.0.bb b/recipes/gtk+/gtk+_2.12.0.bb index 0378040656..a9a9a498a8 100644 --- a/recipes/gtk+/gtk+_2.12.0.bb +++ b/recipes/gtk+/gtk+_2.12.0.bb @@ -2,9 +2,6 @@ require gtk+.inc PR = "${INC_PR}.0" -# disable per default - untested and not all patches included. -DEFAULT_PREFERENCE = "-1" - SRC_URI += "file://disable-print.patch;patch=1 \ file://cellrenderer-cairo.patch;patch=1;pnum=0 \ file://entry-cairo.patch;patch=1;pnum=0 \ diff --git a/recipes/gtk+/gtk+_2.12.11.bb b/recipes/gtk+/gtk+_2.12.11.bb index 1e04c2b319..f345711c4c 100644 --- a/recipes/gtk+/gtk+_2.12.11.bb +++ b/recipes/gtk+/gtk+_2.12.11.bb @@ -2,9 +2,6 @@ require gtk+.inc PR = "${INC_PR}.0" -# disable per default - untested and not all patches included. -DEFAULT_PREFERENCE = "-1" - SRC_URI += "file://cellrenderer-cairo.patch;patch=1;pnum=0 \ file://entry-cairo.patch;patch=1;pnum=0 \ file://scrolled-placement.patch;patch=1;pnum=0" diff --git a/recipes/gtk+/gtk+_2.12.3.bb b/recipes/gtk+/gtk+_2.12.3.bb index 1e04c2b319..f345711c4c 100644 --- a/recipes/gtk+/gtk+_2.12.3.bb +++ b/recipes/gtk+/gtk+_2.12.3.bb @@ -2,9 +2,6 @@ require gtk+.inc PR = "${INC_PR}.0" -# disable per default - untested and not all patches included. -DEFAULT_PREFERENCE = "-1" - SRC_URI += "file://cellrenderer-cairo.patch;patch=1;pnum=0 \ file://entry-cairo.patch;patch=1;pnum=0 \ file://scrolled-placement.patch;patch=1;pnum=0" diff --git a/recipes/gtk+/gtk+_2.14.1.bb b/recipes/gtk+/gtk+_2.14.1.bb index 2d78edb4a4..29b99c3a3c 100644 --- a/recipes/gtk+/gtk+_2.14.1.bb +++ b/recipes/gtk+/gtk+_2.14.1.bb @@ -2,9 +2,6 @@ require gtk+.inc PR = "${INC_PR}.0" -# disable per default - this uses as little patches as possible -DEFAULT_PREFERENCE = "-1" - EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes" PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" diff --git a/recipes/gtk+/gtk+_2.16.4.bb b/recipes/gtk+/gtk+_2.16.4.bb index 77595c3309..34d4491d66 100644 --- a/recipes/gtk+/gtk+_2.16.4.bb +++ b/recipes/gtk+/gtk+_2.16.4.bb @@ -2,9 +2,6 @@ require gtk+.inc PR = "${INC_PR}.0" -# disabled per default - this uses as little patches as possible -DEFAULT_PREFERENCE = "-1" - EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes" PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" diff --git a/recipes/gtk+/gtk+_2.16.6.bb b/recipes/gtk+/gtk+_2.16.6.bb index 77595c3309..34d4491d66 100644 --- a/recipes/gtk+/gtk+_2.16.6.bb +++ b/recipes/gtk+/gtk+_2.16.6.bb @@ -2,9 +2,6 @@ require gtk+.inc PR = "${INC_PR}.0" -# disabled per default - this uses as little patches as possible -DEFAULT_PREFERENCE = "-1" - EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes" PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" diff --git a/recipes/gtk+/gtk+_2.18.0.bb b/recipes/gtk+/gtk+_2.18.0.bb index 77595c3309..34d4491d66 100644 --- a/recipes/gtk+/gtk+_2.18.0.bb +++ b/recipes/gtk+/gtk+_2.18.0.bb @@ -2,9 +2,6 @@ require gtk+.inc PR = "${INC_PR}.0" -# disabled per default - this uses as little patches as possible -DEFAULT_PREFERENCE = "-1" - EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes" PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" diff --git a/recipes/gtk+/gtk+_2.18.3.bb b/recipes/gtk+/gtk+_2.18.3.bb index 77595c3309..34d4491d66 100644 --- a/recipes/gtk+/gtk+_2.18.3.bb +++ b/recipes/gtk+/gtk+_2.18.3.bb @@ -2,9 +2,6 @@ require gtk+.inc PR = "${INC_PR}.0" -# disabled per default - this uses as little patches as possible -DEFAULT_PREFERENCE = "-1" - EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes" PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" -- cgit v1.2.3 From fe63fdaa70f4054c4d0b2de4d45c5f5bf0fa0bc8 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 9 Jan 2010 19:03:34 +0100 Subject: linux: gta03 won't ever see the light of day. remove references to it from three OM kernel recipes. --- recipes/linux/linux-openmoko-2.6.28_git.bb | 1 - recipes/linux/linux-openmoko-shr-devel_git.bb | 1 - recipes/linux/linux-openmoko-shr-drm-devel_git.bb | 1 - 3 files changed, 3 deletions(-) diff --git a/recipes/linux/linux-openmoko-2.6.28_git.bb b/recipes/linux/linux-openmoko-2.6.28_git.bb index 0b779384d9..2e1d133546 100644 --- a/recipes/linux/linux-openmoko-2.6.28_git.bb +++ b/recipes/linux/linux-openmoko-2.6.28_git.bb @@ -18,7 +18,6 @@ S = "${WORKDIR}/git" CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig" CONFIG_NAME_om-gta02 = "gta02_packaging_defconfig" -CONFIG_NAME_om-gta03 = "gta03_defconfig" do_configure_prepend() { install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe diff --git a/recipes/linux/linux-openmoko-shr-devel_git.bb b/recipes/linux/linux-openmoko-shr-devel_git.bb index 480dd4b652..f94bdafd7d 100644 --- a/recipes/linux/linux-openmoko-shr-devel_git.bb +++ b/recipes/linux/linux-openmoko-shr-devel_git.bb @@ -19,7 +19,6 @@ S = "${WORKDIR}/git" CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig" CONFIG_NAME_om-gta02 = "gta02_packaging_defconfig" -CONFIG_NAME_om-gta03 = "gta03_defconfig" do_configure_prepend() { install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe diff --git a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb index 11838c6a1b..494e4cebd7 100644 --- a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb +++ b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb @@ -27,7 +27,6 @@ S = "${WORKDIR}/git" CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig" CONFIG_NAME_om-gta02 = "gta02_drm_defconfig" -CONFIG_NAME_om-gta03 = "gta03_defconfig" do_configure_prepend() { install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe -- cgit v1.2.3 From 9c5e5bbc025641ef0555f0b0576addec1e47b799 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 9 Jan 2010 19:11:48 +0100 Subject: vala: bump to 0.7.9.7, libfsoframework compiles again (really), fsomusicd: updated revision for new vala compatibility Signed-off-by: Martin Jansa --- conf/checksums.ini | 4 ++++ conf/distro/include/sane-srcrevs-fso.inc | 2 +- recipes/vala/vala-native_0.7.9.6.bb | 3 --- recipes/vala/vala-native_0.7.9.7.bb | 3 +++ recipes/vala/vala_0.7.9.6.bb | 2 -- recipes/vala/vala_0.7.9.7.bb | 2 ++ 6 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 recipes/vala/vala-native_0.7.9.6.bb create mode 100644 recipes/vala/vala-native_0.7.9.7.bb delete mode 100644 recipes/vala/vala_0.7.9.6.bb create mode 100644 recipes/vala/vala_0.7.9.7.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 1cc08703e6..1f4fdc1b9a 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -27410,6 +27410,10 @@ sha256=e1d6e89eb8689fb3422502a9020a39fff0a5e6ddb3eb47eed9ac9a00636e06b0 md5=d13ead3d2926b9e7abd7fe61c3a48181 sha256=48332dd1a31ac8cf29536111730d6710f79c5e825ca3acd8927e662fb0f25f48 +[http://www.freesmartphone.org/sources/vala-0.7.9.7.tar.bz2] +md5=b05fd8f4420152ca0080a99750863f3f +sha256=46805e1c19707de043820a1474a8b3775ea3b698a0b539eabd7b86f0f3ad888a + [http://www.freesmartphone.org/sources/vala-0.7.9.tar.bz2] md5=f2f8b2914361db599fd6392ec27f7042 sha256=a71d59cfed750ff402fece5e7d4b656caf3377d5a6bfe5339894f1b13769d58d diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index 6b4c494684..d1573cfd90 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -7,7 +7,7 @@ SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsodeviced ?= "44a4aabf382995c9f3141ec09b202f0e569a484d" SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsomusicd ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-fsomusicd ?= "3233c80585dfbc0e77ee5549f9d7fb1a60b5a0f9" SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsotdld ?= "${FSO_CORNUCOPIA_SRCREV}" diff --git a/recipes/vala/vala-native_0.7.9.6.bb b/recipes/vala/vala-native_0.7.9.6.bb deleted file mode 100644 index d6c239f7bf..0000000000 --- a/recipes/vala/vala-native_0.7.9.6.bb +++ /dev/null @@ -1,3 +0,0 @@ -require vala_${PV}.bb -inherit native -DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala-native_0.7.9.7.bb b/recipes/vala/vala-native_0.7.9.7.bb new file mode 100644 index 0000000000..d6c239f7bf --- /dev/null +++ b/recipes/vala/vala-native_0.7.9.7.bb @@ -0,0 +1,3 @@ +require vala_${PV}.bb +inherit native +DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala_0.7.9.6.bb b/recipes/vala/vala_0.7.9.6.bb deleted file mode 100644 index a5b1958f2c..0000000000 --- a/recipes/vala/vala_0.7.9.6.bb +++ /dev/null @@ -1,2 +0,0 @@ -require vala.inc -PR = "${INC_PR}.0" diff --git a/recipes/vala/vala_0.7.9.7.bb b/recipes/vala/vala_0.7.9.7.bb new file mode 100644 index 0000000000..a5b1958f2c --- /dev/null +++ b/recipes/vala/vala_0.7.9.7.bb @@ -0,0 +1,2 @@ +require vala.inc +PR = "${INC_PR}.0" -- cgit v1.2.3 From dbcb75bd0190f8732b30318b9579929dec8452fa Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Sat, 9 Jan 2010 21:53:57 +0100 Subject: fsodatad: add a config file Signed-off-by: Klaus Kurzmann --- recipes/freesmartphone/fsodatad/fsodatad.conf | 19 +++++++++++++++++++ recipes/freesmartphone/fsodatad_git.bb | 11 ++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 recipes/freesmartphone/fsodatad/fsodatad.conf diff --git a/recipes/freesmartphone/fsodatad/fsodatad.conf b/recipes/freesmartphone/fsodatad/fsodatad.conf new file mode 100644 index 0000000000..85919cf6aa --- /dev/null +++ b/recipes/freesmartphone/fsodatad/fsodatad.conf @@ -0,0 +1,19 @@ +####################################################################################### +# FSO Data Daemon Configuration File -- for SYSTEM INTEGRATORS only +######################################################################################## +[logging] +# Log level: DEBUG, INFO (default), WARNING, ERROR +# Override via environment as FSO_LOG_LEVEL +log_level = INFO +# Where to log to: none (default), stderr, stderr:colors, file, syslog +# Override via environment as FSO_LOG_TO +log_to = file +# Log Destination (valid only for log_to = file) +# Override via environment as FSO_LOG_DESTINATION +log_destination = /var/log/fsodatad.log + +[fsodata] +# No settings yet + +[fsodata.world] +# No settings yet diff --git a/recipes/freesmartphone/fsodatad_git.bb b/recipes/freesmartphone/fsodatad_git.bb index de13bedc0a..c2933ed4da 100644 --- a/recipes/freesmartphone/fsodatad_git.bb +++ b/recipes/freesmartphone/fsodatad_git.bb @@ -1,6 +1,15 @@ require cornucopia.inc inherit fso-plugin -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" PV = "0.0.0+gitr${SRCREV}" DEPENDS += "libxml2 mobile-broadband-provider-info" + +SRC_URI += "file://fsodatad.conf" + +do_install_append() { + install -d ${D}${sysconfdir}/freesmartphone/ + install -m 0644 ${WORKDIR}/fsodatad.conf ${D}${sysconfdir}/freesmartphone/ +} + +FILES_${PN} += "${sysconfdir}/freesmartphone/fsodatad.conf" -- cgit v1.2.3 From 150e8d822c777b4d5c260a978e36ba98996707f0 Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Sat, 9 Jan 2010 21:54:36 +0100 Subject: fsotdld: add a config file Signed-off-by: Klaus Kurzmann --- recipes/freesmartphone/fsotdld/fsotdld.conf | 43 +++++++++++++++++++++++++++++ recipes/freesmartphone/fsotdld_git.bb | 11 +++++++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 recipes/freesmartphone/fsotdld/fsotdld.conf diff --git a/recipes/freesmartphone/fsotdld/fsotdld.conf b/recipes/freesmartphone/fsotdld/fsotdld.conf new file mode 100644 index 0000000000..07e91b0ff8 --- /dev/null +++ b/recipes/freesmartphone/fsotdld/fsotdld.conf @@ -0,0 +1,43 @@ +####################################################################################### +# FSO Time Date Location Daemon Configuration File -- for SYSTEM INTEGRATORS only +######################################################################################## +[logging] +# Log level: DEBUG, INFO (default), WARNING, ERROR +# Override via environment as FSO_LOG_LEVEL +log_level = INFO +# Where to log to: none (default), stderr, stderr:colors, file, syslog +# Override via environment as FSO_LOG_TO +log_to = file +# Log Destination (valid only for log_to = file) +# Override via environment as FSO_LOG_DESTINATION +log_destination = /var/log/fsotdld.log + +[fsotdl] +gps_receiver_transport = serial +gps_receiver_port = /dev/rfcomm0 +gps_receiver_speed = 9600 + +[fsotdl.alarm] +# No settings yet + +[fsotdl.source_ntp] +# Which server to use; default is 'pool.ntp.org' +server = time.windows.com + +[fsotdl.source_gsm] +# No settings yet + +[fsotdl.provider_gps_nmea] +# No settings yet + +[fsotdl.provider_gps] +provider_type = nmea + +[fsotdl.sync_time] +# Which sources to use; what is available depends on the loaded modules +sources = ntp;gsm +# Which current timezone file to use; default is /etc/timezone +timezone_file = /etc/timezone +# Path to zoneinfo files, default is /usr/share/zoneinfo +zoneinfo_dir = /usr/share/zoneinfo + diff --git a/recipes/freesmartphone/fsotdld_git.bb b/recipes/freesmartphone/fsotdld_git.bb index a70bf596f5..14659bdeff 100644 --- a/recipes/freesmartphone/fsotdld_git.bb +++ b/recipes/freesmartphone/fsotdld_git.bb @@ -1,6 +1,15 @@ require cornucopia.inc inherit fso-plugin -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" PV = "0.0.0+gitr${SRCREV}" DEPENDS += "libfsotransport libfsoresource" + +SRC_URI += "file://fsotdld.conf" + +do_install_append() { + install -d ${D}${sysconfdir}/freesmartphone/ + install -m 0644 ${WORKDIR}/fsotdld.conf ${D}${sysconfdir}/freesmartphone/ +} + +FILES_${PN} += "${sysconfdir}/freesmartphone/fsotdld.conf" -- cgit v1.2.3 From 2a616172157dcd78ebb783bbaa41d49a6cbbcb36 Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Sat, 9 Jan 2010 21:54:59 +0100 Subject: fsogsmd: add a config file Signed-off-by: Klaus Kurzmann --- recipes/freesmartphone/fsogsmd/fsogsmd.conf | 57 +++++++++++++++++++++++++++++ recipes/freesmartphone/fsogsmd_git.bb | 11 +++++- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 recipes/freesmartphone/fsogsmd/fsogsmd.conf diff --git a/recipes/freesmartphone/fsogsmd/fsogsmd.conf b/recipes/freesmartphone/fsogsmd/fsogsmd.conf new file mode 100644 index 0000000000..0da34cff4d --- /dev/null +++ b/recipes/freesmartphone/fsogsmd/fsogsmd.conf @@ -0,0 +1,57 @@ +####################################################################################### +# FSO GSM Daemon Configuration File -- for SYSTEM INTEGRATORS only +######################################################################################## +[logging] +# Log level: DEBUG, INFO (default), WARNING, ERROR +# Override via environment as FSO_LOG_LEVEL +log_level = INFO +# Where to log to: none (default), stderr, stderr:colors, file, syslog +# Override via environment as FSO_LOG_TO +log_to = file +# Log Destination (valid only for log_to = file) +# Override via environment as FSO_LOG_DESTINATION +log_destination = /var/log/fsogsmd.log + +[fsogsm] +# Combined modem access string, prefered over individual configs below +modem_access = serial:/dev/ttyUSB0:115200 + +# Which modem to use: singleline, ti_calypso, freescale_neptune, cinterion_mc75, qualcomm_msm +modem_type = singleline +# Which transport channel: serial, pty +modem_transport = serial +# Which port to communicate with: or +modem_port = /dev/ttyUSB0 +# Which speed to use for the transport/port +modem_speed = 115200 + +# Global modem init sequence; this is the first sequence that gets sent to the modem after power cycling +modem_init = E0V1;+CMEE=1;+CRC=1;+CSCS="UCS2" + +# Following configuration options are in the form channel__, with state being one of +# "init", "unlocked", "registered", "suspend", "resume", and name being the channel name (modem specific) +# Whether these strings override, append, or are honored at all depends on the actual modem plugin +# Example usage for one channel named 'main': +channel_init_main = +CSNS=0;+CMGF=0;+CLIP=1 +channel_unlocked_main = +SIM_NOW_UNLOCKED;+CSDH=1;+COLP=1;+CCWA=1;+CNMI=2,1,2,2,1 +channel_registered_main = +NET_NOW_REGISTERED +channel_suspend_main = +PREPARE_FOR_SUSPEND +channel_resume_main = +RECOVER_AFTER_RESUME + +# Where to store SMS: (default=/tmp/fsogsmd/sms/) +sms_storage_dir = /tmp/fsogsmd/sms/ + +[fsogsm.modem_singleline] +# No settings yet + +[fsogsm.modem_cinterion_mc75] +# No settings yet + +[fsogsm.modem_ti_calypso] +# No settings yet + +[fsogsm.modem_qualcomm_msm] +# No settings yet + +[fsogsm.dbus_service] +# No settings yet diff --git a/recipes/freesmartphone/fsogsmd_git.bb b/recipes/freesmartphone/fsogsmd_git.bb index 9186ab990b..ec46d62ff3 100644 --- a/recipes/freesmartphone/fsogsmd_git.bb +++ b/recipes/freesmartphone/fsogsmd_git.bb @@ -1,6 +1,15 @@ require cornucopia.inc inherit fso-plugin -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" PV = "0.2.0+gitr${SRCREV}" DEPENDS += "libfsoresource libgsm0710mux" + +SRC_URI += "file://fsogsmd.conf" + +do_install_append() { + install -d ${D}${sysconfdir}/freesmartphone/ + install -m 0644 ${WORKDIR}/fsogsmd.conf ${D}${sysconfdir}/freesmartphone/ +} + +FILES_${PN} += "${sysconfdir}/freesmartphone/fsogsmd.conf" -- cgit v1.2.3 From 182b7546b2fd5fa27ecb8c606fe5ad8c95f76ee2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 10 Jan 2010 00:11:58 +0100 Subject: navit: bump svnrev, all unset LC_ALL to Exec in .desktop files (gps coords are wrong with LC_ALL set) Signed-off-by: Martin Jansa --- conf/distro/include/sane-srcrevs.inc | 2 +- recipes/navit/files/navit.desktop | 2 +- recipes/navit/files/shr/navit.desktop | 2 +- recipes/navit/files/shr/navitD.desktop | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 9bcb10b4c1..7f1f7742ce 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -181,7 +181,7 @@ SRCREV_pn-mplayer-maemo ?= "342" SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b" -SRCREV_pn-navit ?= "2890" +SRCREV_pn-navit ?= "2902" SRCREV_pn-navit-icons ?= "2871" SRCREV_pn-neod ?= "4617" SRCREV_pn-neomis ?= "6" diff --git a/recipes/navit/files/navit.desktop b/recipes/navit/files/navit.desktop index 05ecc1d4ee..df16d492bb 100644 --- a/recipes/navit/files/navit.desktop +++ b/recipes/navit/files/navit.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Navit Comment=GPS Navigation -Exec=navit +Exec=unset LC_ALL && navit Icon=navit Terminal=false Type=Application diff --git a/recipes/navit/files/shr/navit.desktop b/recipes/navit/files/shr/navit.desktop index d313d6a63e..b1c0d1321d 100644 --- a/recipes/navit/files/shr/navit.desktop +++ b/recipes/navit/files/shr/navit.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Navit Comment=GPS Navigation -Exec=fsoraw -r CPU,GPS -- navit +Exec=unset LC_ALL && fsoraw -r CPU,GPS -- navit Icon=navit Terminal=false Type=Application diff --git a/recipes/navit/files/shr/navitD.desktop b/recipes/navit/files/shr/navitD.desktop index 9a2378a3ea..fc77efcda2 100644 --- a/recipes/navit/files/shr/navitD.desktop +++ b/recipes/navit/files/shr/navitD.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=NavitD Comment=GPS Navigation Display blanking disabled -Exec=fsoraw -r CPU,GPS,Display -- navit +Exec=unset LC_ALL && fsoraw -r CPU,GPS,Display -- navit Icon=navitD Terminal=false Type=Application -- cgit v1.2.3 From 7baeaabe52552c1705ebafd72a390cee078ad8aa Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 10 Jan 2010 01:33:39 +0100 Subject: zaurus: first reorganization of XSERVER preferences. * Put all in the common zaurus-2.6.inc. --- conf/machine/akita.conf | 4 ---- conf/machine/c7x0.conf | 2 -- conf/machine/collie.conf | 2 -- conf/machine/include/zaurus-2.6.inc | 19 +++++++++++++++++++ conf/machine/spitz.conf | 4 ---- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 6f71787fa1..9930c89c6a 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -21,7 +21,3 @@ MACHINE_DISPLAY_PPI = "216" UBOOT_MACHINE = "akita_config" UBOOT_ENTRYPOINT = "0xA1000000" UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" - -# xserver-kdrive 1.3.0.0 is still the only working version: -XSERVER = "xserver-kdrive-1300-fbdev" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 16073fee82..4daedde482 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -15,8 +15,6 @@ require conf/machine/include/zaurus-clamshell.inc # please set the right value in your local.conf ROOT_FLASH_SIZE = "25" -XSERVER = "xserver-kdrive-imageon" - MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "640" MACHINE_DISPLAY_HEIGHT_PIXELS = "480" diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 47f6e30dfd..66995e9b09 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -9,8 +9,6 @@ ROOT_FLASH_SIZE = "14" # actually 14680064 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" -XSERVER = "xserver-kdrive-fbdev" - MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index cd83a7b5a6..02a48629c8 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -17,9 +17,28 @@ EXTRA_IMAGEDEPENDS += "zaurus-installer" SERIAL_CONSOLE = "115200 ttyS0" SERIAL_CONSOLE_collie = "115200 ttySA0" +# FIXME: xserver-xorg is in testing + +# deprecated defaults PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +XSERVER = "xserver-kdrive-fbdev" + +# c7x0 uses kdrive-imageon (W100) PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon" +XSERVER_c7x0 = "xserver-kdrive-imageon" + +# collie uses kdrive-fbdev PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev" +XSERVER_collie = "xserver-kdrive-fbdev" + +# FIXME xserver-kdrive 1.3.0.0 is still the only working version ? +PREFERRED_PROVIDER_virtual/xserver_akita = "xserver-kdrive-1300" +XSERVER_akita = "xserver-kdrive-1300-fbdev" + +# spitz uses xserver-xorg +PREFERRED_PROVIDER_virtual/xserver_spitz = "xserver-xorg" +XSERVER_spitz = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev" +PREFERRED_PROVIDER_virtual/libgl_spitz = "mesa-dri" PCMCIA_MANAGER ?= "pcmciautils" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 0d79977180..4fe62b5f43 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -27,7 +27,3 @@ MACHINE_DISPLAY_PPI = "216" UBOOT_MACHINE = "akita_config" UBOOT_ENTRYPOINT = "0xA1000000" UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" - -XSERVER = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev" -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" -PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" -- cgit v1.2.3 From 657fea552c0145701838ae96422741fe5b097fdf Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Wed, 6 Jan 2010 00:42:47 +0100 Subject: linux-on-qualcomm-s-msm: htcraphael: first step sanitizing defconfig for GNU/Linux disable virtual keyboard, enable sysv ipc, enable nfs, enable cifs, enable rtc --- .../linux-on-qualcomm-s-msm/htcraphael/defconfig | 71 ++++++++++++++-------- 1 file changed, 45 insertions(+), 26 deletions(-) diff --git a/recipes/linux/linux-on-qualcomm-s-msm/htcraphael/defconfig b/recipes/linux/linux-on-qualcomm-s-msm/htcraphael/defconfig index 97e043e72e..d4f6a118a0 100644 --- a/recipes/linux/linux-on-qualcomm-s-msm/htcraphael/defconfig +++ b/recipes/linux/linux-on-qualcomm-s-msm/htcraphael/defconfig @@ -1,12 +1,12 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.27 -# Sun Sep 6 20:35:49 2009 +# Wed Jan 6 00:18:25 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_GENERIC_GPIO=y -CONFIG_GENERIC_TIME=y +# CONFIG_GENERIC_TIME is not set CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_MMU=y # CONFIG_NO_IOPORT is not set @@ -36,10 +36,11 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y -# CONFIG_SYSVIPC is not set -# CONFIG_POSIX_MQUEUE is not set +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set @@ -52,15 +53,14 @@ CONFIG_GROUP_SCHED=y # CONFIG_RT_GROUP_SCHED is not set CONFIG_USER_SCHED=y # CONFIG_CGROUP_SCHED is not set -CONFIG_SYSFS_DEPRECATED=y -CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set # CONFIG_USER_NS is not set # CONFIG_PID_NS is not set -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" +# CONFIG_BLK_DEV_INITRD is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_PANIC_TIMEOUT=3 @@ -185,6 +185,8 @@ CONFIG_ARCH_MSM=y CONFIG_MSM_AMSS_VERSION=5200 CONFIG_MSM_AMSS_VERSION_WINCE=y CONFIG_MSM_AMSS_VERSION_5200=y +# CONFIG_MSM_AMSS_VERSION_6120 is not set +# CONFIG_MSM_AMSS_VERSION_6125 is not set # CONFIG_MSM_AMSS_VERSION_6150 is not set # CONFIG_MSM_AMSS_VERSION_6210 is not set # CONFIG_MSM_AMSS_VERSION_6220 is not set @@ -206,6 +208,8 @@ CONFIG_MACH_HTCDIAMOND=y CONFIG_MACH_HTCDIAMOND_CDMA=y # CONFIG_MACH_HTCBLACKSTONE is not set # CONFIG_MACH_HTCKOVSKY is not set +# CONFIG_MACH_HTCTOPAZ is not set +# CONFIG_MACH_HTCRHODIUM is not set # CONFIG_HTC_HEADSET is not set CONFIG_MSM_BATTCHG=y # CONFIG_TROUT_BATTCHG is not set @@ -281,9 +285,7 @@ CONFIG_ARM_THUMB=y # # Kernel Features # -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y +# CONFIG_TICK_ONESHOT is not set CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_PREEMPT=y CONFIG_HZ=100 @@ -313,7 +315,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=76M console=ttyMSM2,115200n8" +CONFIG_CMDLINE=" debug " # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set @@ -688,7 +690,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI=y # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set CONFIG_TOUCHSCREEN_MSM=y -CONFIG_MSM_VIRTUAL_KEYBOARD=y +# CONFIG_MSM_VIRTUAL_KEYBOARD is not set # CONFIG_MSM_BLACKSTONE_PAD is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_ATI_REMOTE is not set @@ -890,11 +892,7 @@ CONFIG_FONT_8x8=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set -CONFIG_LOGO_DIAMRAPH_CLUT224=y +# CONFIG_LOGO is not set # CONFIG_SOUND is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y @@ -928,6 +926,11 @@ CONFIG_USB_FUNCTION_ADB=y CONFIG_USB_FUNCTION_MASS_STORAGE=y CONFIG_USB_FUNCTION_DIAG=y CONFIG_USB_FUNCTION_ETHER=y +CONFIG_USB_FUNCTION_RNDIS=y +# CONFIG_USB_FUNCTION_FSYNC is not set +# CONFIG_USB_FUNCTION_SERIAL is not set +# CONFIG_USB_FUNCTION_PROJECTOR is not set +# CONFIG_USB_FUNCTION_MTP_TUNNEL is not set # # OTG and related infrastructure @@ -982,9 +985,10 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # # RTC interfaces # -# CONFIG_RTC_INTF_SYSFS is not set +CONFIG_RTC_INTF_SYSFS=y # CONFIG_RTC_INTF_PROC is not set -# CONFIG_RTC_INTF_DEV is not set +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y CONFIG_RTC_INTF_ALARM=y # CONFIG_RTC_DRV_TEST is not set @@ -1103,6 +1107,7 @@ CONFIG_TMPFS=y # CONFIG_YAFFS_FS is not set # CONFIG_JFFS2_FS is not set CONFIG_CRAMFS=y +# CONFIG_SQUASHFS is not set # CONFIG_VXFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_OMFS_FS is not set @@ -1112,10 +1117,26 @@ CONFIG_CRAMFS=y # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y -# CONFIG_NFS_FS is not set +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set # CONFIG_NFSD is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set +CONFIG_CIFS=y +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +CONFIG_CIFS_XATTR=y +# CONFIG_CIFS_POSIX is not set +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -1164,7 +1185,7 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_15 is not set # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set -# CONFIG_NLS_UTF8 is not set +CONFIG_NLS_UTF8=y # CONFIG_DLM is not set # @@ -1216,8 +1237,6 @@ CONFIG_FRAME_POINTER=y CONFIG_HAVE_FTRACE=y CONFIG_HAVE_DYNAMIC_FTRACE=y # CONFIG_FTRACE is not set -# 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_SAMPLES is not set -- cgit v1.2.3 From 2610f65bd7d2902302be6650b9536aa43cc58656 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sun, 10 Jan 2010 12:12:19 +0100 Subject: sysstat: refactor into .inc file, add 9.0.6 --- conf/checksums.ini | 4 ++++ recipes/sysstat/sysstat.inc | 22 ++++++++++++++++++++++ recipes/sysstat/sysstat_8.1.5.bb | 16 ++-------------- recipes/sysstat/sysstat_8.1.6.bb | 24 ++---------------------- recipes/sysstat/sysstat_9.0.6.bb | 2 ++ 5 files changed, 32 insertions(+), 36 deletions(-) create mode 100644 recipes/sysstat/sysstat.inc create mode 100644 recipes/sysstat/sysstat_9.0.6.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 1f4fdc1b9a..90f402c387 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -25838,6 +25838,10 @@ sha256=26c05ef7666881eb1d60291a4293e67d75dbf048ca8a30f6b9eb3dc86ad1b6b0 md5=d7b8f27b83ff080ff824177d65a7dae0 sha256=0a63da1c99b6a9b6a93b6fd0a9391c7d8216f658d2bea0ba81999e261c6b6649 +[http://pagesperso-orange.fr/sebastien.godard/sysstat-9.0.6.tar.gz] +md5=c05ca01878a4069199d9af93cbe39c8e +sha256=464a4e23ab3b7d6886a5b8aa108e05b1a7f42654e1c398a040c88c81f30168c9 + [http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-1.1.7.tar.bz2] md5=a77bde5adc5ee8822b0764ff786ccc09 sha256=fdd50cb114151c66b8180c0ce90ba0e99f77a69770ac21598a87be935eec2224 diff --git a/recipes/sysstat/sysstat.inc b/recipes/sysstat/sysstat.inc new file mode 100644 index 0000000000..dcc6c85456 --- /dev/null +++ b/recipes/sysstat/sysstat.inc @@ -0,0 +1,22 @@ +DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux." +HOMEPAGE = "http://pagesperso-orange.fr/sebastien.godard/" +LICENSE = "GPL" +SECTION = "console/utils" +INC_PR = "r2" + +DEPENDS = "virtual/libintl" + +SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz" + +inherit autotools + +do_configure_prepend() { + sed -i s,'-g $(MAN_GROUP)','', Makefile.in +} + +FILES_${PN} += "${libdir}/sa" + +TARGET_CC_ARCH += "${LDFLAGS}" +LDFLAGS_append_linux-uclibc = " -lintl" +LDFLAGS_append_linux-uclibceabi = " -lintl" +LDFLAGS_append_linux-uclibcspe = " -lintl" diff --git a/recipes/sysstat/sysstat_8.1.5.bb b/recipes/sysstat/sysstat_8.1.5.bb index 0f394ed259..1aed038a54 100644 --- a/recipes/sysstat/sysstat_8.1.5.bb +++ b/recipes/sysstat/sysstat_8.1.5.bb @@ -1,15 +1,3 @@ -DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux." -HOMEPAGE = "http://pagesperso-orange.fr/sebastien.godard/" -LICENSE = "GPL" -SECTION = "console/utils" - -SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz" - -inherit autotools - -do_configure_prepend() { - sed -i s,'-g $(MAN_GROUP)','', Makefile.in -} - -FILES_${PN} += "${libdir}/sa" +require sysstat.inc +PR = "${INC_PR}.0" diff --git a/recipes/sysstat/sysstat_8.1.6.bb b/recipes/sysstat/sysstat_8.1.6.bb index 42dd5e2d75..8dce9efedd 100644 --- a/recipes/sysstat/sysstat_8.1.6.bb +++ b/recipes/sysstat/sysstat_8.1.6.bb @@ -1,22 +1,2 @@ -DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux." -HOMEPAGE = "http://pagesperso-orange.fr/sebastien.godard/" -LICENSE = "GPL" -SECTION = "console/utils" -PR = "r1" - -DEPENDS = "virtual/libintl" - -SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz" - -inherit autotools - -do_configure_prepend() { - sed -i s,'-g $(MAN_GROUP)','', Makefile.in -} - -FILES_${PN} += "${libdir}/sa" - -TARGET_CC_ARCH += "${LDFLAGS}" -LDFLAGS_append_linux-uclibc = " -lintl" -LDFLAGS_append_linux-uclibceabi = " -lintl" -LDFLAGS_append_linux-uclibcspe = " -lintl" +require sysstat.inc +PR = "${INC_PR}.0" diff --git a/recipes/sysstat/sysstat_9.0.6.bb b/recipes/sysstat/sysstat_9.0.6.bb new file mode 100644 index 0000000000..8dce9efedd --- /dev/null +++ b/recipes/sysstat/sysstat_9.0.6.bb @@ -0,0 +1,2 @@ +require sysstat.inc +PR = "${INC_PR}.0" -- cgit v1.2.3 From b086d737776d214699843bd6bf4ed6612bd8ecca Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 9 Jan 2010 10:46:50 +0100 Subject: ffmpeg: bump SRCREV --- recipes/ffmpeg/ffmpeg_svn.bb | 2 +- recipes/gstreamer/gst-ffmpeg_0.10.8.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb index 5cb365678b..2fc16e37d6 100644 --- a/recipes/ffmpeg/ffmpeg_svn.bb +++ b/recipes/ffmpeg/ffmpeg_svn.bb @@ -2,7 +2,7 @@ require ffmpeg.inc DEPENDS += "schroedinger libgsm" -SRCREV = "20701" +SRCREV = "21107" PE = "1" PV = "0.5.0+${PR}+svnr${SRCPV}" diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.8.bb b/recipes/gstreamer/gst-ffmpeg_0.10.8.bb index e05d0b0461..f08b60b197 100644 --- a/recipes/gstreamer/gst-ffmpeg_0.10.8.bb +++ b/recipes/gstreamer/gst-ffmpeg_0.10.8.bb @@ -11,7 +11,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \ file://lower-rank.diff;patch=1 \ " -PR = "r1" +PR = "r2" FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" -- cgit v1.2.3 From 8274bc3cdd5c071057d36f85980174215e127d2e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 9 Jan 2010 10:46:56 +0100 Subject: mplayer: bump SRCREV --- recipes/mplayer/mplayer_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb index 2d5adc1792..6d6f78fc94 100644 --- a/recipes/mplayer/mplayer_svn.bb +++ b/recipes/mplayer/mplayer_svn.bb @@ -13,7 +13,7 @@ SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \ file://mplayer-lavc-arm.patch;patch=1 \ " -SRCREV = "30165" +SRCREV = "30247" SRC_URI_append_armv7a = " \ file://omapfb.patch;patch=1 \ file://vo_omapfb.c \ -- cgit v1.2.3 From 31113502d63b822a853eef33e2629c78fba76cb2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 10 Jan 2010 12:21:33 +0100 Subject: navit: fix build with qt4 in staging, only enable floats when you have an fpu --- recipes/navit/navit-fpu.inc | 6 ++++++ recipes/navit/navit.inc | 15 +++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 recipes/navit/navit-fpu.inc diff --git a/recipes/navit/navit-fpu.inc b/recipes/navit/navit-fpu.inc new file mode 100644 index 0000000000..d333b92001 --- /dev/null +++ b/recipes/navit/navit-fpu.inc @@ -0,0 +1,6 @@ + +def get_navit_fpu_setting(bb, d): + if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: + return "--enable-avoid-float" + return "" + diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc index 0b0c36470d..ad29f347ed 100644 --- a/recipes/navit/navit.inc +++ b/recipes/navit/navit.inc @@ -5,11 +5,22 @@ DEPENDS = "glib-2.0 gtk+" RRECOMMENDS = "gpsd speechd flite" PE = "1" -INC_PR = "r4" +INC_PR = "r5" inherit autotools -EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned" +EXTRA_OECONF = " \ + --disable-binding-python \ + --disable-gui-sdl \ + --disable-samplemap \ + --enable-avoid-unaligned \ + --disable-graphics-qt-qpainter \ +" + +# --enable-avoid-float \ +#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points +require navit-fpu.inc +EXTRA_OECONF += "${@get_navit_fpu_setting(bb, d)}" PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale" -- cgit v1.2.3 From 371ee0f79ef1ee4d5ba01035ff1e99c0ba59ae7f Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 10 Jan 2010 12:58:29 +0000 Subject: alsa-lib: Bump PR, r1.5 appeared somehow in angstrom unstable feed and moves current r0.5 to morgue. --- recipes/alsa/alsa-lib_1.0.20.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/alsa/alsa-lib_1.0.20.bb b/recipes/alsa/alsa-lib_1.0.20.bb index eff114de4b..b21a890fd9 100644 --- a/recipes/alsa/alsa-lib_1.0.20.bb +++ b/recipes/alsa/alsa-lib_1.0.20.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" LICENSE = "LGPL" +PR = "r2" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, -- cgit v1.2.3 From f3aefd497f216d9fe0240625305f7a9a28da16c7 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 10 Jan 2010 13:00:18 +0000 Subject: xextproto-70-includes: New old package, that provides headers required to compile ancient X servers (e. g. kdrive). --- recipes/xorg-proto/xextproto-70-includes_7.0.5.bb | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 recipes/xorg-proto/xextproto-70-includes_7.0.5.bb diff --git a/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb b/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb new file mode 100644 index 0000000000..db9cec6c09 --- /dev/null +++ b/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb @@ -0,0 +1,26 @@ +# Build of xserver-kdrive is not possible with xextproto >= 7.1. +# This package allows to install old 7.0 includes in parallel. +# akita and spitz needs them: +FILESPATH = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xextproto-7.0:${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xextproto:${@os.path.dirname(bb.data.getVar('FILE',d,1))}/files" +PR_append = ".0" + +require xextproto_7.0.5.bb + +XORG_PN = "xextproto" +EXTRA_OECONF += "--includedir=${includedir}/xextproto-70" + +#export INHIBIT_AUTO_STAGE = "1" +#SYSROOT_PREPROCESS_FUNCS = "${@bb.data.getVar('SYSROOT_PREPROCESS_FUNCS',d,1).replace('pkgconfig_sysroot_preprocess', '')}" + +do_install_append() { + rm -r ${D}${libdir} +} +## xorg-proto-common.inc would stage all. We need to overwrite it. +do_stage() { +# export INHIBIT_AUTO_STAGE=1 + autotools_stage_includes +# rm -r ${STAGE_TEMP_PREFIX}${libdir} +} +# No, we really do not want to install .pc file and overwrite newer one: +pkgconfig_sysroot_preprocess() { +} -- cgit v1.2.3 From faf1793d478bc800a5ef994e98962c4dd8717d40 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 10 Jan 2010 13:02:36 +0000 Subject: xserver-kdrive: Build against xextproto-70-includes: * Ancient xservers are incompatible with xextproto >= 7.1. * Nobody would want to port working ancient code. * For more see http://lists.linuxtogo.org/pipermail/angstrom-distro-users/2010-January/003011.html * Introduced INC_PR. --- recipes/xorg-xserver/xserver-kdrive-common.inc | 5 ++++- recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb | 2 +- recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb | 2 +- recipes/xorg-xserver/xserver-kdrive_1.4.2.bb | 2 +- recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb | 2 +- recipes/xorg-xserver/xserver-kdrive_1.4.bb | 2 +- recipes/xorg-xserver/xserver-kdrive_1.5.3.bb | 2 +- recipes/xorg-xserver/xserver-kdrive_git.bb | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/recipes/xorg-xserver/xserver-kdrive-common.inc b/recipes/xorg-xserver/xserver-kdrive-common.inc index b00893da6d..fd4b2f6045 100644 --- a/recipes/xorg-xserver/xserver-kdrive-common.inc +++ b/recipes/xorg-xserver/xserver-kdrive-common.inc @@ -1,6 +1,7 @@ LICENSE = "MIT" DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto scrnsaverproto xineramaproto videoproto xextproto xproto \ - libxau libxext libxdmcp libxfont libxrandr tslib virtual/libx11 xtrans" + libxau libxext libxdmcp libxfont libxrandr tslib virtual/libx11 xtrans xextproto-70-includes" +INC_PR = "r28" PKGN ?= "xserver-kdrive" @@ -94,6 +95,8 @@ inherit autotools pkgconfig ARM_INSTRUCTION_SET = "arm" +CFLAGS_prepend = "-I${STAGING_INCDIR}/xextproto-70 " + EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-dga --disable-dri --disable-xinerama \ --disable-xf86misc --disable-xf86vidmode \ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb index 1b052e7926..34b5c0d05e 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb @@ -3,7 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r27" +PR = "${INC_PR}.0" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb index b6322769ab..25715a82a8 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb @@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman" RDEPENDS += "hal" PE = "1" -PR = "r8" +PR = "${INC_PR}.0" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb index e6e791ad4f..d0b7ac17e0 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb @@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman" RDEPENDS += "hal" PE = "1" -PR = "r3" +PR = "${INC_PR}.0" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb index 161390179d..187de43996 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb @@ -6,7 +6,7 @@ RDEPENDS += "hal" DEFAULT_PREFERENCE = "-99" PE = "1" -PR = "r4" +PR = "${INC_PR}.0" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.bb index e792c84ce0..43a07f9a3f 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.4.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.4.bb @@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman" RDEPENDS += "hal" PE = "1" -PR = "r6" +PR = "${INC_PR}.0" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb index 686826eca3..ab7c594c87 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb @@ -6,7 +6,7 @@ RDEPENDS += "hal" DEFAULT_PREFERENCE = "-99" PE = "1" -PR = "r1" +PR = "${INC_PR}.0" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/recipes/xorg-xserver/xserver-kdrive_git.bb b/recipes/xorg-xserver/xserver-kdrive_git.bb index 2e1da5c977..4de73e8fc1 100644 --- a/recipes/xorg-xserver/xserver-kdrive_git.bb +++ b/recipes/xorg-xserver/xserver-kdrive_git.bb @@ -6,7 +6,7 @@ PV = "1.4+git${SRCDATE}" DEPENDS += "libxkbfile libxcalibrate pixman" PE = "1" -PR = "r1" +PR = "${INC_PR}.0" FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-git:${FILE_DIRNAME}/xserver-kdrive" SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ -- cgit v1.2.3 From 85908133b0e18f0a0f9bad762590fbe8407149e6 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 10 Jan 2010 14:15:37 +0000 Subject: xextproto-70-includes: Fixed comments. --- recipes/xorg-proto/xextproto-70-includes_7.0.5.bb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb b/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb index db9cec6c09..0a0f9808ef 100644 --- a/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb +++ b/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb @@ -1,6 +1,5 @@ # Build of xserver-kdrive is not possible with xextproto >= 7.1. # This package allows to install old 7.0 includes in parallel. -# akita and spitz needs them: FILESPATH = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xextproto-7.0:${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xextproto:${@os.path.dirname(bb.data.getVar('FILE',d,1))}/files" PR_append = ".0" @@ -9,17 +8,12 @@ require xextproto_7.0.5.bb XORG_PN = "xextproto" EXTRA_OECONF += "--includedir=${includedir}/xextproto-70" -#export INHIBIT_AUTO_STAGE = "1" -#SYSROOT_PREPROCESS_FUNCS = "${@bb.data.getVar('SYSROOT_PREPROCESS_FUNCS',d,1).replace('pkgconfig_sysroot_preprocess', '')}" - do_install_append() { rm -r ${D}${libdir} } -## xorg-proto-common.inc would stage all. We need to overwrite it. +# xorg-proto-common.inc would stage all. We need to overwrite it. do_stage() { -# export INHIBIT_AUTO_STAGE=1 autotools_stage_includes -# rm -r ${STAGE_TEMP_PREFIX}${libdir} } # No, we really do not want to install .pc file and overwrite newer one: pkgconfig_sysroot_preprocess() { -- cgit v1.2.3 From 474c06d9c5462de3329e63fd98f37fc14e8439d2 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 10 Jan 2010 14:16:39 +0000 Subject: balsa: Update to version 2.4.2. --- recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch | 27 ------- recipes/balsa/balsa_2.4.1.bb | 86 ---------------------- recipes/balsa/balsa_2.4.2.bb | 92 ++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 113 deletions(-) delete mode 100644 recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch delete mode 100644 recipes/balsa/balsa_2.4.1.bb create mode 100644 recipes/balsa/balsa_2.4.2.bb diff --git a/recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch b/recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch deleted file mode 100644 index 7e16171ecc..0000000000 --- a/recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugzilla.gnome.org/show_bug.cgi?id=596309 -Index: balsa-2.4.1/src/balsa-app.c -=================================================================== ---- balsa-2.4.1.orig/src/balsa-app.c -+++ balsa-2.4.1/src/balsa-app.c -@@ -436,6 +436,9 @@ balsa_app_init(void) - /* Message filing */ - balsa_app.folder_mru=NULL; - balsa_app.fcc_mru=NULL; -+ -+ g_object_set (gtk_settings_get_default (), -+ "gtk-fallback-icon-theme", "gnome", NULL); - } - - void -Index: balsa-2.4.1/configure.in -=================================================================== ---- balsa-2.4.1.orig/configure.in -+++ balsa-2.4.1/configure.in -@@ -329,6 +329,7 @@ glib-2.0 >= 2.16.0 - gtk+-2.0 >= 2.14.0 - gmime-2.4 - gio-2.0 -+gnome-icon-theme - $gnome_extras - ]) - diff --git a/recipes/balsa/balsa_2.4.1.bb b/recipes/balsa/balsa_2.4.1.bb deleted file mode 100644 index 59b0b10ac0..0000000000 --- a/recipes/balsa/balsa_2.4.1.bb +++ /dev/null @@ -1,86 +0,0 @@ -DESCRIPTION = "Robust and configurable e-mail client for GNOME" -HOMEPAGE = "http://pawsa.fedorapeople.org/balsa/" -SECTION = "x11/network" -LICENSE = "GPL" -SRC_URI = "http://pawsa.fedorapeople.org/balsa/${P}.tar.bz2 \ - file://gnome-icon-theme.patch;patch=1" -PR = "r1" - -DEPENDS = "glib-2.0 libgmime-2.4 gnome-icon-theme gtk+ intltool-native libesmtp libxml-parser-perl-native" -RDEPENDS_${PN} = "gnome-icon-theme" -# FIXME: It is possible to build several variants of balsa: lite (SSL, gqlite/GPE, maybe HTML), -# standard (GNOME, spell checking, HTML), full (Kerberos, LDAP, PGP, Rubrica, X-Face) - -# Options for regular expressions are: NONE (POSIX) glib-2.0 (GRegex) libpcre (PCRE) -DEPENDS += "" - -# Options for remote activation are: libbonobo libunique -DEPENDS += "libunique" - -# Options for HTML view are: gtkhtml-2.0 gtkhtml-3.0 webkit-gtk NONE -DEPENDS += "webkit-gtk" - -# Optional dependencies (missing in OE): Spell checking -#DEPENDS += "gtkspell" - -# Optional dependencies: SSL support: -DEPENDS += "openssl" - -# Optional dependencies: GPE addressbook: -DEPENDS += "sqlite" - -# Optional dependencies: GNOME: -DEPENDS += "gconf libgnome libgnomeui" -#DEPENDS += "gnome-keyring" - -# Optional dependencies: PGP support: -#DEPENDS += "gpgme" - -# Optional dependencies: view source: -#DEPENDS += "gtksourceview2" - -# Optional dependencies: LDAP: -#DEPENDS += "openldap" - -# Options for optional Kerberos 5: heimdal (not in OE) krb5 -#DEPENDS += "krb5" - -# Optional dependencies: Rubrica addressbook: -#DEPENDS += "libxml2" - -# Optional dependencies (not yet in OE): X-Face support: -#DEPENDS += "compface" - -# Optional dependencies: sound support: -#DEPENDS += "libcanberra" - -# FIXME: doc build requires docbook4 and gnome-doc-utils - -inherit autotools - -EXTRA_OECONF="--with-ssl \ - --without-gnome \ - --disable-scrollkeeper \ - --enable-smime \ - --with-sqlite \ - --with-ssl \ - --with-webkit \ - --with-unique \ - --without-gtkspell \ -" -# Broken (does not compile, crashes after symbol fix): -# --enable-touch-ui \ -# Not enabled: -# --with-gtkspell \ -# --with-gpgme \ -# --with-gtksourceview \ -# --with-rubrica \ -# --with-gss \ -# --with-ldap \ -# --with-compface \ -# --with-canberra \ - -do_configure_prepend() { - # aclocal seems to insist on looking in here. Make sure it exists. - mkdir -p ${S}/m4 -} diff --git a/recipes/balsa/balsa_2.4.2.bb b/recipes/balsa/balsa_2.4.2.bb new file mode 100644 index 0000000000..e0675c82ba --- /dev/null +++ b/recipes/balsa/balsa_2.4.2.bb @@ -0,0 +1,92 @@ +DESCRIPTION = "Robust and configurable e-mail client for GNOME" +HOMEPAGE = "http://pawsa.fedorapeople.org/balsa/" +SECTION = "x11/network" +LICENSE = "GPL" +SRC_URI = "http://pawsa.fedorapeople.org/balsa/${P}.tar.bz2" +PR = "r0" + +DEPENDS = "glib-2.0 gmime gnome-icon-theme gtk+ intltool-native libesmtp libxml-parser-perl-native" +RDEPENDS_${PN} = "gnome-icon-theme" +# FIXME: It is possible to build several variants of balsa: lite (SSL, gqlite/GPE, maybe HTML), +# standard (GNOME, spell checking, HTML), full (Kerberos, LDAP, PGP, Rubrica, X-Face) + +# Options for regular expressions are: NONE (POSIX) glib-2.0 (GRegex) libpcre (PCRE) +DEPENDS += "" + +# Options for remote activation are: libbonobo libunique +DEPENDS += "libunique" + +# Options for HTML view are: gtkhtml-2.0 gtkhtml-3.0 webkit-gtk NONE +DEPENDS += "webkit-gtk" + +# Optional dependencies (missing in OE): Spell checking +#DEPENDS += "gtkspell" + +# Optional dependencies: desktop notification: +DEPENDS += "libnotify" + +# Optional dependencies: SSL support: +DEPENDS += "openssl" + +# Optional dependencies: GPE addressbook: +DEPENDS += "sqlite" + +# Optional dependencies: GNOME: +DEPENDS += "gconf libgnome libgnomeui" +#DEPENDS += "gnome-keyring" + +# Optional dependencies: PGP support: +#DEPENDS += "gpgme" + +# Optional dependencies: view source: +#DEPENDS += "gtksourceview2" + +# Optional dependencies: LDAP: +#DEPENDS += "openldap" + +# Options for optional Kerberos 5: heimdal (not in OE) krb5 +#DEPENDS += "krb5" + +# Optional dependencies: automatic online/offline with NetworkManager: +#DEPENDS += "networkmanager" + +# Optional dependencies: Rubrica addressbook: +#DEPENDS += "libxml2" + +# Optional dependencies (not yet in OE): X-Face support: +#DEPENDS += "compface" + +# Optional dependencies: sound support: +#DEPENDS += "libcanberra" + +# FIXME: doc build requires docbook4 and gnome-doc-utils + +inherit autotools + +EXTRA_OECONF="--with-ssl \ + --without-gnome \ + --disable-scrollkeeper \ + --enable-smime \ + --with-sqlite \ + --with-ssl \ + --with-webkit \ + --with-unique \ + --without-gtkspell \ + --without-nm \ +" +# Broken (does not compile, crashes after symbol fix): +# --enable-touch-ui \ +# Not enabled: +# --with-gtkspell \ +# --with-gpgme \ +# --with-gtksourceview \ +# --with-rubrica \ +# --with-gss \ +# --with-ldap \ +# --with-compface \ +# --with-canberra \ + +do_configure_prepend() { + # aclocal seems to insist on looking in here. Make sure it exists. + mkdir -p ${S}/m4 +} -- cgit v1.2.3 From c9157c4a6a756c3550dcd2a544155640dc4e4b85 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 10 Jan 2010 15:26:58 +0100 Subject: linux-kexecboot_2.6.32+2.6.33-rc3: update defconfigs for akita/spitz --- .../akita/defconfig | 1307 ++++++++++++++++++++ .../spitz/defconfig | 76 +- 2 files changed, 1344 insertions(+), 39 deletions(-) create mode 100644 recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/akita/defconfig diff --git a/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/akita/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/akita/defconfig new file mode 100644 index 0000000000..35b2e2723c --- /dev/null +++ b/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/akita/defconfig @@ -0,0 +1,1307 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.33-rc3 +# Sun Jan 10 14:55:55 2010 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_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_ARCH_HAS_CPUFREQ=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_TINY_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_IKCONFIG is not set +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 is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="initramfs.cpio.lzma" +CONFIG_INITRAMFS_ROOT_UID=0 +CONFIG_INITRAMFS_ROOT_GID=0 +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +CONFIG_RD_LZMA=y +# CONFIG_INITRAMFS_COMPRESSION_NONE is not set +# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set +# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set +CONFIG_INITRAMFS_COMPRESSION_LZMA=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EMBEDDED=y +# CONFIG_UID16 is not set +# CONFIG_SYSCTL_SYSCALL is not set +# CONFIG_KALLSYMS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +# CONFIG_ELF_CORE is not set +# 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_AIO=y + +# +# Kernel Performance Events And Counters +# +CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_SLUB_DEBUG is not set +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_CLK=y + +# +# GCOV-based kernel profiling +# +# CONFIG_SLOW_WORK is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=1 +# CONFIG_MODULES is not set +CONFIG_BLOCK=y +# CONFIG_LBDAF is not set +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="deadline" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_INLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +CONFIG_INLINE_READ_UNLOCK=y +# CONFIG_INLINE_READ_UNLOCK_BH is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +CONFIG_INLINE_WRITE_UNLOCK=y +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +CONFIG_FREEZER=y + +# +# System Type +# +CONFIG_MMU=y +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_GEMINI is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_STMP3XXX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_NOMADIK is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_DOVE is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_MMP is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_W90X900 is not set +# CONFIG_ARCH_PNX4008 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_S5PC1XX is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_U300 is not set +# CONFIG_ARCH_DAVINCI is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_BCMRING is not set +# CONFIG_ARCH_U8500 is not set + +# +# Intel PXA2xx/PXA3xx Implementations +# + +# +# Intel/Marvell Dev Platforms (sorted by hardware release time) +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_MACH_ZYLONITE300 is not set +# CONFIG_MACH_ZYLONITE320 is not set +# CONFIG_MACH_LITTLETON is not set +# CONFIG_MACH_TAVOREVB is not set +# CONFIG_MACH_SAAR is not set + +# +# Third Party Dev Platforms (sorted by vendor name) +# +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_VIPER is not set +# CONFIG_MACH_ARCOM_ZEUS is not set +# CONFIG_MACH_BALLOON3 is not set +# CONFIG_MACH_CSB726 is not set +# CONFIG_MACH_ARMCORE is not set +# CONFIG_MACH_EM_X270 is not set +# CONFIG_MACH_EXEDA is not set +# CONFIG_MACH_CM_X300 is not set +# CONFIG_ARCH_GUMSTIX is not set +# CONFIG_MACH_INTELMOTE2 is not set +# CONFIG_MACH_STARGATE2 is not set +# CONFIG_MACH_XCEP is not set +# CONFIG_TRIZEPS_PXA is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set +# CONFIG_MACH_PCM027 is not set +# CONFIG_MACH_COLIBRI is not set +# CONFIG_MACH_COLIBRI300 is not set +# CONFIG_MACH_COLIBRI320 is not set + +# +# End-user Products (sorted by vendor name) +# +# CONFIG_MACH_H4700 is not set +# CONFIG_MACH_H5000 is not set +# CONFIG_MACH_HIMALAYA is not set +# CONFIG_MACH_MAGICIAN is not set +# CONFIG_MACH_MIOA701 is not set +# CONFIG_PXA_EZX is not set +# CONFIG_MACH_MP900C is not set +# CONFIG_ARCH_PXA_PALM is not set +CONFIG_PXA_SHARPSL=y +CONFIG_SHARPSL_PM=y +# CONFIG_MACH_POODLE is not set +# CONFIG_MACH_CORGI is not set +# CONFIG_MACH_SHEPHERD is not set +# CONFIG_MACH_HUSKY is not set +CONFIG_MACH_AKITA=y +CONFIG_MACH_SPITZ=y +CONFIG_MACH_BORZOI=y +# CONFIG_MACH_TOSA is not set +# CONFIG_ARCH_PXA_ESERIES is not set +CONFIG_PXA27x=y +CONFIG_PXA_SHARP_Cxx00=y +CONFIG_PXA_SSP=y +CONFIG_PLAT_PXA=y + +# +# Processor Type +# +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_PABRT_LEGACY=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +CONFIG_ARM_L1_CACHE_SHIFT=5 +# CONFIG_IWMMXT is not set +CONFIG_XSCALE_PMU=y +CONFIG_SHARP_PARAM=y +CONFIG_SHARP_SCOOP=y +CONFIG_COMMON_CLKDEV=y + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +CONFIG_PCCARD=y +CONFIG_PCMCIA=y +# CONFIG_PCMCIA_LOAD_CIS is not set +# CONFIG_PCMCIA_IOCTL is not set + +# +# PC-card bridges +# +CONFIG_PCMCIA_SOC_COMMON=y +CONFIG_PCMCIA_PXA2XX=y +# CONFIG_PCMCIA_DEBUG is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +CONFIG_HZ=100 +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_HIGHMEM is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=999999 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_VIRT_TO_BUS=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_UACCESS_WITH_MEMCPY is not set + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0 +CONFIG_ZBOOT_ROM_BSS=0 +CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 loglevel=3 " +# CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y + +# +# CPU Power Management +# +# CONFIG_CPU_FREQ is not set +# CONFIG_CPU_IDLE is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_APM_EMULATION=y +# CONFIG_PM_RUNTIME is not set +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_NET is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_SYS_HYPERVISOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# 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 +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +CONFIG_MTD_ROM=y +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_GPIO_ADDR is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_H1900 is not set +# CONFIG_MTD_NAND_GPIO is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +CONFIG_MTD_NAND_SHARPSL=y +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set + +# +# UBI - Unsorted block images +# +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set + +# +# 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=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set + +# +# DRBD disabled because PROC_FS, INET or CONNECTOR not selected +# +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_MG_DISK is not set +CONFIG_MISC_DEVICES=y +# CONFIG_AD525X_DPOT is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_ISL29003 is not set +# CONFIG_DS1682 is not set +# CONFIG_TI_DAC7512 is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_IWMC3200TOP is not set +CONFIG_HAVE_IDE=y +CONFIG_IDE=y + +# +# Please see Documentation/ide/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_IDE_GD=y +CONFIG_IDE_GD_ATA=y +# CONFIG_IDE_GD_ATAPI is not set +CONFIG_BLK_DEV_IDECS=y +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_IDE_TASK_IOCTL is not set +CONFIG_IDE_PROC_FS=y + +# +# IDE chipset support/bugfixes +# +# CONFIG_BLK_DEV_PLATFORM is not set +# CONFIG_BLK_DEV_IDEDMA 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 +# CONFIG_ATA is not set +# CONFIG_MD is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set +# CONFIG_INPUT_SPARSEKMAP is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set +CONFIG_INPUT_APMPOWER=y + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_QT2160 is not set +# CONFIG_KEYBOARD_CORGI is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +CONFIG_KEYBOARD_MATRIX=y +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_PXA27x is not set +CONFIG_KEYBOARD_SPITZ=y +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=y +# CONFIG_TOUCHSCREEN_AD7877 is not set +# CONFIG_TOUCHSCREEN_AD7879_I2C is not set +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_CORGI is not set +# CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_EETI is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_TOUCHSCREEN_W90X900 is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_UINPUT is not set +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_DEVKMEM is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_MAX3100 is not set +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +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 + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +# CONFIG_I2C_CHARDEV is not set +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_PXA=y +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_SIMTEC is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set + +# +# Miscellaneous I2C Chip support +# +# 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_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_GPIO is not set +CONFIG_SPI_PXA2XX=y +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set + +# +# PPS support +# +# CONFIG_PPS is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO expanders: +# + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set + +# +# AC97 GPIO expanders: +# +# CONFIG_W1 is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=y +CONFIG_APM_POWER=y +# CONFIG_BATTERY_DS2760 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +# CONFIG_SENSORS_AD7414 is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADCXX is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ADT7462 is not set +# CONFIG_SENSORS_ADT7470 is not set +# CONFIG_SENSORS_ADT7473 is not set +# CONFIG_SENSORS_ADT7475 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_G760A is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM70 is not set +# CONFIG_SENSORS_LM73 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_LM93 is not set +# CONFIG_SENSORS_LTC4215 is not set +# CONFIG_SENSORS_LTC4245 is not set +# CONFIG_SENSORS_LM95241 is not set +CONFIG_SENSORS_MAX1111=y +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_SHT15 is not set +# CONFIG_SENSORS_DME1737 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_ADS7828 is not set +# CONFIG_SENSORS_THMC50 is not set +# CONFIG_SENSORS_TMP401 is not set +# CONFIG_SENSORS_TMP421 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83L786NG is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_SENSORS_LIS3_SPI is not set +# CONFIG_SENSORS_LIS3_I2C is not set +# CONFIG_THERMAL is not set +# CONFIG_WATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_TPS65010 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_MC13783 is not set +# CONFIG_AB3100_CORE is not set +# CONFIG_EZX_PCAP is not set +# CONFIG_MFD_88PM8607 is not set +# CONFIG_AB4500_CORE is not set +# CONFIG_REGULATOR is not set +# CONFIG_MEDIA_SUPPORT is not set + +# +# Graphics support +# +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +# CONFIG_FB_PXA_OVERLAY is not set +# CONFIG_FB_PXA_SMARTPANEL is not set +# CONFIG_FB_PXA_PARAMETERS is not set +# CONFIG_FB_MBX is not set +# CONFIG_FB_W100 is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_LCD_CORGI=y +# CONFIG_LCD_LMS283GF05 is not set +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI9320 is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set +# CONFIG_LCD_PLATFORM is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_GENERIC=y + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_SOUND is not set +# CONFIG_HID_SUPPORT is not set +# CONFIG_USB_SUPPORT 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_PXA=y +# CONFIG_MMC_SDHCI is not set +# CONFIG_MMC_AT91 is not set +# CONFIG_MMC_ATMELMCI is not set +# CONFIG_MMC_SPI is not set +# CONFIG_MEMSTICK is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +# CONFIG_LEDS_PCA9532 is not set +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_GPIO_PLATFORM=y +# CONFIG_LEDS_LP3944 is not set +# CONFIG_LEDS_PCA955X is not set +# CONFIG_LEDS_DAC124S085 is not set +# CONFIG_LEDS_BD2802 is not set +# CONFIG_LEDS_LT3593 is not set + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_IDE_DISK=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set +# CONFIG_LEDS_TRIGGER_GPIO is not set +# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set + +# +# iptables trigger is under Netfilter config (LED target) +# +# CONFIG_ACCESSIBILITY is not set +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set +# CONFIG_DMADEVICES is not set +# CONFIG_AUXDISPLAY is not set +# CONFIG_UIO is not set + +# +# TI VLYNQ +# +# CONFIG_STAGING is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_EXT4_FS=y +# CONFIG_EXT4_FS_XATTR is not set +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD=y +CONFIG_JBD2=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +# CONFIG_FILE_LOCKING is not set +# CONFIG_FSNOTIFY is not set +# CONFIG_DNOTIFY is not set +# CONFIG_INOTIFY is not set +# CONFIG_INOTIFY_USER is not set +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +# CONFIG_MSDOS_FS is not set +# CONFIG_VFAT_FS is not set +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +# CONFIG_PROC_PAGE_MONITOR is not set +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_SUMMARY=y +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +# CONFIG_JFFS2_CMODE_FAVOURLZO is not set +CONFIG_UBIFS_FS=y +# CONFIG_UBIFS_FS_XATTR is not set +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 is not set +# CONFIG_SQUASHFS is not set +# 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 + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set +# CONFIG_NLS is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_ENABLE_WARN_DEPRECATED is not set +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=2048 +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_MEMORY_INIT is not set +CONFIG_FRAME_POINTER=y +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_TRACING_SUPPORT=y +# CONFIG_FTRACE is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_ARM_UNWIND is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_OC_ETM is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_SMACK is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +# CONFIG_CRYPTO_MANAGER is not set +# CONFIG_CRYPTO_MANAGER2 is not set +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +# CONFIG_CRYPTO_CBC is not set +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_GHASH is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# 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 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_ANUBIS is not set +# 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 is not set +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=y +# CONFIG_CRYPTO_ZLIB is not set +CONFIG_CRYPTO_LZO=y + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +# CONFIG_CRYPTO_HW is not set +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +# CONFIG_CRC_CCITT is not set +CONFIG_CRC16=y +# CONFIG_CRC_T10DIF is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y diff --git a/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/spitz/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/spitz/defconfig index 418f01541d..35b2e2723c 100644 --- a/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/spitz/defconfig +++ b/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/spitz/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.33-rc2 -# Tue Dec 29 20:29:41 2009 +# Linux kernel version: 2.6.33-rc3 +# Sun Jan 10 14:55:55 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -57,16 +57,16 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_RELAY is not set # CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="initramfs.cpio.gz" +CONFIG_INITRAMFS_SOURCE="initramfs.cpio.lzma" CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_ROOT_GID=0 CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y +# CONFIG_RD_BZIP2 is not set CONFIG_RD_LZMA=y # CONFIG_INITRAMFS_COMPRESSION_NONE is not set -CONFIG_INITRAMFS_COMPRESSION_GZIP=y +# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set # CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set -# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set +CONFIG_INITRAMFS_COMPRESSION_LZMA=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y @@ -262,9 +262,9 @@ CONFIG_SHARPSL_PM=y # CONFIG_MACH_CORGI is not set # CONFIG_MACH_SHEPHERD is not set # CONFIG_MACH_HUSKY is not set -# CONFIG_MACH_AKITA is not set +CONFIG_MACH_AKITA=y CONFIG_MACH_SPITZ=y -# CONFIG_MACH_BORZOI is not set +CONFIG_MACH_BORZOI=y # CONFIG_MACH_TOSA is not set # CONFIG_ARCH_PXA_ESERIES is not set CONFIG_PXA27x=y @@ -303,8 +303,8 @@ CONFIG_COMMON_CLKDEV=y # CONFIG_ARCH_SUPPORTS_MSI is not set CONFIG_PCCARD=y CONFIG_PCMCIA=y -CONFIG_PCMCIA_LOAD_CIS=y -CONFIG_PCMCIA_IOCTL=y +# CONFIG_PCMCIA_LOAD_CIS is not set +# CONFIG_PCMCIA_IOCTL is not set # # PC-card bridges @@ -354,7 +354,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZBOOT_ROM_BSS=0 -CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 fbcon=rotate:1" +CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 loglevel=3 " # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y @@ -446,7 +446,7 @@ CONFIG_MTD_CFI_I1=y CONFIG_MTD_CFI_I2=y # CONFIG_MTD_CFI_I4 is not set # CONFIG_MTD_CFI_I8 is not set -CONFIG_MTD_RAM=y +# CONFIG_MTD_RAM is not set CONFIG_MTD_ROM=y # CONFIG_MTD_ABSENT is not set @@ -499,7 +499,7 @@ CONFIG_MTD_NAND_SHARPSL=y CONFIG_MTD_UBI=y CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_RESERVE=1 -CONFIG_MTD_UBI_GLUEBI=y +# CONFIG_MTD_UBI_GLUEBI is not set # # UBI debugging options @@ -597,7 +597,7 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_QT2160 is not set # CONFIG_KEYBOARD_CORGI is not set # CONFIG_KEYBOARD_LKKBD is not set -CONFIG_KEYBOARD_GPIO=y +# CONFIG_KEYBOARD_GPIO is not set CONFIG_KEYBOARD_MATRIX=y # CONFIG_KEYBOARD_LM8323 is not set # CONFIG_KEYBOARD_MAX7359 is not set @@ -614,8 +614,9 @@ CONFIG_KEYBOARD_SPITZ=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=y # CONFIG_TOUCHSCREEN_AD7877 is not set -CONFIG_TOUCHSCREEN_AD7879_I2C=y -CONFIG_TOUCHSCREEN_AD7879=y +# CONFIG_TOUCHSCREEN_AD7879_I2C is not set +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set +# CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_CORGI is not set # CONFIG_TOUCHSCREEN_DYNAPRO is not set # CONFIG_TOUCHSCREEN_EETI is not set @@ -651,7 +652,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set -CONFIG_DEVKMEM=y +# CONFIG_DEVKMEM is not set # CONFIG_SERIAL_NONSTANDARD is not set # @@ -671,8 +672,7 @@ 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=y -# CONFIG_HW_RANDOM_TIMERIOMEM is not set +# CONFIG_HW_RANDOM is not set # CONFIG_R3964 is not set # @@ -746,7 +746,7 @@ CONFIG_SPI_PXA2XX=y # CONFIG_PPS is not set CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y +# CONFIG_GPIO_SYSFS is not set # # Memory mapped GPIO expanders: @@ -943,11 +943,7 @@ CONFIG_BACKLIGHT_GENERIC=y # # Display device support # -CONFIG_DISPLAY_SUPPORT=y - -# -# Display hardware drivers -# +# CONFIG_DISPLAY_SUPPORT is not set # # Console display driver support @@ -968,13 +964,16 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -# CONFIG_LOGO is not set +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_SOUND is not set # CONFIG_HID_SUPPORT is not set # CONFIG_USB_SUPPORT is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set -CONFIG_MMC_UNSAFE_RESUME=y +# CONFIG_MMC_UNSAFE_RESUME is not set # # MMC/SD/SDIO Card Drivers @@ -991,7 +990,7 @@ CONFIG_MMC_PXA=y # CONFIG_MMC_SDHCI is not set # CONFIG_MMC_AT91 is not set # CONFIG_MMC_ATMELMCI is not set -CONFIG_MMC_SPI=y +# CONFIG_MMC_SPI is not set # CONFIG_MEMSTICK is not set CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -1013,8 +1012,8 @@ CONFIG_LEDS_GPIO_PLATFORM=y # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -# CONFIG_LEDS_TRIGGER_IDE_DISK is not set -# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +CONFIG_LEDS_TRIGGER_IDE_DISK=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set # CONFIG_LEDS_TRIGGER_GPIO is not set # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set @@ -1055,10 +1054,10 @@ CONFIG_JBD2=y # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set # CONFIG_FILE_LOCKING is not set -CONFIG_FSNOTIFY=y -CONFIG_DNOTIFY=y -CONFIG_INOTIFY=y -CONFIG_INOTIFY_USER=y +# CONFIG_FSNOTIFY is not set +# CONFIG_DNOTIFY is not set +# CONFIG_INOTIFY is not set +# CONFIG_INOTIFY_USER is not set # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set @@ -1087,7 +1086,7 @@ CONFIG_INOTIFY_USER=y # CONFIG_PROC_FS=y CONFIG_PROC_SYSCTL=y -CONFIG_PROC_PAGE_MONITOR=y +# CONFIG_PROC_PAGE_MONITOR is not set CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set @@ -1163,7 +1162,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=2048 -CONFIG_MAGIC_SYSRQ=y +# CONFIG_MAGIC_SYSRQ is not set # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set @@ -1293,16 +1292,15 @@ CONFIG_GENERIC_FIND_LAST_BIT=y # CONFIG_CRC_CCITT is not set CONFIG_CRC16=y # CONFIG_CRC_T10DIF is not set -CONFIG_CRC_ITU_T=y +# CONFIG_CRC_ITU_T is not set CONFIG_CRC32=y -CONFIG_CRC7=y +# CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_LZMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y -- cgit v1.2.3 From 848d298214aa8bff16b5c929cb307ba778c59ee4 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sun, 10 Jan 2010 15:34:42 +0100 Subject: unionfs-modules: move to nonworking. Closes #1189 * These packages must have been non-compiling for about 3,5 years at least --- recipes/nonworking/unionfs/unionfs-modules.inc | 38 ++++++++++++++++++++++ .../nonworking/unionfs/unionfs-modules_1.0.11.bb | 4 +++ .../nonworking/unionfs/unionfs-modules_1.0.13.bb | 11 +++++++ recipes/unionfs/unionfs-modules.inc | 38 ---------------------- recipes/unionfs/unionfs-modules_1.0.11.bb | 4 --- recipes/unionfs/unionfs-modules_1.0.13.bb | 11 ------- 6 files changed, 53 insertions(+), 53 deletions(-) create mode 100644 recipes/nonworking/unionfs/unionfs-modules.inc create mode 100644 recipes/nonworking/unionfs/unionfs-modules_1.0.11.bb create mode 100644 recipes/nonworking/unionfs/unionfs-modules_1.0.13.bb delete mode 100644 recipes/unionfs/unionfs-modules.inc delete mode 100644 recipes/unionfs/unionfs-modules_1.0.11.bb delete mode 100644 recipes/unionfs/unionfs-modules_1.0.13.bb diff --git a/recipes/nonworking/unionfs/unionfs-modules.inc b/recipes/nonworking/unionfs/unionfs-modules.inc new file mode 100644 index 0000000000..5e87288e48 --- /dev/null +++ b/recipes/nonworking/unionfs/unionfs-modules.inc @@ -0,0 +1,38 @@ +unionutils = "unionctl uniondbg" + +include unionfs.inc +inherit module + +SECTION = "kernel/modules" + +EXTRA_OEMAKE = "'CC=${KERNEL_CC}' 'LD=${KERNEL_LD}' \ + 'KERNELVER=${KERNEL_VERSION}' \ + 'LINUXSRC=${STAGING_KERNEL_DIR}' \ + 'CROSS_COMPILE=${TARGET_PREFIX}' \ + 'OS=${TARGET_OS}' \ + ${@get_flags(d, bb)}" + +KCFLAGS = "-D__KERNEL__ -DMODULE -DFISTGEN \ + -DUNIONFS_UNSUPPORTED -DNODEBUG \ + -I. -I${STAGING_KERNEL_DIR}/include \ + -DUNIONFS_VERSION=\"${PV}\" \ + ${CFLAGS}" + +def get_flags(d, bb): + ret = "" + if bb.data.getVar('KERNEL_OBJECT_SUFFIX', d, 1) == '.ko': + return "'EXTRA_CFLAGS=%s'" % bb.data.getVar('KCFLAGS', d, 1) + return "'CFLAGS=%s'" % bb.data.getVar('KCFLAGS', d, 1) + +do_compile () { + unset LDFLAGS + oe_runmake unionfs${KERNEL_OBJECT_SUFFIX} +} + +do_install () { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs + install -m 0644 unionfs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/ + + install -d ${D}${mandir}/man4 + install -m 0644 man/unionfs.4 ${D}${mandir}/man4/ +} diff --git a/recipes/nonworking/unionfs/unionfs-modules_1.0.11.bb b/recipes/nonworking/unionfs/unionfs-modules_1.0.11.bb new file mode 100644 index 0000000000..c9ca1d130d --- /dev/null +++ b/recipes/nonworking/unionfs/unionfs-modules_1.0.11.bb @@ -0,0 +1,4 @@ +require unionfs-modules.inc +require unionfs.inc + +SRC_URI += "file://make.patch;patch=1" diff --git a/recipes/nonworking/unionfs/unionfs-modules_1.0.13.bb b/recipes/nonworking/unionfs/unionfs-modules_1.0.13.bb new file mode 100644 index 0000000000..6a7d880720 --- /dev/null +++ b/recipes/nonworking/unionfs/unionfs-modules_1.0.13.bb @@ -0,0 +1,11 @@ +PR = "r1" +PARALLEL_MAKE = "" + +require unionfs-modules.inc + +KERNEL_MAJMIN = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')[:3]}" + +do_compile() { + unset LDFLAGS + oe_runmake unionfs${KERNEL_MAJMIN} +} diff --git a/recipes/unionfs/unionfs-modules.inc b/recipes/unionfs/unionfs-modules.inc deleted file mode 100644 index 5e87288e48..0000000000 --- a/recipes/unionfs/unionfs-modules.inc +++ /dev/null @@ -1,38 +0,0 @@ -unionutils = "unionctl uniondbg" - -include unionfs.inc -inherit module - -SECTION = "kernel/modules" - -EXTRA_OEMAKE = "'CC=${KERNEL_CC}' 'LD=${KERNEL_LD}' \ - 'KERNELVER=${KERNEL_VERSION}' \ - 'LINUXSRC=${STAGING_KERNEL_DIR}' \ - 'CROSS_COMPILE=${TARGET_PREFIX}' \ - 'OS=${TARGET_OS}' \ - ${@get_flags(d, bb)}" - -KCFLAGS = "-D__KERNEL__ -DMODULE -DFISTGEN \ - -DUNIONFS_UNSUPPORTED -DNODEBUG \ - -I. -I${STAGING_KERNEL_DIR}/include \ - -DUNIONFS_VERSION=\"${PV}\" \ - ${CFLAGS}" - -def get_flags(d, bb): - ret = "" - if bb.data.getVar('KERNEL_OBJECT_SUFFIX', d, 1) == '.ko': - return "'EXTRA_CFLAGS=%s'" % bb.data.getVar('KCFLAGS', d, 1) - return "'CFLAGS=%s'" % bb.data.getVar('KCFLAGS', d, 1) - -do_compile () { - unset LDFLAGS - oe_runmake unionfs${KERNEL_OBJECT_SUFFIX} -} - -do_install () { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs - install -m 0644 unionfs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/ - - install -d ${D}${mandir}/man4 - install -m 0644 man/unionfs.4 ${D}${mandir}/man4/ -} diff --git a/recipes/unionfs/unionfs-modules_1.0.11.bb b/recipes/unionfs/unionfs-modules_1.0.11.bb deleted file mode 100644 index c9ca1d130d..0000000000 --- a/recipes/unionfs/unionfs-modules_1.0.11.bb +++ /dev/null @@ -1,4 +0,0 @@ -require unionfs-modules.inc -require unionfs.inc - -SRC_URI += "file://make.patch;patch=1" diff --git a/recipes/unionfs/unionfs-modules_1.0.13.bb b/recipes/unionfs/unionfs-modules_1.0.13.bb deleted file mode 100644 index 6a7d880720..0000000000 --- a/recipes/unionfs/unionfs-modules_1.0.13.bb +++ /dev/null @@ -1,11 +0,0 @@ -PR = "r1" -PARALLEL_MAKE = "" - -require unionfs-modules.inc - -KERNEL_MAJMIN = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')[:3]}" - -do_compile() { - unset LDFLAGS - oe_runmake unionfs${KERNEL_MAJMIN} -} -- cgit v1.2.3 From 7d5928037aaf0a37880d22709a06c87786342281 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sun, 10 Jan 2010 16:02:35 +0100 Subject: sharprom-compatible.conf: define PREFERRED_VERSION-linux-libc-headers * define PREFERRED_VERSION-linux-libc-headers to keep bitbake happy about recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb which assumes this variable to be defined --- conf/distro/sharprom-compatible.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index 2ef04872fb..5e662c7fda 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -54,6 +54,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/arm-linux-gcc-intermediate = "sharprom-toolchain-native" PREFERRED_VERSION_glibc = "2.2.5" +PREFERRED_VERSION-linux-libc-headers = "2.4.18" IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0" #INHIBIT_PACKAGE_STRIP = "1" -- cgit v1.2.3 From d6279520f7bf850922d86e58d9111af066d941bf Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 10 Jan 2010 16:32:08 +0000 Subject: gmime: Deleted libgmime-2.4 in favor of gmime. * gmime provides the same 2.4 API. * balsa package migrated to gmime by 474c06d9. --- recipes/libgmime/libgmime-2.4_2.4.7.bb | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 recipes/libgmime/libgmime-2.4_2.4.7.bb diff --git a/recipes/libgmime/libgmime-2.4_2.4.7.bb b/recipes/libgmime/libgmime-2.4_2.4.7.bb deleted file mode 100644 index 43b1c9c0a3..0000000000 --- a/recipes/libgmime/libgmime-2.4_2.4.7.bb +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "LGPL" -DESCRIPTION = "Runtime libraries for parsing and creating MIME mail" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "glib-2.0 zlib" -SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gmime/2.4/gmime-${PV}.tar.bz2 \ - file://configure-cross.patch;patch=1 \ - file://iconv-detect.h" -EXTRA_OECONF += "--disable-mono" -S = "${WORKDIR}/gmime-${PV}" - -inherit autotools_stage lib_package - -export ac_cv_have_iconv_detect_h=yes -do_configure_append = "cp ${WORKDIR}/iconv-detect.h ${S}" -- cgit v1.2.3 From fd9e3c2b0720bc838fba383f5f1a9bd75c421afa Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 10 Jan 2010 16:41:29 +0000 Subject: bzip2: Security update to version 1.0.5 (CVE-2008-1372, CERT-FI 20469) and a migration to autoconf. * More about security issue: * https://www.cert.fi/haavoittuvuudet/joint-advisory-archive-formats.html * http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2008-1372 * More about autoconf: See README.autotools in the patched source. --- .../bzip2-1.0.5/bzip2-1.0.5-autoconfiscated.patch | 286 +++++++++++++++++++++ recipes/bzip2/bzip2-full-native-1.0.5/Makefile.am | 41 --- recipes/bzip2/bzip2-full-native-1.0.5/configure.ac | 14 - recipes/bzip2/bzip2-full-native_1.0.5.bb | 22 +- recipes/bzip2/bzip2_1.0.5.bb | 28 ++ 5 files changed, 321 insertions(+), 70 deletions(-) create mode 100644 recipes/bzip2/bzip2-1.0.5/bzip2-1.0.5-autoconfiscated.patch delete mode 100644 recipes/bzip2/bzip2-full-native-1.0.5/Makefile.am delete mode 100644 recipes/bzip2/bzip2-full-native-1.0.5/configure.ac create mode 100644 recipes/bzip2/bzip2_1.0.5.bb diff --git a/recipes/bzip2/bzip2-1.0.5/bzip2-1.0.5-autoconfiscated.patch b/recipes/bzip2/bzip2-1.0.5/bzip2-1.0.5-autoconfiscated.patch new file mode 100644 index 0000000000..ad720b8b38 --- /dev/null +++ b/recipes/bzip2/bzip2-1.0.5/bzip2-1.0.5-autoconfiscated.patch @@ -0,0 +1,286 @@ +diff -urN files/autogen.sh ./autogen.sh +--- bzip2-1.0.5.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100 ++++ bzip2-1.0.5.autoconfiscated/autogen.sh 2009-11-06 12:10:43.574602171 +0100 +@@ -0,0 +1,8 @@ ++mv LICENSE COPYING ++mv CHANGES NEWS ++touch AUTHORS ++touch ChangeLog ++libtoolize --force ++aclocal ++automake --add-missing --gnu ++autoconf +diff -urN bzip2-1.0.5.orig/README.autotools bzip2-1.0.5.autoconfiscated/README.autotools +--- bzip2-1.0.5.orig/README.autotools 1970-01-01 01:00:00.000000000 +0100 ++++ bzip2-1.0.5.autoconfiscated/README.autotools 2009-11-05 23:06:27.000000000 +0100 +@@ -0,0 +1,39 @@ ++bzip2 autoconfiscated ++===================== ++ ++Temporarily at http://pack.suse.cz/sbrabec/bzip2/ expecting that it will ++become a new upstream version to prevent per-distribution shared library ++patching done by nearly each Linux vendor separately. ++ ++Autoconfiscation brings standard ./configure ; make ; make install ++installation, seamless support of DESTDIR, automatic check for supported ++CFLAGS, standard shared library support, automatic large files CFLAGS ++check and all things that are supported by automake. ++ ++It makes obsolete Makefile-libbz2_so and README.COMPILATION.PROBLEMS. ++Now configure should automatically detect correct build flags. ++ ++In case of any problem or question with autotools support feel free to ++contact me: Stanislav Brabec ++ ++Autoconfiscated version binaries are exactly equal to ++bzip2-1.0.5.tar.gz. There are only few changes. See below. ++ ++ ++New features: ++ ++Trivial link man pages for bzcat and bunzip2 added. ++ ++bzip2.pc file for pkg-config. Packages can use it for checks. ++ ++ ++Incompatible changes: ++ ++soname change. Libtool has no support for two parts name suffix (e. g. ++libbz2.so.1.0). It must be a single number (e. g. libbz2.so.1). That is ++why soname must change. But I see not a big problem with it. Several ++distributions already use the new number instead of the non-standard ++number from Makefile-libbz2_so. ++ ++To be super-safe, I incremented minor number of the library file, so ++both instances of the shared library can live together. +diff -urN bzip2-1.0.5.orig/configure.ac bzip2-1.0.5.autoconfiscated/configure.ac +--- bzip2-1.0.5.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ bzip2-1.0.5.autoconfiscated/configure.ac 2009-11-06 17:04:04.000000000 +0100 +@@ -0,0 +1,70 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ([2.57]) ++AC_INIT([bzip2], [1.0.5], [Julian Seward ]) ++BZIP2_LT_CURRENT=1 ++BZIP2_LT_REVISION=5 ++BZIP2_LT_AGE=0 ++AC_CONFIG_SRCDIR([bzlib.h]) ++AC_CONFIG_MACRO_DIR([m4]) ++ ++AM_INIT_AUTOMAKE ++AM_MAINTAINER_MODE ++ ++# Checks for programs. ++AC_PROG_AWK ++AC_PROG_CC ++AC_PROG_INSTALL ++AC_PROG_LN_S ++AC_PROG_MAKE_SET ++AC_PROG_LIBTOOL ++PKG_PROG_PKG_CONFIG ++ ++# Checks for libraries. ++ ++# Checks for header files. ++ ++# Checks for typedefs, structures, and compiler characteristics. ++ ++# Check for system features. ++AC_SYS_LARGEFILE ++ ++AC_MSG_CHECKING([whether compiler understands -Wall]) ++save_CFLAGS="$CFLAGS" ++CFLAGS="$CFLAGS -Wall" ++AC_TRY_COMPILE([], [], [ ++ AC_MSG_RESULT([yes]) ++], [ ++ AC_MSG_RESULT([no]) ++ CFLAGS="$save_CFLAGS" ++]) ++ ++AC_MSG_CHECKING([whether compiler understands -Winline]) ++save_CFLAGS="$CFLAGS" ++CFLAGS="$CFLAGS -Winline" ++AC_TRY_COMPILE([], [], [ ++ AC_MSG_RESULT([yes]) ++], [ ++ AC_MSG_RESULT([no]) ++ CFLAGS="$save_CFLAGS" ++]) ++ ++AC_MSG_CHECKING([whether compiler understands -fno-strength-reduce]) ++save_CFLAGS="$CFLAGS" ++CFLAGS="$CFLAGS -fno-strength-reduce" ++AC_TRY_COMPILE([], [], [ ++ AC_MSG_RESULT([yes]) ++], [ ++ AC_MSG_RESULT([no]) ++ CFLAGS="$save_CFLAGS" ++]) ++ ++# Checks for library functions. ++ ++# Write the output. ++AC_SUBST([BZIP2_LT_CURRENT]) ++AC_SUBST([BZIP2_LT_REVISION]) ++AC_SUBST([BZIP2_LT_AGE]) ++AC_CONFIG_FILES([Makefile bzip2.pc]) ++AC_OUTPUT +diff -urN bzip2-1.0.5.orig/Makefile.am bzip2-1.0.5.autoconfiscated/Makefile.am +--- bzip2-1.0.5.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ bzip2-1.0.5.autoconfiscated/Makefile.am 2009-11-05 16:45:11.000000000 +0100 +@@ -0,0 +1,138 @@ ++lib_LTLIBRARIES = libbz2.la ++ ++libbz2_la_SOURCES = \ ++ blocksort.c \ ++ huffman.c \ ++ crctable.c \ ++ randtable.c \ ++ compress.c \ ++ decompress.c \ ++ bzlib.c ++ ++libbz2_la_LDFLAGS = \ ++ -version-info $(BZIP2_LT_CURRENT):$(BZIP2_LT_REVISION):$(BZIP2_LT_AGE) \ ++ -no-undefined ++ ++include_HEADERS = bzlib.h ++ ++noinst_HEADERS = bzlib_private.h ++ ++bin_PROGRAMS = bzip2 bzip2recover ++ ++bzip2_SOURCES = bzip2.c ++bzip2_LDADD = libbz2.la ++ ++bzip2recover_SOURCES = bzip2recover.c ++bzip2recover_LDADD = libbz2.la ++ ++bin_SCRIPTS = bzgrep bzmore bzdiff ++ ++man_MANS = bzip2.1 bzgrep.1 bzmore.1 bzdiff.1 ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = bzip2.pc ++ ++$(pkgconfig_DATA): $(srcdir)/bzip2.pc.in config.status ++ ++install-exec-hook: ++ rm -f $(DESTDIR)$(bindir)/`echo "bunzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzcat" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzegrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzfgrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzless" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzcmp" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ $(LN_S) `echo "bzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bunzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ $(LN_S) `echo "bzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bzcat" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ $(LN_S) `echo "bzgrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bzegrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ $(LN_S) `echo "bzgrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bzfgrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ $(LN_S) `echo "bzmore" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bzless" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ $(LN_S) `echo "bzdiff" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bzcmp" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ ++install-data-hook: ++ echo ".so man1/`echo "bzip2" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bunzip2" | sed 's,^.*/,,;$(transform)'`.1 ++ echo ".so man1/`echo "bzip2" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzcat" | sed 's,^.*/,,;$(transform)'`.1 ++ echo ".so man1/`echo "bzgrep" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzegrep" | sed 's,^.*/,,;$(transform)'`.1 ++ echo ".so man1/`echo "bzgrep" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzfgrep" | sed 's,^.*/,,;$(transform)'`.1 ++ echo ".so man1/`echo "bzmore" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzless" | sed 's,^.*/,,;$(transform)'`.1 ++ echo ".so man1/`echo "bzdiff" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzcmp" | sed 's,^.*/,,;$(transform)'`.1 ++ ++uninstall-hook: ++ rm -f $(DESTDIR)$(bindir)/`echo "bunzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzcat" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzegrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzfgrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzless" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzcmp" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bunzip2" | sed 's,^.*/,,;$(transform)'`.1 ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bzcat" | sed 's,^.*/,,;$(transform)'`.1 ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bzegrep" | sed 's,^.*/,,;$(transform)'`.1 ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bzfgrep" | sed 's,^.*/,,;$(transform)'`.1 ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bzless" | sed 's,^.*/,,;$(transform)'`.1 ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bzcmp" | sed 's,^.*/,,;$(transform)'`.1 ++ ++test: bzip2 ++ @cat $(srcdir)/words1 ++ ./bzip2 -1 <$(srcdir)/sample1.ref >sample1.rb2 ++ ./bzip2 -2 <$(srcdir)/sample2.ref >sample2.rb2 ++ ./bzip2 -3 <$(srcdir)/sample3.ref >sample3.rb2 ++ ./bzip2 -d <$(srcdir)/sample1.bz2 >sample1.tst ++ ./bzip2 -d <$(srcdir)/sample2.bz2 >sample2.tst ++ ./bzip2 -ds <$(srcdir)/sample3.bz2 >sample3.tst ++ cmp $(srcdir)/sample1.bz2 sample1.rb2 ++ cmp $(srcdir)/sample2.bz2 sample2.rb2 ++ cmp $(srcdir)/sample3.bz2 sample3.rb2 ++ cmp sample1.tst $(srcdir)/sample1.ref ++ cmp sample2.tst $(srcdir)/sample2.ref ++ cmp sample3.tst $(srcdir)/sample3.ref ++ @cat $(srcdir)/words3 ++ ++manual: $(srcdir)/manual.html $(srcdir)/manual.ps $(srcdir)/manual.pdf ++ ++manual.ps: $(MANUAL_SRCS) ++ cd $(srcdir); ./xmlproc.sh -ps manual.xml ++ ++manual.pdf: $(MANUAL_SRCS) ++ cd $(srcdir); ./xmlproc.sh -pdf manual.xml ++ ++manual.html: $(MANUAL_SRCS) ++ cd $(srcdir); ./xmlproc.sh -html manual.xml ++ ++EXTRA_DIST = \ ++ $(bin_SCRIPTS) \ ++ $(man_MANS) \ ++ README.autotools \ ++ README.XML.STUFF \ ++ bz-common.xsl \ ++ bz-fo.xsl \ ++ bz-html.xsl \ ++ bzip.css \ ++ bzip2.1.preformatted \ ++ bzip2.pc.in \ ++ bzip2.txt \ ++ dlltest.c \ ++ dlltest.dsp \ ++ entities.xml \ ++ format.pl \ ++ libbz2.def \ ++ libbz2.dsp \ ++ makefile.msc \ ++ manual.html \ ++ manual.pdf \ ++ manual.ps \ ++ manual.xml \ ++ mk251.c \ ++ sample1.bz2 \ ++ sample1.ref \ ++ sample2.bz2 \ ++ sample2.ref \ ++ sample3.bz2 \ ++ sample3.ref \ ++ spewG.c \ ++ unzcrash.c \ ++ words0 \ ++ words1 \ ++ words2 \ ++ words3 \ ++ xmlproc.sh ++ ++ACLOCAL_AMFLAGS = -I m4 +diff -urN bzip2-1.0.5.orig/bzip2.pc.in bzip2-1.0.5.autoconfiscated/bzip2.pc.in +--- bzip2-1.0.5.orig/bzip2.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ bzip2-1.0.5.autoconfiscated/bzip2.pc.in 2009-11-03 18:48:28.000000000 +0100 +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++bindir=@bindir@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: bzip2 ++Description: Lossless, block-sorting data compression ++Version: @VERSION@ ++Libs: -L${libdir} -lbz2 ++Cflags: -I${includedir} diff --git a/recipes/bzip2/bzip2-full-native-1.0.5/Makefile.am b/recipes/bzip2/bzip2-full-native-1.0.5/Makefile.am deleted file mode 100644 index b234e80f37..0000000000 --- a/recipes/bzip2/bzip2-full-native-1.0.5/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ - -lib_LTLIBRARIES = libbz2.la - -libbz2_la_SOURCES = blocksort.c \ - huffman.c \ - crctable.c \ - randtable.c \ - compress.c \ - decompress.c \ - bzlib.c - -bin_PROGRAMS = bzip2 bzip2recover - -bzip2_SOURCES = bzip2.c -bzip2_LDADD = libbz2.la -bzip2_DEPENDENCIES = libbz2.la - -include_HEADERS = bzlib.h - -bzip2recover_SOURCES = bzip2recover.c -bzip2recover_LDADD = libbz2.la -bzip2recover_DEPENDENCIES = libbz2.la - -bin_SCRIPTS = bzgrep bzgrep bzmore bzdiff - -man_MANS = bzip2.1 bzgrep.1 bzmore.1 bzdiff.1 -EXTRA_DIST = $(man_MANS) - -install-exec-hook: - ln -s $(bindir)/bzip2$(EXEEXT) $(DESTDIR)$(bindir)/bunzip2$(EXEEXT) - ln -s $(bindir)/bzip2$(EXEEXT) $(DESTDIR)$(bindir)/bzcat$(EXEEXT) - ln -s $(bindir)/bzgrep$(EXEEXT) $(DESTDIR)$(bindir)/bzegrep$(EXEEXT) - ln -s $(bindir)/bzgrep$(EXEEXT) $(DESTDIR)$(bindir)/bzfgrep$(EXEEXT) - ln -s $(bindir)/bzmore$(EXEEXT) $(DESTDIR)$(bindir)/bzless$(EXEEXT) - ln -s $(bindir)/bzdiff$(EXEEXT) $(DESTDIR)$(bindir)/bzcmp$(EXEEXT) - -install-data-hook: - echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzegrep.1 - echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzfgrep.1 - echo ".so man1/bzmore.1" > $(DESTDIR)$(mandir)/man1/bzless.1 - echo ".so man1/bzdiff.1" > $(DESTDIR)$(mandir)/man1/bzcmp.1 diff --git a/recipes/bzip2/bzip2-full-native-1.0.5/configure.ac b/recipes/bzip2/bzip2-full-native-1.0.5/configure.ac deleted file mode 100644 index 14b1d1809d..0000000000 --- a/recipes/bzip2/bzip2-full-native-1.0.5/configure.ac +++ /dev/null @@ -1,14 +0,0 @@ -AC_PREREQ([2.57]) - -AC_INIT(bzip2, 2.0.5, , libXrender) -AM_INIT_AUTOMAKE() -AM_MAINTAINER_MODE - -#AM_CONFIG_HEADER(config.h) - -# Check for progs -AC_PROG_CC -AC_PROG_LIBTOOL - -AC_OUTPUT([Makefile]) - diff --git a/recipes/bzip2/bzip2-full-native_1.0.5.bb b/recipes/bzip2/bzip2-full-native_1.0.5.bb index 53e0c112cc..96d0ba5494 100644 --- a/recipes/bzip2/bzip2-full-native_1.0.5.bb +++ b/recipes/bzip2/bzip2-full-native_1.0.5.bb @@ -1,24 +1,16 @@ -DESCRIPTION = "Very high-quality data compression program." +DESCRIPTION = "Very high-quality data compression program" SECTION = "console/utils" -PR = "r0" +PR = "r1" LICENSE = "bzip2" -SRC_URI = "http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz \ - file://configure.ac \ - file://Makefile.am" +FILESPATH =. "${FILE_DIRNAME}/bzip2-${PV}:" +SRC_URI = "http://www.bzip.org/${PV}/bzip2-${PV}.tar.gz \ + file://bzip2-1.0.5-autoconfiscated.patch;patch=1" S = "${WORKDIR}/bzip2-${PV}" -CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64" - -inherit autotools native +inherit autotools_stage pkgconfig native do_configure_prepend () { - cp ${WORKDIR}/configure.ac ${S}/ - cp ${WORKDIR}/Makefile.am ${S}/ -} - -do_stage () { - install -m 0644 bzlib.h ${STAGING_INCDIR}/ - oe_libinstall -a -so libbz2 ${STAGING_LIBDIR} + if test -f LICENSE ; then sh ./autogen.sh ; fi } diff --git a/recipes/bzip2/bzip2_1.0.5.bb b/recipes/bzip2/bzip2_1.0.5.bb new file mode 100644 index 0000000000..45c97163d4 --- /dev/null +++ b/recipes/bzip2/bzip2_1.0.5.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Very high-quality data compression program" +SECTION = "console/utils" +PR = "r0" + +LICENSE = "bzip2" +SRC_URI = "http://www.bzip.org/${PV}/bzip2-${PV}.tar.gz \ + file://bzip2-1.0.5-autoconfiscated.patch;patch=1" + +inherit autotools_stage pkgconfig + +do_configure_prepend () { + if test -f LICENSE ; then sh ./autogen.sh ; fi +} + +do_install_append () { + mv ${D}${bindir}/bunzip2 ${D}${bindir}/bunzip2.${PN} + mv ${D}${bindir}/bzcat ${D}${bindir}/bzcat.${PN} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${bindir}/bunzip2 bunzip2 bunzip2.${PN} 100 + update-alternatives --install ${bindir}/bzcat bzcat bzcat.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove bunzip2 bunzip2.${PN} + update-alternatives --remove bzcat bzcat.${PN} +} -- cgit v1.2.3 From e4876cdfb333238929d44dbfeafc800f0f9bc287 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 10 Jan 2010 12:28:01 +0100 Subject: angstrom-feed-builder: add netbook-launcher-efl and sysstat --- contrib/angstrom/build-feeds.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index c8a216d230..aa454fc966 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -249,6 +249,7 @@ do nautilus \ nbench-byte \ navit \ + netbook-launcher-efl \ netkit-ftp \ netsurf \ news \ @@ -324,6 +325,7 @@ do subversion \ sugar \ sylpheed \ + sysstat \ systray \ task-beagleboard-demo \ task-gpe-pim \ -- cgit v1.2.3 From 685431c719d148c3f19a1678a122e00cef5a47ad Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 10 Jan 2010 18:32:18 +0100 Subject: linux-kirkwood 2.6.33rc1: fix parsing and make PV adhere to our versioning policy (yes, it went backwards, but the recipe has never built properly in the first place) --- recipes/linux/linux-kirkwood_2.6.33-rc1.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/linux/linux-kirkwood_2.6.33-rc1.bb b/recipes/linux/linux-kirkwood_2.6.33-rc1.bb index fa2bb3536b..3b85619b07 100644 --- a/recipes/linux/linux-kirkwood_2.6.33-rc1.bb +++ b/recipes/linux/linux-kirkwood_2.6.33-rc1.bb @@ -7,18 +7,18 @@ COMPATIBLE_MACHINE = "openrd-base|openrd-client|sheevaplug" require linux.inc # Change MACHINE_KERNEL_PR in conf/machine/include/kirkwood.inc -PV = "2.6.33-rc1" +PV = "2.6.32+2.6.33-rc1" SRCREV = "58c19e3ea75a629c3d38a4490f96a65cf2f36a11" SRC_URI = "git://repo.or.cz/linux-2.6/linux-2.6-openrd.git;protocol=git \ file://defconfig" -SRC_URI_append_openrd-base += \ - "file"//openrd-base/openrd-base-enable-pcie.patch;patch=1" +SRC_URI_append_openrd-base += " \ + file://openrd-base/openrd-base-enable-pcie.patch;patch=1" -SRC_URI_append_openrd-client += \ - "file://0001-OpenRD-Client-PCIe-Initialize-PCI-express-and-i2c.patch;patch=1 \ +SRC_URI_append_openrd-client += " \ + file://0001-OpenRD-Client-PCIe-Initialize-PCI-express-and-i2c.patch;patch=1 \ file://0002-OpenRD-Client-Volari-Z11-driver-added.patch;patch=1 \ file://0003-ARM-Kirkwood-Sound-Sound-driver-added.patch;patch=1 \ " -- cgit v1.2.3 From 7695c100b0145e5d29eaad341e0dd41c060f4863 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sun, 10 Jan 2010 16:51:45 +0100 Subject: sharprom-compatible.conf: fix spelling error, albeit a significant one underscore, not dash -PREFERRED_VERSION-linux-libc-headers = "2.4.18" +PREFERRED_VERSION_linux-libc-headers = "2.4.18" --- conf/distro/sharprom-compatible.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index 5e662c7fda..0e8e272b11 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -54,7 +54,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/arm-linux-gcc-intermediate = "sharprom-toolchain-native" PREFERRED_VERSION_glibc = "2.2.5" -PREFERRED_VERSION-linux-libc-headers = "2.4.18" +PREFERRED_VERSION_linux-libc-headers = "2.4.18" IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0" #INHIBIT_PACKAGE_STRIP = "1" -- cgit v1.2.3 From 5f1354772adcfcbde23bdaf82fe6b7dcaa754c2b Mon Sep 17 00:00:00 2001 From: Frederik Sdun Date: Sun, 10 Jan 2010 18:25:00 +0000 Subject: libsdl-ttf: Fix path to sdl-config Signed-off-by: Frederik 'playya' Sdun Signed-off-by: Martin Jansa --- recipes/libsdl/libsdl-ttf_2.0.9.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/libsdl/libsdl-ttf_2.0.9.bb b/recipes/libsdl/libsdl-ttf_2.0.9.bb index 45f5aa908c..baecfd03b1 100644 --- a/recipes/libsdl/libsdl-ttf_2.0.9.bb +++ b/recipes/libsdl/libsdl-ttf_2.0.9.bb @@ -8,6 +8,7 @@ PR = "r0" SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz" S = "${WORKDIR}/SDL_ttf-${PV}" +EXTRA_OECONF += "SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config " inherit autotools -- cgit v1.2.3 From be89272e36ab0963b4634e3f9cb51712e05a68ec Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 22 Dec 2009 13:58:16 +0100 Subject: maintainers: add Martin Jansa entry * In case someone wants to blame/praise without checking git log :) Signed-off-by: Martin Jansa --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 5a26dee320..d48da03768 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -203,6 +203,13 @@ Machines: ronetix-pm9263, vortex86sx, at91sam9g20ek Distros: KaeilOS, Ångström Interests: x86, ARM, wxWidgets +Person: Martin 'JaMa' Jansa +Mail: Martin.Jansa@gmail.com +Machines: spitz, om-gta02 +Distros: SHR, Ångström +Interests: xorg +Recipes: shr/*, xorg-*/*, linux/*openmoko* + Person: Matthias 'CoreDump' Hentges Website: http://www.hentges.net Distros: Sonkei -- cgit v1.2.3 From 957f6b28650bd896185961cf0c12718d7577436b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 10 Jan 2010 21:19:16 +0100 Subject: libfsoframework: bump srcrev with fixed libnl-2.0.vapi Signed-off-by: Martin Jansa --- conf/distro/include/sane-srcrevs-fso.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index d1573cfd90..3b58c1ac25 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -13,7 +13,7 @@ SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsotdld ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-libfsoframework ?= "c227502c59f4d1de3b3097b3329c2461d6cfa2a2" SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}" -- cgit v1.2.3 From 8a75c3794c077b5dd15e464a330337b01bf4b9a6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 10 Jan 2010 21:23:57 +0100 Subject: Revert "shr: temporary disable libsdl-ttf_2.0.9" * This reverts commit 814f07a935d8be208fa219c5f04a43a72bbd4ea6. * The the issue is fixed. --- conf/distro/include/preferred-shr-versions.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index c826a79131..c726e5fdf9 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -39,6 +39,3 @@ UDEV_GE_141 = "1" # Downgraded # python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py PREFERRED_VERSION_python-pygtk = "2.10.4" - -# 2.0.9 tries to use /usr/include/SDL from buildhost and fails with QA Cross Compile Badness -PREFERRED_VERSION_libsdl-ttf = "2.0.3" -- cgit v1.2.3 From 21499373b6952e364f93a354587421b021368b99 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 10 Jan 2010 21:38:38 +0100 Subject: navit: use --force for fsoraw in SHR launchers (Thanks Zoff) --- recipes/navit/files/shr/navit.desktop | 2 +- recipes/navit/files/shr/navitD.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/navit/files/shr/navit.desktop b/recipes/navit/files/shr/navit.desktop index b1c0d1321d..1380fdbbde 100644 --- a/recipes/navit/files/shr/navit.desktop +++ b/recipes/navit/files/shr/navit.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Navit Comment=GPS Navigation -Exec=unset LC_ALL && fsoraw -r CPU,GPS -- navit +Exec=unset LC_ALL && fsoraw -rf CPU,GPS -- navit Icon=navit Terminal=false Type=Application diff --git a/recipes/navit/files/shr/navitD.desktop b/recipes/navit/files/shr/navitD.desktop index fc77efcda2..69360c7ed6 100644 --- a/recipes/navit/files/shr/navitD.desktop +++ b/recipes/navit/files/shr/navitD.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=NavitD Comment=GPS Navigation Display blanking disabled -Exec=unset LC_ALL && fsoraw -r CPU,GPS,Display -- navit +Exec=unset LC_ALL && fsoraw -rf CPU,GPS,Display -- navit Icon=navitD Terminal=false Type=Application -- cgit v1.2.3 From f2934215635d101459eb15b3505843370c20c6ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20R=C3=BCb?= Date: Sun, 10 Jan 2010 18:59:43 +0000 Subject: navit: enable dbus plugin in navit by default Signed-off-by: Martin Jansa --- recipes/navit/files/navit.xml | 2 +- recipes/navit/files/plugins.xml | 6 ++++++ recipes/navit/navit_svn.bb | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 recipes/navit/files/plugins.xml diff --git a/recipes/navit/files/navit.xml b/recipes/navit/files/navit.xml index dafa6aa498..79ee4618d4 100644 --- a/recipes/navit/files/navit.xml +++ b/recipes/navit/files/navit.xml @@ -1,7 +1,7 @@ - + diff --git a/recipes/navit/files/plugins.xml b/recipes/navit/files/plugins.xml new file mode 100644 index 0000000000..015b05517f --- /dev/null +++ b/recipes/navit/files/plugins.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb index 5979b7e46a..71f5457276 100644 --- a/recipes/navit/navit_svn.bb +++ b/recipes/navit/navit_svn.bb @@ -1,7 +1,7 @@ require navit.inc PV = "0.1.0+svnr${SRCPV}" -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_shr = "1" @@ -27,12 +27,14 @@ CONFFILES_${PN} += "${datadir}/navit/navit.default.xml \ ${datadir}/navit/maps.xml \ ${datadir}/navit/osd.xml \ ${datadir}/navit/speech.xml \ + ${datadir}/navit/plugins.xml \ " SRC_URI += "file://navit.xml \ file://maps.xml \ file://osd.xml \ file://speech.xml \ + file://plugins.xml \ " #Second launcher for shr @@ -55,6 +57,7 @@ do_install_append() { install -m 0644 ${WORKDIR}/maps.xml ${D}${datadir}/navit/maps.xml install -m 0644 ${WORKDIR}/osd.xml ${D}${datadir}/navit/osd.xml install -m 0644 ${WORKDIR}/speech.xml ${D}${datadir}/navit/speech.xml + install -m 0644 ${WORKDIR}/plugins.xml ${D}${datadir}/navit/plugins.xml } do_install_append_shr() { -- cgit v1.2.3