aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-05-29 09:32:17 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-05-29 09:32:17 +0200
commit9202275b2381a1b2f9e74862673b4a85d0a68c1c (patch)
treeb88a0fdf7205097be6f3cc4d8e4900e5aa41bd4e
parent293b05335ab540c4c8402e0a5caf2886b786a318 (diff)
parent28bc48904e31c3a63cf5a60bc005ed8fb359cc52 (diff)
downloadopenembedded-9202275b2381a1b2f9e74862673b4a85d0a68c1c.tar.gz
openembedded-9202275b2381a1b2f9e74862673b4a85d0a68c1c.tar.bz2
openembedded-9202275b2381a1b2f9e74862673b4a85d0a68c1c.zip
Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010
-rw-r--r--classes/base.bbclass2
-rw-r--r--classes/packaged-staging.bbclass2
-rw-r--r--docs/usermanual/chapters/common_use_cases.xml45
-rw-r--r--docs/usermanual/chapters/comparing.xml18
-rw-r--r--docs/usermanual/chapters/features.xml10
-rw-r--r--docs/usermanual/chapters/getting_oe.xml26
-rw-r--r--docs/usermanual/chapters/metadata.xml18
-rw-r--r--docs/usermanual/chapters/recipes.xml66
-rw-r--r--docs/usermanual/chapters/usage.xml64
-rw-r--r--lib/oe/utils.py11
-rw-r--r--recipes/angstrom/angstrom-uboot-scripts.bb2
-rwxr-xr-xrecipes/angstrom/angstrom-uboot-scripts/linuxtagdemo-pico.cmd39
-rwxr-xr-xrecipes/angstrom/angstrom-uboot-scripts/linuxtagdemo.cmd37
-rw-r--r--recipes/dri/glamo-dri-tests_git.bb2
-rw-r--r--recipes/dri/libdrm_2.4.18.bb2
-rw-r--r--recipes/dri/libdrm_git.bb7
-rw-r--r--recipes/htcdream/htcdream-gps_git.bb13
-rw-r--r--recipes/linux/linux-2.6.34/qemuarm/defconfig1822
-rw-r--r--recipes/linux/linux_2.6.34.bb1
-rw-r--r--recipes/mesa/mesa-dri-7.8.1/glamo.patch13
-rw-r--r--recipes/mesa/mesa-dri_7.8.1.bb2
-rw-r--r--recipes/shr/elementary-theme-gry_git.bb2
-rw-r--r--recipes/ti/matrix-gui-common/browser20
-rw-r--r--recipes/ti/matrix-gui-common_svn.bb47
-rwxr-xr-xrecipes/ti/matrix-gui-e/dm365-evm/init26
-rwxr-xr-xrecipes/ti/matrix-gui-e/init32
-rw-r--r--recipes/ti/matrix-gui-e_svn.bb30
-rw-r--r--recipes/ti/matrix-gui/0001-Disable-cursor-override-for-X11.patch27
-rw-r--r--[-rwxr-xr-x]recipes/ti/matrix-gui/dm365-evm/init2
-rw-r--r--[-rwxr-xr-x]recipes/ti/matrix-gui/init10
-rw-r--r--recipes/ti/matrix-gui/matrix-gui.desktop7
-rw-r--r--recipes/ti/matrix-gui_svn.bb48
-rw-r--r--recipes/u-boot/u-boot.inc16
-rw-r--r--recipes/u-boot/u-boot_git.bb2
-rw-r--r--recipes/udev/udev-151/udev-compat-static.patch97
-rw-r--r--recipes/udev/udev-compat-static-124/flags.patch (renamed from recipes/udev/udev-static-124/flags.patch)0
-rw-r--r--recipes/udev/udev-compat-static-124/libvolume-id-soname.patch (renamed from recipes/udev/udev-static-124/libvolume-id-soname.patch)0
-rw-r--r--recipes/udev/udev-compat-static-124/mtd-exclude-persistent.patch (renamed from recipes/udev/udev-static-124/mtd-exclude-persistent.patch)0
-rw-r--r--recipes/udev/udev-compat-static-124/noasmlinkage.patch (renamed from recipes/udev/udev-static-124/noasmlinkage.patch)0
-rw-r--r--recipes/udev/udev-compat-static-124/udevtrigger_add_devname_filtering.patch (renamed from recipes/udev/udev-static-124/udevtrigger_add_devname_filtering.patch)0
-rw-r--r--recipes/udev/udev-compat-static-124/vol_id_ld.patch (renamed from recipes/udev/udev-static-124/vol_id_ld.patch)0
-rw-r--r--recipes/udev/udev-compat-static_124.bb (renamed from recipes/udev/udev-static_124.bb)0
-rw-r--r--recipes/udev/udev_151.bb3
-rw-r--r--recipes/x-load/x-load.inc14
-rw-r--r--recipes/x-load/x-load_git.bb2
-rw-r--r--recipes/xinput-calibrator/files/om-gta02/pointercal.xinput2
-rw-r--r--recipes/xinput-calibrator/files/pointercal.xinput1
-rw-r--r--recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb6
-rw-r--r--recipes/xinput-calibrator/xinput-calibrator_git.bb1
-rw-r--r--recipes/xorg-driver/xf86-video-glamo_git.bb2
-rw-r--r--recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch24
-rw-r--r--recipes/xserver-common/xserver-common_1.33.bb2
52 files changed, 2427 insertions, 198 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 8bac509115..e0f9184f58 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -207,7 +207,7 @@ def oe_unpack_file(file, data, url = None):
cmd = 'cp -pPR %s %s/%s/' % (file, os.getcwd(), destdir)
else:
(type, host, path, user, pswd, parm) = bb.decodeurl(url)
- if not 'apply' in parm and not 'patch' in parm:
+ if not 'patch' in parm and parm.get('apply') != 'yes':
# The "destdir" handling was specifically done for FILESPATH
# items. So, only do so for file:// entries.
if type == "file":
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 62a78e4c67..83f35788bc 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -19,7 +19,7 @@ PSTAGE_PKGPN = "${@bb.data.expand('staging-${PN}-${MULTIMACH_ARCH}${TARGET_
PSTAGE_PKGNAME = "${PSTAGE_PKGPN}_${PSTAGE_PKGVERSION}_${PSTAGE_PKGARCH}.ipk"
PSTAGE_PKG = "${PSTAGE_DIR}/${PSTAGE_PKGPATH}/${PSTAGE_PKGNAME}"
PSTAGE_WORKDIR = "${TMPDIR}/pstage"
-PSTAGE_SCAN_CMD ?= "find ${PSTAGE_TMPDIR_STAGE} \( -name "*.la" -o -name "*-config"\) -type f"
+PSTAGE_SCAN_CMD ?= "find ${PSTAGE_TMPDIR_STAGE} \( -name "*.la" -o -name "*-config" \) -type f"
PSTAGE_NATIVEDEPENDS = "\
shasum-native \
diff --git a/docs/usermanual/chapters/common_use_cases.xml b/docs/usermanual/chapters/common_use_cases.xml
index 7ae3ee5ada..d86d0ca8d1 100644
--- a/docs/usermanual/chapters/common_use_cases.xml
+++ b/docs/usermanual/chapters/common_use_cases.xml
@@ -7,11 +7,12 @@
<para>Creating a new distribution is not complicated, however we urge you
to try existing distributions first, because it's also very easy to do
- wrong. The config need to be created in /conf/distro directory. So what
- has to be inside? <itemizedlist>
+ wrong. The config needs to be created in $OEBASE/openembedded/conf/distro
+ directory. So what has to be inside?
+ <itemizedlist>
<listitem>
<para><command>DISTRO_VERSION</command> so users will know which
- version of distribution they use.</para>
+ version of the distribution they are using.</para>
</listitem>
<listitem>
@@ -71,29 +72,30 @@ SRCDATE = "20061014"
<section id="commonuse_new_machine">
<title>Adding a new Machine</title>
- <para>To be able to build for device OpenEmbedded have to know it, so
- machine config file need to be written. All those configs are stored in
- /conf/machine/ directory.</para>
+ <para>To be able to build for a device OpenEmbedded has to know about it,
+ so a machine config file needs to be written. All of the machine
+ configs are stored in $OEBASE/openembedded/conf/machine/ directory.</para>
<para>As usual some variables are required: <itemizedlist>
<listitem>
- <para><command>TARGET_ARCH</command> which describe which CPU
- architecture does machine use.</para>
+ <para><command>TARGET_ARCH</command> describes which CPU
+ architecture the machine uses.</para>
</listitem>
<listitem>
- <para><command>MACHINE_FEATURES</command> which describe which
- features device has. More about it in <link
+ <para><command>MACHINE_FEATURES</command> which describes which
+ features the device has. More about it in <link
linkend="task-base">task-base</link> section.</para>
</listitem>
<listitem>
<para><command>PREFERRED_PROVIDER_virtual/kernel</command> has to
- point into proper kernel recipe for this machine.</para>
+ point to the proper kernel recipe for this machine.</para>
</listitem>
</itemizedlist></para>
- <para>Next kernel recipe needs to be added.</para>
+ <para>Next the kernel recipe needs to be added if it doesn't already exist.
+ </para>
</section>
<section id="commonuse_new_package">
@@ -105,7 +107,7 @@ SRCDATE = "20061014"
<section>
<title>building from unstable source code</title>
<para>Building against the latest, bleeding-edge source has some intricacies of its own.
- For one, it is desirable to pin down a 1 code revision that is known to build to
+ For one, it is desirable to pin down a code revision that is known to build to
prevent random breakage in OE at the most inopportune time for all OE users. Here is
how to do that properly.
<itemizedlist>
@@ -113,7 +115,8 @@ SRCDATE = "20061014"
<listitem><para>for cvs: add 'PV = "1.1+cvs${SRCREV}"' to your bb file.</para></listitem>
</itemizedlist>
Accompany either with an entry to conf/distro/include/sane-srcrevs.inc for a revision that you know
- builds successfully.
+ builds successfully. It is also common to define the stable SRCREV
+ for your package directly in the package recipe.
</para>
<para>
If you really absolutely have to follow the latest commits, you can do that by adding
@@ -126,7 +129,7 @@ SRCDATE = "20061014"
<section id="commonuse_new_image">
<title>Creating your own image</title>
- <para>Creating own image is easy - only few variables needs to be set:
+ <para>Creating own image is easy - only few variables need to be set:
<itemizedlist>
<listitem>
<para><command>IMAGE_BASENAME</command> to give a name for your own
@@ -147,7 +150,7 @@ SRCDATE = "20061014"
<para><command>IMAGE_LINGUAS</command> is an optional list of
languages which has to be installed into the image</para>
</listitem>
- </itemizedlist> Then adding of the <emphasis>image</emphasis> class use:
+ </itemizedlist> Then add the <emphasis>image</emphasis> class using:
<screen>
inherit image
</screen> And the image recipe is ready for usage.</para>
@@ -240,7 +243,7 @@ export LOCALDIR=$PWD/secret-isv
</screen>
<para>Use <command>source build_source</command> to source the script,
- use <command>env</command> to check that the variable where
+ use <command>env</command> to check that the variables were
exported.</para>
</section>
@@ -484,8 +487,8 @@ RDEPENDS_${PN} += "\
<title>Putting it together</title>
<para>In the previous two sections we have prepared the host and
target side. One thing that is missing is combining the two newly
- created tasks and actually create the SDK. This is what we are going
- to do now.</para>
+ created tasks and actually creating the SDK. This is what we are
+ going to do now.</para>
<para>Create <filename>meta-toolchain-YOU.bb</filename> in the
<filename>recipes/meta</filename> directory and place the following
@@ -529,7 +532,7 @@ SDK_SUFFIX = "toolchain-YOUR"
optional dependencies like directFB, glib-2.0, gstreamer-0.10, tslib
and more esoteric dependencies like mysql and postgres. This allows
developers to simply start developing using Qt and enables system
- integrator to easily recompile Qt and base libraries without tracking
+ integrators to easily recompile Qt and base libraries without tracking
down extra dependencies.
</para>
@@ -575,7 +578,7 @@ $ <command>bitbake</command> meta-toolchain-qte
should start by downloading the SDK and untar it to the root folder
(<filename>/</filename>). Once this operation is finished you will
find a new directory <filename>/usr/local/angstrom/arm/</filename> and
- it contains the <filename>environment-setup</filename> to setup the
+ it contains the <filename>environment-setup</filename> file to setup the
<emphasis>QMAKESPEC</emphasis> and various other paths.
</para>
diff --git a/docs/usermanual/chapters/comparing.xml b/docs/usermanual/chapters/comparing.xml
index 1347010977..cfdaa95fbe 100644
--- a/docs/usermanual/chapters/comparing.xml
+++ b/docs/usermanual/chapters/comparing.xml
@@ -5,13 +5,13 @@
<section id="comparing_buildroot">
<title>buildroot</title>
- <para>Writing of <application>BitBake</application> recipes is more easy
+ <para>Writing of <application>BitBake</application> recipes is easier
and more intuitive than writing Makefiles while providing higher
flexibility. This allows you to tweak specific recipes for your very
- special needs and to add new recipes very fast. You can build toolchains,
+ special needs and to add new recipes quickly. You can build toolchains,
Software Distribution Kits (SDKs), complete Distributions or just single
- packages. The flexibility of OpenEmbedded allows you to reuse the once
- written recipes for many different purposes. OpenEmbedded provides
+ packages. The flexibility of OpenEmbedded allows you to reuse recipes
+ for many different purposes. OpenEmbedded provides
everything buildroot will be able to provide. But in contrast to buildroot
OpenEmbedded will allow you to achieve what you really want to achieve.
You can add new package formats, new filesystems, new output formats
@@ -21,11 +21,11 @@
<section id="comparing_crosstool">
<title>crosstool</title>
- <para>Crosstool allows to create toolchains for you. It can only create
+ <para>Crosstool allows the creation of toolchains. It can only create
the initial toolchain for you. It will not compile other needed libraries
- or applications for you, it will not be able to track dependencies or to
+ or applications for you, it will not be able to track dependencies or
package them properly. OpenEmbedded supports all configurations crosstool
- supports. You can start to create toolchains with OpenEmbedded, then as
+ supports. You can start by creating toolchains with OpenEmbedded, then as
your needs grow create a more complete SDK from already present base
libraries and applications and if you recognize you need to have packages
for the target you have them almost built already.</para>
@@ -38,7 +38,7 @@
cross-compiling is hard itself but many people misuse the buildsystem they
use to build their software. This will lead to a variety of issues you can
run into. This can be failing tests on configuration because of executing
- cross compiled binaries or crashes at run-time due wrong sizes of basic
+ cross compiled binaries or crashes at run-time due to wrong sizes of basic
types. When utilizing OpenEmbedded you avoid searching for patches at many
different places and will be able to get things done more quickly.
<application>OpenEmbedded</application> allows you to choose from a pool
@@ -48,4 +48,4 @@
output formats and filesystems. This allows you to create complete and
specialized distributions easily.</para>
</section>
-</chapter> \ No newline at end of file
+</chapter>
diff --git a/docs/usermanual/chapters/features.xml b/docs/usermanual/chapters/features.xml
index 3cbf1d8d1d..880b75cc37 100644
--- a/docs/usermanual/chapters/features.xml
+++ b/docs/usermanual/chapters/features.xml
@@ -22,9 +22,9 @@
<para>Run-time Dependencies (<command>RDEPENDS</command>) will be added
when packaging the software. They should only contain the minimal
dependencies to run the program. OpenEmbedded will analyze each packaged
- binary and search for <command>SO_NEEDED</command> libraries. The
- libraries are absolutely required by the program then OpenEmbedded is
- searching for packages that installs these libraries. these packages are
+ binary and search for <command>SO_NEEDED</command> libraries. These
+ libraries are absolutely required by the program so OpenEmbedded will
+ search for packages that install these libraries. These packages are
automatically added to the <command>RDEPENDS</command>. As a packager you
don't need to worry about shared libraries anymore they will be added
automatically.</para>
@@ -52,9 +52,9 @@ BBFILE_PRIORITY_local = "10"
<title>Task-base <anchor id="task-base" /></title>
<para>Task-base is new way of creating basic root filesystems. Instead of
- having each machine setting a ton of duplicate variables, this allow a
+ having each machine setting a ton of duplicate variables, this allows a
machine to specify its features and <command>task-base</command> builds it
- a customised package based on what the machine needs along with what the
+ a customized package based on what the machine needs along with what the
distro supports.</para>
<para>To illustrate, the distro config file can say: <screen>
diff --git a/docs/usermanual/chapters/getting_oe.xml b/docs/usermanual/chapters/getting_oe.xml
index d18c9557e3..c82df3a73f 100644
--- a/docs/usermanual/chapters/getting_oe.xml
+++ b/docs/usermanual/chapters/getting_oe.xml
@@ -98,7 +98,7 @@ $ <command>git</command> clone git://git.openembedded.org/openembedded</screen>
seems good practice to update your OpenEmbedded tree at least
daily. To do this, run:
<screen>
-$ <command>cd</command> $OEBASE
+$ <command>cd</command> $OEBASE/openembedded
$ <command>git</command> pull</screen>
</para>
</section>
@@ -142,7 +142,7 @@ $ <command>git</command> pull</screen>
<para>Since the path to your OpenEmbedded installation will be used in
many places, setting it in your environment will allow you to use
- the <varname>$OEBASE</varname> variable in all pathes and make it
+ the <varname>$OEBASE</varname> variable in all paths and make it
easier to change in the future should the need arise. To
set <varname>$OEBASE</varname> if you use a Bourne like shell
<footnote>
@@ -342,6 +342,16 @@ MACHINE = "om-gta01"</screen>
</varlistentry>
<varlistentry>
+ <term><literal>base-image</literal></term>
+ <listitem>
+ <para>Build an image that is the smallest possible image
+ which allows for ssh access and the ability to install
+ additional packages using ipkg.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><literal>console-image</literal></term>
<listitem>
<para>Build an image without the X11, gtk+, or qt windowing
@@ -463,9 +473,10 @@ MACHINE = "om-gta01"</screen>
</varlistentry>
<varlistentry>
- <term><literal>task-native-sdk</literal></term>
+ <term><literal>task-sdk-native</literal></term>
<listitem>
- <para>Mata-package for native (on-device) SDK.
+ <para>Meta-package for native (on-device) SDK. i.e. libc, gcc,
+ make, etc.
</para>
</listitem>
</varlistentry>
@@ -536,6 +547,13 @@ MACHINE = "om-gta01"</screen>
<para>Builds the appropriate kernel for your device.</para>
</listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><literal>virtual/bootloader</literal></term>
+ <listitem>
+ <para>Builds the appropriate bootloader for your device.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</para>
</section>
diff --git a/docs/usermanual/chapters/metadata.xml b/docs/usermanual/chapters/metadata.xml
index bbf6f733bb..794c66ce15 100644
--- a/docs/usermanual/chapters/metadata.xml
+++ b/docs/usermanual/chapters/metadata.xml
@@ -95,7 +95,7 @@
<para>OpenEmbedded has files ending with <emphasis>.conf</emphasis>,
<emphasis>.inc</emphasis>, <emphasis>.bb</emphasis>
- and<emphasis>.bbclass</emphasis>. The syntax and semantics of these files
+ and <emphasis>.bbclass</emphasis>. The syntax and semantics of these files
are best described in the <ulink
url="http://bitbake.berlios.de/manual"><application>BitBake</application>
manual</ulink>.</para>
@@ -111,7 +111,7 @@
<section id="metadata_writing_data">
<title>Writing Meta Data (Adding packages)</title>
- <para>This page will guide you trough the effort of writing a .bb file or
+ <para>This page will guide you through the effort of writing a .bb file or
<emphasis>recipe</emphasis> in BitBake speak.</para>
<para>Let's start with the easy stuff, like the package description,
@@ -128,23 +128,23 @@ DEPENDS = "gtk+"
RDEPENDS = "cool-ttf-fonts"
</screen> The package needs gtk+ to build ('DEPENDS') and
requires the 'cool-ttf-fonts' package to run ('RDEPENDS'). OE will add
- run-time dependencies on libraries on its own via the so called
- <emphasis>shlibs</emphasis>-code, but you need to specify everything other
+ run-time dependencies on libraries on its own via the so called
+ <emphasis>shlibs</emphasis>-code, but you need to specify everything else
by yourself, which in this case is the 'cool-ttf-fonts' package.</para>
<para>After entering all this OE will know what to build before trying to
build your application, but it doesn't know where to get it yet. So let's
add the source location: <screen>
SRC_URI = "http://www.host.com/foo/files/${P}.tar.bz2;md5sum=yoursum"
- </screen> This will tell the fetcher to where to download the
+ </screen> This will tell the fetcher where to download the
sources from and it will check the integrity using md5sum if you provided
the appropriate <emphasis>yoursum</emphasis>. You can make one by doing
<screen>md5sum foo-1.9.tar.bz2</screen> and replacing
<emphasis>yoursum</emphasis> with the md5sum on your screen. A typical
- md5sum will look like this: <screen>a6434b0fc8a54c3dec3d6875bf3be8mtn </screen>Notice
- the <emphasis>${P}</emphasis> variable, that one holds the package name,
- <emphasis>${PN}</emphasis> in BitBake speak and the package version,
- <emphasis>${PV}</emphasis> in BitBake speak. It's a short way of writing
+ md5sum will look like this: <screen>a6434b0fc8a54c3dec3d6875bf3be868 </screen>Notice
+ the <emphasis>${P}</emphasis> variable holds the package name
+ (<emphasis>${PN}</emphasis> in BitBake speak) and the package version
+ (<emphasis>${PV}</emphasis> in BitBake speak). It's a short way of writing
<emphasis>${PN}-${PV}</emphasis>. Using this notation means you can copy
the recipe when a new version is released without having to alter the
contents. You do need to check if everything is still correct, because new
diff --git a/docs/usermanual/chapters/recipes.xml b/docs/usermanual/chapters/recipes.xml
index 6a574d87b7..0bbc05f813 100644
--- a/docs/usermanual/chapters/recipes.xml
+++ b/docs/usermanual/chapters/recipes.xml
@@ -154,7 +154,7 @@ VAR2 = "The version is ${PV}"</screen></para>
<para>The following example:<screen>VAR1 ?= "New value"</screen>will
set <emphasis role="bold">VAR1</emphasis> to <emphasis>"New
- value"</emphasis> if its currently empty. However if it was already
+ value"</emphasis> if it is currently empty. However if it was already
set it would be unchanged. In the following <emphasis
role="bold">VAR1</emphasis> is left with the value
<emphasis>"Original value"</emphasis>:<screen>VAR1 = "Original value"
@@ -290,7 +290,7 @@ mv fixed.recipe.bb myrecipe.bb</screen></para>
</variablelist>
<para>For a detailed description of the syntax for the bitbake recipe
- files you should refer to the bitbake use manual.</para>
+ files you should refer to the bitbake user manual.</para>
</section>
<section id="recipes_versioning" xreflabel="versioning">
@@ -418,7 +418,7 @@ mv fixed.recipe.bb myrecipe.bb</screen></para>
<section id="recipes_variables" xreflabel="variables">
<title>Variables</title>
- <para>One of the most confusing part of bitbake recipes for new users is
+ <para>One of the most confusing parts of bitbake recipes for new users is
the large amount of variables that appear to be available to change and/or
control the behaviour of some aspect of the recipe. Some variables, such
as those derived from the file name are reasonably obvious, others are not
@@ -503,7 +503,7 @@ mv fixed.recipe.bb myrecipe.bb</screen></para>
<para>Practically all recipes start with a header section which describes
various aspects of the package that is being built. This information is
typically used directly by the package format (such as ipkg or deb) as
- its meta data used to describe the package.</para>
+ meta data used to describe the package.</para>
<para>Variables used in the header include:</para>
@@ -536,7 +536,7 @@ mv fixed.recipe.bb myrecipe.bb</screen></para>
<term>SECTION</term>
<listitem>
- <para>The section is used to categorise the application into a
+ <para>The section is used to categorize the application into a
specific group. Often used by GUI based installers to help users
when searching for software.</para>
@@ -625,7 +625,7 @@ mv fixed.recipe.bb myrecipe.bb</screen></para>
file or a compressed archive file, such as .tar.gz or .zip, then the files
will be uncompressed and extracted from the archive automatically.</para>
- <para>Archive files will be extracted from with the working directory,
+ <para>Archive files will be extracted from within the working directory,
<emphasis role="bold">${WORKDIR}</emphasis> and plain files will be copied
into the same directory. Patches will be applied from within the unpacked
source directory, <emphasis role="bold">${S}</emphasis>. (Details on these
@@ -722,7 +722,7 @@ mv fixed.recipe.bb myrecipe.bb</screen></para>
<listitem>
<para>This is where patches are applied and where the program is
- expected to be compiled in.</para>
+ expected to be compiled.</para>
</listitem>
</varlistentry>
@@ -790,7 +790,7 @@ mv fixed.recipe.bb myrecipe.bb</screen></para>
file://watchquagga.default"</screen>The recipe has two init files
and two configuration files, which are not patches, but are actually
files that it wants to include in the generated packages. Bitbake will
- copy these files into the work directory. So to access them during the
+ copy these files into the working directory. So to access them during the
install task we refer to them via the <emphasis
role="bold">WORKDIR</emphasis> variable:<screen>do_install () {
# Install init script and default settings
@@ -809,7 +809,7 @@ mv fixed.recipe.bb myrecipe.bb</screen></para>
directory called <emphasis
role="bold">&lt;packagename&gt;-&lt;version&gt;</emphasis> in the
<emphasis role="bold">WORKDIR</emphasis> directory. This is the
- directory in which it will change into before patching, compiling and
+ directory it will change into before patching, compiling and
installing the package.</para>
<para>For example, we have a package called <emphasis
@@ -875,7 +875,7 @@ S = "${WORKDIR}/widgets"</screen></para>
<title>Staging directories</title>
<para>Staging is used to make libraries, headers and binaries available
- for the build of one recipe for use by another recipe. Building a
+ from the build of one recipe for use by another recipe. Building a
library for example requires that packages be created containing the
libraries and headers for development on the target as well as making
them available on the host for building other packages that need the
@@ -1339,7 +1339,7 @@ $</screen>This shows us that the helloworld program is for an SH
programs that you need to run a configure script for, passing various
parameters, and then make. To make these work when cross-compiling you
need to provides a lot of variables to the configure script. But all the
- hard work as already been done for you. There's an <xref
+ hard work has already been done for you. There's an <xref
linkend="autotools_class" /> which takes care of most of the complexity
of building an autotools based package.</para>
@@ -1387,7 +1387,7 @@ inherit autotools</screen></para>
</listitem>
<listitem>
- <para>Make modifications to prevent the configure script from tying
+ <para>Make modifications to prevent the configure script from trying
to compile and run programs - any programs it compiles will be for
the target and not the host and so cannot be run.</para>
</listitem>
@@ -1519,7 +1519,7 @@ inherit autotools</screen></para>
role="bold">.so</emphasis>, <emphasis role="bold">.a</emphasis> and
associated libtool <emphasis role="bold">.la</emphasis> libraries.
It will determine the appropriate libraries to install and take care
- of any modifications that may be require for <emphasis
+ of any modifications that may be required for <emphasis
role="bold">.la</emphasis> files.</para>
<para>This function supports the following options:</para>
@@ -1839,7 +1839,7 @@ NOTE: package helloworld-0.1-r0: task do_package_write: completed</screen>We
<section>
<title>Default packages and files</title>
- <para>The defaults package settings are defined in <emphasis
+ <para>The default package settings are defined in <emphasis
role="bold">conf/bitbake.conf</emphasis> and are suitable for a lot of
recipes without any changes. The following list shows the default values
for the packaging related variables:</para>
@@ -2363,7 +2363,7 @@ addtask unpack_extra after do_unpack before do_patch</screen></para>
<para>Often a certain pattern is followed in more than one recipe, or
maybe some complex python based functionality is required to achieve the
desired end result. This is achieved through the use of classes, which can
- be found in the classes subdirectory at the top-level of on OE
+ be found in the classes subdirectory at the top-level of an OE
checkout.</para>
<para>Being aware of the available classes and understanding their
@@ -2390,7 +2390,7 @@ addtask unpack_extra after do_unpack before do_patch</screen></para>
<para>A class is used via the inherit method. The following is an example
for the <emphasis>curl</emphasis> recipe showing that it uses three
classes:<screen>inherit autotools pkgconfig binconfig</screen>In this case
- it is utilising the services of three separate classes:</para>
+ it is utilizing the services of three separate classes:</para>
<variablelist>
<varlistentry>
@@ -2443,7 +2443,7 @@ addtask unpack_extra after do_unpack before do_patch</screen></para>
libraries, available for use by other recipes. This is different to
installing because installing is about making things available for
packaging and then eventually for use on the target device. Staging on the
- other hand is about making things available on the host system for use by
+ other hand is about making things available on the host system for use in
building later applications.</para>
<para>Taking bzip2 as an example you can see that it stages a header file
@@ -2463,7 +2463,7 @@ addtask unpack_extra after do_unpack before do_patch</screen></para>
<term>STAGING_INCDIR</term>
<listitem>
- <para>The directory into which staged headers files should be
+ <para>The directory into which staged header files should be
installed. This is the equivalent of the standard <emphasis
role="bold">/usr/include</emphasis> directory.</para>
</listitem>
@@ -2531,7 +2531,7 @@ EXTRA_OECONF = "--disable-ldap \
script of the package. In the gnupg case it needs to be told where
the bzip2 headers and libraries are, and this is done via the
<emphasis>--with-bzip2</emphasis> option. In this case it points to
- the directory which include the lib and include subdirectories.
+ the directory which includes the lib and include subdirectories.
Since OE doesn't define a variable for one level above the include
and lib directories <emphasis role="bold">..</emphasis> is used to
indicate one directory up. Without this, gnupg would search the host
@@ -2717,9 +2717,9 @@ pkg_postinst_${PN}-rdisc6 () {
<listitem>
<para>This class is used when installing and/or removing qpf fonts.
- It register scripts to update the font paths and font cache
+ It registers scripts to update the font paths and font cache
information to ensure that the font information is kept up to date
- as fonts and installed and removed.</para>
+ as fonts are installed and removed.</para>
</listitem>
</varlistentry>
@@ -2972,7 +2972,7 @@ fi</screen></para>
</listitem>
<listitem>
- <para>How do handle incrementally creating patches</para>
+ <para>How to handle incrementally creating patches</para>
</listitem>
<listitem>
@@ -3025,7 +3025,7 @@ fi</screen></para>
</orderedlist>
<para>This results in the packaging system, such as ipkg, considering
- the released version to be older then the rc version.</para>
+ the released version to be older than the rc version.</para>
<para>In OpenEmbedded the correct naming of pre and rc versions is to use
the previous version number followed by a + followed by the new version
@@ -3138,7 +3138,7 @@ do_configure() {
role="bold">0_9_0</emphasis>.</para>
<para>Some of the more common python code in use in existing recipes is
- shown in the following table:</para>
+ shown in the following list:</para>
<variablelist>
<varlistentry>
@@ -3389,7 +3389,7 @@ $</screen>then we would expect it to select version
(since all of the existing versions have a preference of 0). Note that you
can still call bitbake directly on the recipe:<screen>bitbake -b recipes/procps/procps_4.0.0.bb</screen>This
enables you to test, and fix the package manually without having bitbake
- automatically select normally.</para>
+ automatically select it normally.</para>
<para>By using this feature in conjunction with overrides you can also
disable (or select) specific versions based on the override. The following
@@ -3418,7 +3418,7 @@ $</screen>then we would expect it to select version
</listitem>
<listitem>
- <para>samlpe/standard script?</para>
+ <para>sample/standard script?</para>
</listitem>
<listitem>
@@ -3445,13 +3445,13 @@ $</screen>then we would expect it to select version
from other packages.</para>
<para>The most common reason for alternatives is to reduce the size of the
- binaries. But cutting down on features, built in help and error messages
+ binaries. By cutting down on features, built in help, error messages
and combining multiple binaries into one large binary it's possible to
save considerable space. Often users are not expected to use the commands
interactively in embedded appliances and therefore these changes have no
visible effect to the user. In some situations users may have interactive
access, or they may be more advanced users who want shell access on
- appliances that normal don't provide it, and in these cases they should be
+ appliances that normally don't provide it, and in these cases they should be
able to install the full functional version if they desire.</para>
<section>
@@ -3478,7 +3478,7 @@ update-alternatives: Linking //usr/bin/find to find.findutils
update-alternatives: Linking //usr/bin/xargs to xargs.findutils</screen></para>
<para>Then we see that the standard version of find changes to the full
- featured implement ion:<screen>root@titan:~$ find --version
+ featured implementation:<screen>root@titan:~$ find --version
find --version
GNU find version 4.2.29
Features enabled: D_TYPE O_NOFOLLOW(enabled) LEAF_OPTIMISATION
@@ -3576,7 +3576,7 @@ which find
</listitem>
<listitem>
- <para>even if your distro don't use /var in tmpfs, others do</para>
+ <para>even if your distro doesn't use /var in tmpfs, others do</para>
</listitem>
<listitem>
@@ -3588,7 +3588,7 @@ which find
<section>
<title>Logging and log files</title>
- <para>As a consequence of the non-volatile and/or small capacity of the
+ <para>As a consequence of the volatile and/or small capacity of the
<emphasis role="bold">/var</emphasis> file system some distributions
choose methods of logging other than writing to a file. The most typical
is the use of an in-memory circular log buffer which can be read using
@@ -3616,7 +3616,7 @@ which find
</listitem>
<listitem>
- <para>Don't include any <command>/var</command> directories, file or
+ <para>Don't include any <command>/var</command> directories, files or
symlinks in packages. They would be lost on a reboot and so should
not be included in packages.</para>
</listitem>
@@ -3643,7 +3643,7 @@ which find
<itemizedlist>
<listitem>
- <para>about optimisation</para>
+ <para>about optimization</para>
</listitem>
<listitem>
diff --git a/docs/usermanual/chapters/usage.xml b/docs/usermanual/chapters/usage.xml
index 1563dc3eac..9703e3677b 100644
--- a/docs/usermanual/chapters/usage.xml
+++ b/docs/usermanual/chapters/usage.xml
@@ -9,11 +9,11 @@
what OpenEmbedded is all about, which is taking a lot of software and
creating something that you can run on another device. This involves
downloading some source code, compiling it, creating packages (like .deb
- or .rpm) and/or creating boot images that can written to flash on the
+ or .rpm) and/or creating boot images that can be written to flash on the
device. The difficulties of cross-compiling and the variety of devices
which can be supported lead to a lot more complexity in an OpenEmbedded
based distribution than you'd find in a typical desktop distribution
- (for which cross-compiling isn't needed).</para>
+ (where which cross-compiling isn't needed).</para>
<para>A major part of OpenEmbedded deals with compiling source code for
various projects. For each project this generally requires the same basic
@@ -67,7 +67,7 @@
<listitem>
<para>Tool chains (compiler, linker etc) are often difficult to
compile. Cross tool chains are even more difficult. Typically you'd go
- out and download a tool chain made by someone else - but not when your
+ out and download a tool chain made by someone else - but not when you're
using OE. In OE the entire toolchain is built as part of the process.
This may make things take longer initially and may make it more
difficult to get started but makes it easier to apply patches and test
@@ -123,7 +123,7 @@
helping you understand how to debug and develop within
OpenEmbedded.</para>
- <para>You'll also not a lot of reference to variables that define specific
+ <para>You'll also note a lot of references to variables that define specific
directories or change the behaviour of some part of the build process. You
should refer to <xref linkend="chapter_recipes" /> for full details on
these variables.</para>
@@ -160,7 +160,7 @@
<listitem>
<para>This directory contains distribution related files. A
distribution decides how various activities are handled in the final
- image, such as how networking configured, if usb devices will be
+ image, such as how networking is configured, if usb devices will be
supported, what packaging system is used, which libc is used
etc.</para>
</listitem>
@@ -193,8 +193,8 @@
<section id="usage_workspace" xreflabel="workspace">
<title>Work space</title>
- <para>Let's start out by taking a look at a typically working area. Note
- that this may not be exactly what see - there are a lot of options that
+ <para>Let's start out by taking a look at a typical working area. Note
+ that this may not be exactly what you see - there are a lot of options that
can effect exactly how things are done, but it gives us a pretty good idea
of whats going on. What we are looking at here is the tmp directory (as
specified by TMPDIR in your local.conf):<screen>$ <command>find</command> tmp -maxdepth 2 -type d
@@ -303,10 +303,10 @@ tmp/deploy/images</screen></para>
</varlistentry>
<varlistentry>
- <term>staging</term>
+ <term>sysroots</term>
<listitem>
- <para>Contains the staging area, which is used to stored natively
+ <para>Contains the staging area, which is used to store natively
compiled tools and and libraries and headers for the target that are
required for building other software.</para>
</listitem>
@@ -324,9 +324,9 @@ tmp/deploy/images</screen></para>
</variablelist>
<para>When people refer to the <emphasis>"tmp directory"</emphasis> this
- is the directory them are talking about.</para>
+ is the directory they are talking about.</para>
- <para>To perform a complete rebuild from script you would usually rename
+ <para>To perform a complete rebuild from scratch you would usually rename
or delete tmp and then restart your build. I recommend keeping one old
version of tmp around to use for comparison if something goes wrong with
your new build. For example:<screen>$ <command>rm</command> -fr tmp.OLD
@@ -339,7 +339,7 @@ $ <command>bitbake</command> bootstrap-image</screen></para>
<para>The work directory is where all source code is unpacked into,
where source is configured, compiled and packaged. In other words this
is where all the action happens. Each bitbake recipe will produce a
- corresponding sub directory in the work directory. The sub directory
+ corresponding subdirectory in the work directory. The subdirectory
name will contain the recipe name, version and the release number (as
defined by the PR variable within the recipe).</para>
@@ -348,9 +348,9 @@ $ <command>bitbake</command> bootstrap-image</screen></para>
tmp/work
tmp/work/busybox-1.2.1-r13
tmp/work/libice-1_1.0.3-r0
-tmp/work/arpwatch-2.1a15-r2</screen>You can see that the first three (of
+tmp/work/arpwatch-2.1a15-r2</screen>You can see the first three (of
several hundred) recipes here and they are for release 13 of busybox
- 1.2.1, release 0 or libice 1.1.0.3 and release 2 of arpwatch 2.1a15.
+ 1.2.1, release 0 of libice 1.1.0.3 and release 2 of arpwatch 2.1a15.
It's also possible that you may just have a sub directory for your
targets architecture and operating system in which case these
directories will be in that additional subdirectory, as shown
@@ -446,7 +446,7 @@ tmp/work/lzo-1.08-r14/image</screen></para>
install into <emphasis role="bold">${D}/usr/bin</emphasis> and
<emphasis role="bold">${D}/usr/lib</emphasis> instead. When
installed on the target the ${D} will be not be included so
- they'll end up in the correct place. You definitely don't wont
+ they'll end up in the correct place. You definitely don't want
files on your host system being replaced by cross-compiled
binaries for your target!</para>
</listitem>
@@ -544,14 +544,14 @@ tmp/work/lzo-1.08-r14/install/lzo/usr/lib/liblzo.so.1.0.0</screen></para>
packages. You probably need to start out by downloading the source code,
then unpacking the source code. Maybe you need to apply some patches for
some reason. Then you might run the configure script of the package,
- perhaps passing it some options to configure it to your liking. The you
- might run "make install" to install the software. If your actually going
+ perhaps passing it some options to configure it to your liking. Then you
+ might run "make install" to install the software. If you're actually going
to make some packages, such as .deb or .rpm, then you'd have additional
tasks you'd perform to make them.</para>
<para>You find that building things in OpenEmbedded works in a similar way
- there are a number of tasks that are executed in a predefined order for
- each recipe. Any many of the tasks correspond to those listed above like
+ each recipe. Many of the tasks correspond to those listed above like
<emphasis>"download the source"</emphasis>. In fact you've probably
already seen some of the names of these tasks - bitbake displays them as
they are processed:<screen>$ <command>bitbake</command> lzo
@@ -718,7 +718,7 @@ NOTE: build 200705041709: completed</screen><note>
<para>The <emphasis>configure</emphasis> task takes care of the
configuration of the package. Running a configure script
(<emphasis>"./configure &lt;options&gt;"</emphasis>) is probably the
- form of configuration that is most recognised but it's not the only
+ form of configuration that is most recognized but it's not the only
configuration system that exists.</para>
</listitem>
</varlistentry>
@@ -748,7 +748,7 @@ NOTE: build 200705041709: completed</screen><note>
<para>This is different from the <emphasis>install</emphasis> task
in that this is responsible for making available libraries and
headers for use during build on the development host. Therefore
- it's libraries which normal have to stage things while
+ it is libraries which normally have to stage things while
applications normally don't need to. The
<emphasis>install</emphasis> task on the other hand is making
files available for packaging and ultimately installation on the
@@ -762,7 +762,7 @@ NOTE: build 200705041709: completed</screen><note>
<listitem>
<para>The <emphasis>install</emphasis> task is responsible for
- actually installing everything. Now this needs to install the
+ actually installing everything. This needs to install the
software into the destination directory, <emphasis
role="bold">D</emphasis>. This directory won't actually be a part of
the final package though. In other words if you install something
@@ -782,7 +782,7 @@ NOTE: build 200705041709: completed</screen><note>
package. It moves the files for the destination directory, <emphasis
role="bold">${D}</emphasis>, that they were installed in into the
appropriate packages subdirectory. Usually there will be a main
- package a separate documentation (-doc), development (-dev) and
+ package, a separate documentation (-doc), development (-dev) and
debugging packages (-dbg) for example.</para>
</listitem>
</varlistentry>
@@ -808,11 +808,11 @@ NOTE: build 200705041709: completed</screen><note>
<emphasis>install</emphasis>. This is slightly confusing but any task
<emphasis>x</emphasis> is implemented via a function called
<emphasis>do_x</emphasis> in the class or recipe where it is defined.
- See places refer to the tasks via their name only and some with the
+ Some places refer to the tasks via their name only and some with the
<emphasis>do</emphasis> prefix.</para>
</note>
- <para>You will almost certainly notice tasks beyond these ones - there are
+ <para>You will almost certainly notice tasks beyond the ones above - there are
various methods available to insert additional tasks into the tasks
sequence. As an example the <emphasis
role="bold">insane.bbclass</emphasis>, which performs various QA checks,
@@ -822,7 +822,7 @@ NOTE: build 200705041709: completed</screen><note>
another new task called <emphasis>qa_staging</emphasis> between
<emphasis>populate_sysroot</emphasis> and <emphasis>build</emphasis>
tasks. The former validates the result of the
- <emphasis>configure</emphasis> task and the late the results of the
+ <emphasis>configure</emphasis> task and the later the results of the
<emphasis>populate_sysroot</emphasis> task.</para>
<para>To determine the full list of tasks available for a specific recipe
@@ -943,8 +943,8 @@ $ <command>bitbake</command> -b &lt;bb-file&gt; -D</screen></para>
<listitem>
<para>Unpack the source file but don't apply the patches yet.
Sometimes you may want to look at the extracted, but not patched
- source code and that's what just unpacking will give you (some
- time's handy to get diffs generated against the original
+ source code and that's what just unpacking will give you
+ (sometimes handy to get diffs generated against the original
source).</para>
</listitem>
</varlistentry>
@@ -961,7 +961,7 @@ $ <command>bitbake</command> -b &lt;bb-file&gt; -D</screen></para>
<term>configure</term>
<listitem>
- <para>Performs and configuration that is required for the
+ <para>Performs any configuration that is required for the
software.</para>
</listitem>
</varlistentry>
@@ -1013,12 +1013,12 @@ $ <command>bitbake</command> -b &lt;bb-file&gt; -D</screen></para>
</varlistentry>
</variablelist>
- <para>Note that each of the actions that corresponds to task's will run
+ <para>Note that each of the actions that corresponds to a task will run
any preceding tasks that have not yet been performed. So starting with
compile will also perform the fetch, unpack, patch and configure
actions.</para>
- <para>A typically development session might involve editing files in the
+ <para>A typical development session might involve editing files in the
working directory and then recompiling until it all works:<screen>[<emphasis>... test ...</emphasis>]
$ <command>bitbake</command> -b recipes/testapp/testapp_4.3.bb -c compile -D
@@ -1072,7 +1072,7 @@ $ <command>vi</command> recipes/testapp/testapp_4.3.bb</screen>At this stage you
build a specific recipe:<screen>BB&gt;&gt; build net-snmp</screen>If it
fails you may want to clean the build before trying again:<screen>BB&gt;&gt; clean net-snmp</screen>If
you update the recipe by editing the .bb file (to fix some issues) then
- you will want to clean the package, reparse the modified recipe, and the
+ you will want to clean the package, reparse the modified recipe, and then
build again:<screen>BB&gt;&gt; clean net-snmp
BB&gt;&gt; reparse net-snmp
BB&gt;&gt; build net-snmp</screen>Note that you can use wildcards in the
@@ -1088,7 +1088,7 @@ BB&gt;&gt; build net-snmp</screen>Note that you can use wildcards in the
various environment variables, such as <emphasis role="bold">CC</emphasis>
and <emphasis role="bold">PATH</emphasis> etc, to values suitable for
cross-compiling. If you wish to manually run configure scripts and compile
- file during development it would be nice to have all those values set for
+ files during development it would be nice to have all those values set for
you. This is what devshell does - it provides you with an interactive
shell with all the appropriate variables set for cross-compiling.</para>
diff --git a/lib/oe/utils.py b/lib/oe/utils.py
index e61d663a50..3469700726 100644
--- a/lib/oe/utils.py
+++ b/lib/oe/utils.py
@@ -67,3 +67,14 @@ def str_filter(f, str, d):
def str_filter_out(f, str, d):
from re import match
return " ".join(filter(lambda x: not match(f, x, 0), str.split()))
+
+def param_bool(cfg, field, dflt = None):
+ """Lookup <field> in <cfg> map and convert it to a boolean; take
+ <dflt> when this <field> does not exist"""
+ value = cfg.get(field, dflt)
+ strvalue = str(value).lower()
+ if strvalue in ('yes', 'y', 'true', 't', '1'):
+ return True
+ elif strvalue in ('no', 'n', 'false', 'f', '0'):
+ return False
+ raise ValueError("invalid value for boolean parameter '%s': '%s'" % (field, value))
diff --git a/recipes/angstrom/angstrom-uboot-scripts.bb b/recipes/angstrom/angstrom-uboot-scripts.bb
index 67245a0506..2af6a74378 100644
--- a/recipes/angstrom/angstrom-uboot-scripts.bb
+++ b/recipes/angstrom/angstrom-uboot-scripts.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Various uboot scripts"
-PR = "r1"
+PR = "r2"
DEPENDS = "u-boot-mkimage-native"
diff --git a/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo-pico.cmd b/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo-pico.cmd
new file mode 100755
index 0000000000..32307ff226
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo-pico.cmd
@@ -0,0 +1,39 @@
+#setenv usbtty 'cdc_acm'
+#setenv mpurate '500'
+#setenv buddy 'none'
+
+#setenv vram '12M'
+#setenv defaultdisplay 'dvi'
+#setenv dvimode '640x480MR-16@60'
+
+setenv setbase 'setenv baseargs ${memmap} console=${console} mpurate=${mpurate} buddy=${buddy} vram=${vram} musb_hdrc.fifomode=${musbfifomode} omapfb.mode=${defaultdisplay}:${dvimode} omapdss.def_disp=${defaultdisplay}'
+
+setenv nandroot 'root=/dev/mtdblock4 rw rootfstype=jffs2'
+setenv nandargs 'run setbase; setenv bootargs ${baseargs} ${nandroot}'
+setenv nandloaduimage 'nand read ${loadaddr} 280000 400000'
+setenv nandboot 'run nandloadimage; bootm ${loadaddr}'
+
+setenv mmcroot 'root=/dev/mmcblk0p2 rw rootfstype=ext3 rootwait'
+setenv mmcargs 'run setbase; setenv bootargs ${baseargs} ${mmcroot}'
+setenv mmcloaduimage 'fatload mmc 0 ${loadaddr} uImage'
+setenv mmcboot 'run mmcloaduimage; bootm ${loadaddr}'
+
+echo Setting Specific Environment from MMC boot.scr
+
+# set musb to only use 8k for fifo memory - not necesary on xm, but safe anyway
+setenv musbfifomode '5'
+
+# mpurate is read from omap registers on omap3530 (which x-load has set to 600mhz?), on xm, uboot sets this to 1GHz
+#setenv mpurate '720'
+setenv memmap 'mem=80M mem=128M@0x88000000'
+setenv vram '16M omapfb.vram=0:8M,1:4M,2:4M'
+setenv defaultdisplay 'dvi'
+
+setenv dvimode '640x480MR-32@60'
+#setenv dvimode 'hd720'
+#setenv dvimode '1280x720MR-32@60'
+
+run mmcargs
+printenv
+run mmcboot
+
diff --git a/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo.cmd b/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo.cmd
new file mode 100755
index 0000000000..b232f79141
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/linuxtagdemo.cmd
@@ -0,0 +1,37 @@
+#setenv usbtty 'cdc_acm'
+#setenv mpurate '500'
+#setenv buddy 'none'
+
+#setenv vram '12M'
+#setenv defaultdisplay 'dvi'
+#setenv dvimode '640x480MR-16@60'
+
+setenv setbase 'setenv baseargs ${memmap} console=${console} mpurate=${mpurate} buddy=${buddy} vram=${vram} musb_hdrc.fifomode=${musbfifomode} omapfb.mode=${defaultdisplay}:${dvimode} omapdss.def_disp=${defaultdisplay}'
+
+setenv nandroot 'root=/dev/mtdblock4 rw rootfstype=jffs2'
+setenv nandargs 'run setbase; setenv bootargs ${baseargs} ${nandroot}'
+setenv nandloaduimage 'nand read ${loadaddr} 280000 400000'
+setenv nandboot 'run nandloadimage; bootm ${loadaddr}'
+
+setenv mmcroot 'root=/dev/mmcblk0p2 rw rootfstype=ext3 rootwait'
+setenv mmcargs 'run setbase; setenv bootargs ${baseargs} ${mmcroot}'
+setenv mmcloaduimage 'fatload mmc 0 ${loadaddr} uImage'
+setenv mmcboot 'run mmcloaduimage; bootm ${loadaddr}'
+
+echo Setting Specific Environment from MMC boot.scr
+
+# set musb to only use 8k for fifo memory - not necesary on xm, but safe anyway
+setenv musbfifomode '5'
+
+# mpurate is read from omap registers on omap3530 (which x-load has set to 600mhz?), on xm, uboot sets this to 1GHz
+#setenv mpurate '720'
+setenv memmap 'mem=80M mem=128M@0x88000000'
+setenv vram '16M omapfb.vram=0:8M,1:4M,2:4M'
+setenv defaultdisplay 'dvi'
+setenv dvimode 'hd720'
+#setenv dvimode '1280x720MR-32@60'
+
+run mmcargs
+printenv
+run mmcboot
+
diff --git a/recipes/dri/glamo-dri-tests_git.bb b/recipes/dri/glamo-dri-tests_git.bb
index 1f9540b273..1645de5a9b 100644
--- a/recipes/dri/glamo-dri-tests_git.bb
+++ b/recipes/dri/glamo-dri-tests_git.bb
@@ -1,6 +1,6 @@
DEPENDS = "libdrm virtual/libx11 libxext"
-SRCREV = "080b8db3d9dbfae38ebb00439887b5535ab1d380"
+SRCREV = "062cc7ef88078815fc2f8d0da3abd80d0514c248"
PV = "1.0.0+gitr${SRCPV}"
SRC_URI = "git://git.bitwiz.org.uk/glamo-dri-tests.git;protocol=git;branch=master"
diff --git a/recipes/dri/libdrm_2.4.18.bb b/recipes/dri/libdrm_2.4.18.bb
index e3bb393d8a..27c82c23aa 100644
--- a/recipes/dri/libdrm_2.4.18.bb
+++ b/recipes/dri/libdrm_2.4.18.bb
@@ -1,5 +1,7 @@
require libdrm.inc
+DEPENDS = "libpthread-stubs"
+
PR = "${INC_PR}.0"
SRC_URI[md5sum] = "d2b5fbfd37742af7d2169f7d26ce3007"
diff --git a/recipes/dri/libdrm_git.bb b/recipes/dri/libdrm_git.bb
index e48a2aa33a..608917fd37 100644
--- a/recipes/dri/libdrm_git.bb
+++ b/recipes/dri/libdrm_git.bb
@@ -7,11 +7,10 @@ DEPENDS = "libpthread-stubs virtual/kernel"
PR = "${INC_PR}.0"
PE = "1"
-PV = "2.4.18+gitr${SRCPV}"
-PR = "r0"
+PV = "2.4.20+gitr${SRCPV}"
-SRCREV = "a5c8f55397377994ceeb76ed0ff148ff89eb3a1b"
-SRCREV_shr = "b5aec2bd3df736216e86eae28e278172d3ba3362"
+SRCREV = "a3305b076c005e0d3bd55da0214e91413cf65b48"
+SRCREV_shr = "9411b0ca002b34d2d13a132038170c2e7b08945c"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_shr = "1"
diff --git a/recipes/htcdream/htcdream-gps_git.bb b/recipes/htcdream/htcdream-gps_git.bb
new file mode 100644
index 0000000000..958460117f
--- /dev/null
+++ b/recipes/htcdream/htcdream-gps_git.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "HTC Dream GPS utility"
+SECTION = "console/utils"
+LICENSE = "GPL"
+SRCREV = "c0339e14de385723e32667a3b815eef74c040b9b"
+PV = "1.0+gitr${SRCPV}"
+PR = "r0"
+
+SRC_URI = "\
+ ${FREESMARTPHONE_GIT}/utilities.git;protocol=git;branch=master \
+"
+S = "${WORKDIR}/git/android/rpc"
+
+inherit autotools
diff --git a/recipes/linux/linux-2.6.34/qemuarm/defconfig b/recipes/linux/linux-2.6.34/qemuarm/defconfig
new file mode 100644
index 0000000000..57e862d484
--- /dev/null
+++ b/recipes/linux/linux-2.6.34/qemuarm/defconfig
@@ -0,0 +1,1822 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.34
+# Wed May 26 16:10:18 2010
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_HAVE_PROC_CPU=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_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_NEED_DMA_MAP_STATE=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_HAVE_KERNEL_GZIP=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
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT 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=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# 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_NET_NS is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_LZO=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+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
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
+
+#
+# Kernel Performance Events And Counters
+#
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_PERF_COUNTERS is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=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_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 is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+# 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=y
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCMRING 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_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_NUC93X is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_SHMOBILE 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_S5P6440 is not set
+# CONFIG_ARCH_S5P6442 is not set
+# CONFIG_ARCH_S5PC1XX is not set
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_NOMADIK is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP is not set
+
+#
+# Versatile platform type
+#
+CONFIG_ARCH_VERSATILE_PB=y
+CONFIG_MACH_VERSATILE_AB=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_PABRT_LEGACY=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+CONFIG_ARM_L1_CACHE_SHIFT=5
+CONFIG_ARM_VIC=y
+CONFIG_ARM_VIC_NR=2
+CONFIG_ICST307=y
+CONFIG_COMMON_CLKDEV=y
+
+#
+# Bus support
+#
+CONFIG_ARM_AMBA=y
+CONFIG_PCI=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_STUB is not set
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+# CONFIG_NO_HZ is not set
+# 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_LEDS=y
+CONFIG_LEDS_CPU=y
+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="mem=128M console=ttyAMA0"
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+
+#
+# CPU Power Management
+#
+# CONFIG_CPU_IDLE is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_VFP=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 is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_APM_EMULATION is not set
+# CONFIG_PM_RUNTIME is not set
+CONFIG_PM_OPS=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+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 is not set
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# 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=y
+# CONFIG_INET_DIAG is not set
+# 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=y
+# CONFIG_CFG80211 is not set
+# CONFIG_LIB80211 is not set
+
+#
+# CFG80211 needs to be enabled for MAC80211
+#
+# 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=""
+# 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_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_TESTS 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=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_GEOMETRY 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_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# 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_PHYSMAP is not set
+CONFIG_MTD_ARM_INTEGRATOR=y
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+# CONFIG_MTD_PISMO is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 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 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_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# 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_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+CONFIG_EEPROM_LEGACY=m
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_CB710_CORE is not set
+# CONFIG_IWMC3200TOP is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+# 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=y
+# CONFIG_BLK_DEV_SR_VENDOR 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=y
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_FCOE is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_PMCRAID is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_BFA_FC 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_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# You can enable one or both FireWire driver stacks.
+#
+
+#
+# The newer stack is recommended.
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O 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=y
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_AX88796 is not set
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+CONFIG_SMC91X=y
+# CONFIG_DM9000 is not set
+# CONFIG_ETHOC is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_DNET is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 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_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_KSZ884X_PCI is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+CONFIG_8139CP=y
+# CONFIG_8139TOO is not set
+# CONFIG_R6040 is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SMSC9420 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 is not set
+# CONFIG_ATL2 is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_CNIC is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL1C is not set
+# CONFIG_JME is not set
+CONFIG_NETDEV_10000=y
+# CONFIG_CHELSIO_T1 is not set
+CONFIG_CHELSIO_T3_DEPENDS=y
+# CONFIG_CHELSIO_T3 is not set
+CONFIG_CHELSIO_T4_DEPENDS=y
+# CONFIG_CHELSIO_T4 is not set
+# CONFIG_ENIC is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_VXGE is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_NIU is not set
+# CONFIG_MLX4_EN is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_TEHUTI is not set
+# CONFIG_BNX2X is not set
+# CONFIG_QLCNIC is not set
+# CONFIG_QLGE is not set
+# CONFIG_SFC is not set
+# CONFIG_BE2NET is not set
+# CONFIG_TR is not set
+CONFIG_WLAN=y
+# CONFIG_ATMEL is not set
+# CONFIG_PRISM54 is not set
+# CONFIG_HOSTAP is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_VMXNET3 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
+# CONFIG_INPUT_SPARSEKMAP is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADP5588 is not set
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_QT2160 is not set
+# CONFIG_KEYBOARD_LKKBD 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_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_SERPORT is not set
+CONFIG_SERIO_AMBAKMI=y
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 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=y
+# CONFIG_COMPUTONE is not set
+# CONFIG_ROCKETPORT is not set
+# CONFIG_CYCLADES is not set
+# CONFIG_DIGIEPCA is not set
+# CONFIG_MOXA_INTELLIO is not set
+# CONFIG_MOXA_SMARTIO is not set
+# CONFIG_ISI is not set
+# CONFIG_SYNCLINKMP is not set
+# CONFIG_SYNCLINK_GT is not set
+# CONFIG_N_HDLC is not set
+# CONFIG_RISCOM8 is not set
+# CONFIG_SPECIALIX is not set
+# CONFIG_STALDRV is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=m
+CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+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 is not set
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=16
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_HELPER_AUTO=y
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_DESIGNWARE is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_VERSATILE is not set
+# CONFIG_I2C_XILINX 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
+# CONFIG_I2C_STUB 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_SPI is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+# CONFIG_GPIOLIB is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY 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_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_ADT7411 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_I5K_AMB 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_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_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_SIS5595 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_AMC6821 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 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_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_88PM860X is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 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_PMIC_DA903X is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_LPC_SCH is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+# CONFIG_DRM is not set
+# 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_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+CONFIG_FB_ARMCLCD=y
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_VIA is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE 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 is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+CONFIG_FONT_ACORN_8x8=y
+# 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 is not set
+CONFIG_SOUND=y
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# 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_VMASTER=y
+# 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_AC97_CODEC=m
+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_AC97_POWER_SAVE is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_OXYGEN is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_HIFIER is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LX6464ES is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+CONFIG_SND_ARM=y
+CONFIG_SND_ARMAACI=m
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_PID is not set
+
+#
+# Special HID drivers
+#
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+# CONFIG_USB is not set
+
+#
+# Enable Host or Gadget support to see Inventra options
+#
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_UWB 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_ARMMMCI=m
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_TIFM_SD is not set
+# CONFIG_MMC_CB710 is not set
+# CONFIG_MMC_VIA_SDMMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND 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_BQ32K is not set
+# 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
+#
+
+#
+# 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_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_PL030 is not set
+CONFIG_RTC_DRV_PL031=y
+# 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=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4_FS is not set
+CONFIG_JBD=y
+CONFIG_FS_MBCACHE=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_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 is not set
+CONFIG_INOTIFY_USER=y
+# 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_FAT_FS=m
+# CONFIG_MSDOS_FS is not set
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# 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=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_LOGFS is not set
+CONFIG_CRAMFS=y
+CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+CONFIG_MINIX_FS=y
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+CONFIG_ROMFS_FS=y
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_ON_BLOCK=y
+# 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 is not set
+# CONFIG_NFS_V4 is not set
+CONFIG_ROOT_NFS=y
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=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_CEPH_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=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+CONFIG_NLS_CODEPAGE_850=m
+# 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=m
+# 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 is not set
+# 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 is not set
+# CONFIG_TIMER_STATS is not set
+# 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 is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# 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=y
+# 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_SYSCTL_SYSCALL_CHECK 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_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_ARM_UNWIND=y
+CONFIG_DEBUG_USER=y
+CONFIG_DEBUG_ERRORS=y
+# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_DEBUG_LL=y
+# CONFIG_EARLY_PRINTK is not set
+# CONFIG_DEBUG_ICEDCC 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_FIPS is not set
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_ALGAPI2=m
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=m
+# 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
+# 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 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=m
+# 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 is not set
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYPTO_LZO is not set
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X 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 is not set
+# 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_DECOMPRESS=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_NLATTR=y
+CONFIG_GENERIC_ATOMIC64=y
diff --git a/recipes/linux/linux_2.6.34.bb b/recipes/linux/linux_2.6.34.bb
index b406e535df..ea74e94750 100644
--- a/recipes/linux/linux_2.6.34.bb
+++ b/recipes/linux/linux_2.6.34.bb
@@ -2,6 +2,7 @@ require linux.inc
# Mark archs/machines that this kernel supports
DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_qemuarm = "1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/${P}.tar.bz2;name=kernel \
file://ARM-Add-support-for-LZMA-compressed-kernel-images.patch;status=pending \
diff --git a/recipes/mesa/mesa-dri-7.8.1/glamo.patch b/recipes/mesa/mesa-dri-7.8.1/glamo.patch
index cc55c8b91e..52b4f3fa69 100644
--- a/recipes/mesa/mesa-dri-7.8.1/glamo.patch
+++ b/recipes/mesa/mesa-dri-7.8.1/glamo.patch
@@ -2371,3 +2371,16 @@ index 0000000..ba8f997
+ unsigned int count);
+
+#endif /* __GLAMO_TRIS_H */
+diff --git a/src/mesa/drivers/dri/glamo/glamo_screen.c b/src/mesa/drivers/dri/glamo/glamo_screen.c
+index 39148f3..8244ec3 100644
+--- a/src/mesa/drivers/dri/glamo/glamo_screen.c
++++ b/src/mesa/drivers/dri/glamo/glamo_screen.c
+@@ -166,7 +166,7 @@ static GLboolean glamoCreateBuffer(__DRIscreen *driScrnPriv,
+ gfb = CALLOC_STRUCT(glamo_framebuffer);
+ if ( !gfb ) return GL_FALSE;
+
+- _mesa_initialize_framebuffer(&gfb->base, mesaVis);
++ _mesa_initialize_window_framebuffer(&gfb->base, mesaVis);
+
+ /* we only support this one format at the moment */
+ rgbFormat = GL_RGB5;
diff --git a/recipes/mesa/mesa-dri_7.8.1.bb b/recipes/mesa/mesa-dri_7.8.1.bb
index 1d8e764046..5609cb47e2 100644
--- a/recipes/mesa/mesa-dri_7.8.1.bb
+++ b/recipes/mesa/mesa-dri_7.8.1.bb
@@ -15,7 +15,7 @@ SRC_URI[archive.sha256sum] = "b0b46e5abfd75db44501e308125fa92bcf1c91d91e97a043a3
SRC_URI[demos.md5sum] = "9ef47f911869657c6bf2f43ebce86b61"
SRC_URI[demos.sha256sum] = "e9f20b9345240064ac35ec914ebce63322a96d3f7c566963791d0daf7e7a93e5"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
# most of our targets do not have DRI so will use mesa-xlib
DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/shr/elementary-theme-gry_git.bb b/recipes/shr/elementary-theme-gry_git.bb
index 8b4ed4db4e..ca690d6ff2 100644
--- a/recipes/shr/elementary-theme-gry_git.bb
+++ b/recipes/shr/elementary-theme-gry_git.bb
@@ -6,7 +6,7 @@ DEPENDS = "edje-native"
RRECOMMENDS = "e-wm-theme-illume-gry"
LICENSE = "unknown"
-SRCREV = "2b62d1c9b02da047071105a7b5695acd6c6dbcca"
+SRCREV = "722b0dcc2b1bf79515eaaddd9ebc7819c7f923d0"
PV = "0.8-${EFL_SRCREV}+gitr${SRCPV}"
PR = "r1"
diff --git a/recipes/ti/matrix-gui-common/browser b/recipes/ti/matrix-gui-common/browser
new file mode 100644
index 0000000000..b5202d5a14
--- /dev/null
+++ b/recipes/ti/matrix-gui-common/browser
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+BROWSERDIR=""
+BROWSERAPP="browser"
+
+#Check if DISPLAY is set. If so we assume we are running in X11
+#and will call the X11 version of the browser if it exists.
+if [ "$DISPLAY" == "" ]
+then
+ BROWSERDIR="/usr/bin/qtopia/demos/browser"
+else
+ BROWSERDIR="/usr/bin/qt4/demos/browser"
+fi
+
+if [ -e "$BROWSERDIR/$BROWSERAPP" ]
+then
+ cd $BROWSERDIR
+ ./$BROWSERAPP
+fi
+
diff --git a/recipes/ti/matrix-gui-common_svn.bb b/recipes/ti/matrix-gui-common_svn.bb
new file mode 100644
index 0000000000..43d6b0c8bf
--- /dev/null
+++ b/recipes/ti/matrix-gui-common_svn.bb
@@ -0,0 +1,47 @@
+DESCRIPTION = "Common files for all versions of Matrix GUI"
+HOMEPAGE = "https://gforge.ti.com/gf/project/matrix_gui/"
+LICENSE = "BSD"
+SECTION = "multimedia"
+PRIORITY = "optional"
+
+SRCREV = "58"
+PV = "1.0"
+PR = "r1+svnr${SRCPV}"
+
+#Checkout the project repository to get access to the scripts and data
+#files.
+SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' \
+ file://browser \
+"
+
+S = "${WORKDIR}/trunk"
+
+MATRIX_EXTRA_BINS = " \
+ memInfo \
+ networkSettings \
+ runOGLES2Coverflow \
+ runOGLES2Shaders \
+ runOGLESChameleonMan \
+ runOGLESVase \
+ setopp1 \
+ setopp2 \
+ setopp3 \
+ setopp4 \
+ standby \
+ sysSettings \
+ taskInfo \
+"
+
+do_install() {
+ install -d ${D}/${bindir}
+ for i in ${MATRIX_EXTRA_BINS}; do
+ install -m 0755 ${S}/bin/${i} ${D}/${bindir}
+ done
+ install -m 0755 ${WORKDIR}/browser ${D}/${bindir}
+ install -d ${D}/${datadir}/matrix/html
+ install -m 0644 ${S}/*.html ${D}/${datadir}/matrix/html/
+ install -d ${D}/${datadir}/matrix/images
+ install -m 0644 ${S}/images/*.png ${D}/${datadir}/matrix/images/
+}
+
+FILES_${PN} += "${datadir}/matrix/*"
diff --git a/recipes/ti/matrix-gui-e/dm365-evm/init b/recipes/ti/matrix-gui-e/dm365-evm/init
new file mode 100755
index 0000000000..cd1291330d
--- /dev/null
+++ b/recipes/ti/matrix-gui-e/dm365-evm/init
@@ -0,0 +1,26 @@
+#! /bin/sh
+matrixgui="/usr/bin/matrix_guiE"
+GUI_OPTS="-qws -geometry 720x480+0+10 -display transformed:Rot0 /usr/share/matrix/html/menu_main.html"
+
+test -x "$matrixgui" || exit 0
+
+case "$1" in
+ start)
+ # switch to component 480p mode
+ echo 480P-60 > /sys/class/davinci_display/ch0/mode
+ echo COMPONENT > /sys/class/davinci_display/ch0/output
+ echo -n "Starting Matrix GUI application"
+ start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui-e.pid --exec $matrixgui -- $GUI_OPTS
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping Matrix GUI application"
+ start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui-e.pid
+ echo "."
+ ;;
+ *)
+ echo "Usage: /etc/init.d/matrix-gui-e {start|stop}"
+ exit 1
+esac
+
+exit 0
diff --git a/recipes/ti/matrix-gui-e/init b/recipes/ti/matrix-gui-e/init
new file mode 100755
index 0000000000..8a1c77e965
--- /dev/null
+++ b/recipes/ti/matrix-gui-e/init
@@ -0,0 +1,32 @@
+#! /bin/sh
+
+matrixgui="/usr/bin/matrix_guiE"
+GUI_OPTS="-qws -display transformed:Rot90 /usr/share/matrix/html/menu_main.html"
+
+test -x "$matrixgui" || exit 0
+
+export TSLIB_TSDEVICE=/dev/input/touchscreen0
+export QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
+
+case "$1" in
+ start)
+ if [ ! -f /etc/pointercal ] ; then
+ echo -n "Calibrating touchscreen (first time only)"
+ ts_calibrate
+ echo "."
+ fi
+ echo -n "Starting Matrix GUI application"
+ start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui-e.pid --exec $matrixgui -- $GUI_OPTS
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping Matrix GUI application"
+ start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui-e.pid
+ echo "."
+ ;;
+ *)
+ echo "Usage: /etc/init.d/matrix-gui-e {start|stop}"
+ exit 1
+esac
+
+exit 0
diff --git a/recipes/ti/matrix-gui-e_svn.bb b/recipes/ti/matrix-gui-e_svn.bb
new file mode 100644
index 0000000000..78ef003f7f
--- /dev/null
+++ b/recipes/ti/matrix-gui-e_svn.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Matrix GUI for Qt Embedded"
+HOMEPAGE = "https://gforge.ti.com/gf/project/matrix_gui/"
+LICENSE = "BSD"
+SECTION = "multimedia"
+PRIORITY = "optional"
+
+SRCREV = "58"
+PV = "1.0"
+PR = "r13+svnr${SRCPV}"
+
+SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' \
+ file://init \
+"
+
+S = "${WORKDIR}/trunk"
+
+INITSCRIPT_NAME = "matrix-gui-e"
+#INITSCRIPT_PARAMS = "defaults 99"
+INITSCRIPT_PARAMS = "start 99 3 . stop 99 3 ."
+
+inherit qt4e update-rc.d
+
+do_install() {
+ install -d ${D}/${bindir}
+ install -m 0755 ${S}/matrix_gui ${D}/${bindir}/matrix_guiE
+ install -d ${D}${sysconfdir}/init.d/
+ install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-gui-e
+}
+
+RRECOMMENDS_${PN} = "qt4-embedded-plugin-mousedriver-tslib"
diff --git a/recipes/ti/matrix-gui/0001-Disable-cursor-override-for-X11.patch b/recipes/ti/matrix-gui/0001-Disable-cursor-override-for-X11.patch
new file mode 100644
index 0000000000..61eba44eea
--- /dev/null
+++ b/recipes/ti/matrix-gui/0001-Disable-cursor-override-for-X11.patch
@@ -0,0 +1,27 @@
+From b0e91f703ffdcc73f854a672ec16ebbf21293c9c Mon Sep 17 00:00:00 2001
+From: Chase Maupin <chase.maupin@ti.com>
+Date: Mon, 24 May 2010 12:51:49 -0500
+Subject: [PATCH] Disable cursor override for X11
+
+* Disable the cursor override option for using the matrix_gui
+ program with X11.
+---
+ main.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/main.cpp b/main.cpp
+index 978e327..1f55e94 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -43,7 +43,7 @@ int main(int argc, char * argv[])
+ {
+ QApplication matrix(argc, argv);
+ QApplication::setStyle(new CustomStyle);
+- QApplication::setOverrideCursor(QCursor(Qt::BlankCursor));
++// QApplication::setOverrideCursor(QCursor(Qt::BlankCursor));
+
+ // Create a new window to display a web page.
+ MainWindow * pWindow = new MainWindow(0, QString(argv[1]), true);
+--
+1.6.0.4
+
diff --git a/recipes/ti/matrix-gui/dm365-evm/init b/recipes/ti/matrix-gui/dm365-evm/init
index b0e56ffd32..3aadc1e6d9 100755..100644
--- a/recipes/ti/matrix-gui/dm365-evm/init
+++ b/recipes/ti/matrix-gui/dm365-evm/init
@@ -1,6 +1,6 @@
#! /bin/sh
matrixgui="/usr/bin/matrix_gui"
-GUI_OPTS="-qws -geometry 720x480+0+10 -display transformed:Rot0 /usr/share/matrix/html/menu_main.html"
+GUI_OPTS="-geometry 720x480+0+10 -display transformed:Rot0 /usr/share/matrix/html/menu_main.html"
test -x "$matrixgui" || exit 0
diff --git a/recipes/ti/matrix-gui/init b/recipes/ti/matrix-gui/init
index 8259417cca..40b651260c 100755..100644
--- a/recipes/ti/matrix-gui/init
+++ b/recipes/ti/matrix-gui/init
@@ -1,20 +1,12 @@
#! /bin/sh
matrixgui="/usr/bin/matrix_gui"
-GUI_OPTS="-qws -display transformed:Rot90 /usr/share/matrix/html/menu_main.html"
+GUI_OPTS="/usr/share/matrix/html/menu_main.html"
test -x "$matrixgui" || exit 0
-export TSLIB_TSDEVICE=/dev/input/touchscreen0
-export QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
-
case "$1" in
start)
- if [ ! -f /etc/pointercal ] ; then
- echo -n "Calibrating touchscreen (first time only)"
- ts_calibrate
- echo "."
- fi
echo -n "Starting Matrix GUI application"
start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui.pid --exec $matrixgui -- $GUI_OPTS
echo "."
diff --git a/recipes/ti/matrix-gui/matrix-gui.desktop b/recipes/ti/matrix-gui/matrix-gui.desktop
new file mode 100644
index 0000000000..52b5831fc0
--- /dev/null
+++ b/recipes/ti/matrix-gui/matrix-gui.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Matrix GUI
+Comment=Start the Matrix GUI application
+Exec=/usr/bin/matrix_gui /usr/share/matrix/html/menu_main.html
+Terminal=false
+Type=Application
+X-GNOME-Autostart-enabled=true
diff --git a/recipes/ti/matrix-gui_svn.bb b/recipes/ti/matrix-gui_svn.bb
index 79f5d24c58..4388d2815f 100644
--- a/recipes/ti/matrix-gui_svn.bb
+++ b/recipes/ti/matrix-gui_svn.bb
@@ -1,53 +1,37 @@
-DESCRIPTION = "Matrix GUI"
+DESCRIPTION = "Matrix GUI for Qt X11"
HOMEPAGE = "https://gforge.ti.com/gf/project/matrix_gui/"
LICENSE = "BSD"
SECTION = "multimedia"
PRIORITY = "optional"
-SRCREV = "57"
+SRCREV = "58"
PV = "1.0"
-PR = "r6+svnr${SRCPV}"
+PR = "r14+svnr${SRCPV}"
SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' \
+ file://0001-Disable-cursor-override-for-X11.patch;patch=1 \
file://init \
+ file://matrix-gui.desktop \
"
S = "${WORKDIR}/trunk"
-INITSCRIPT_NAME = "matrix-gui"
-INITSCRIPT_PARAMS = "defaults 99"
-
-inherit qt4e update-rc.d
-
-MATRIX_EXTRA_BINS = " \
- memInfo \
- networkSettings \
- runOGLES2Coverflow \
- runOGLES2Shaders \
- runOGLESChameleonMan \
- runOGLESVase \
- setopp1 \
- setopp2 \
- setopp3 \
- setopp4 \
- standby \
- sysSettings \
- taskInfo \
-"
+inherit qt4x11
do_install() {
install -d ${D}/${bindir}
install -m 0755 ${S}/matrix_gui ${D}/${bindir}
- for i in ${MATRIX_EXTRA_BINS}; do
- install -m 0755 ${S}/bin/${i} ${D}/${bindir}
- done
- install -d ${D}/${datadir}/matrix/html
- install -m 0644 ${S}/*.html ${D}/${datadir}/matrix/html/
- install -d ${D}/${datadir}/matrix/images
- install -m 0644 ${S}/images/*.png ${D}/${datadir}/matrix/images/
install -d ${D}${sysconfdir}/init.d/
install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-gui
+ install -d ${D}/${sysconfdir}/xdg/autostart
+ install -m 0755 ${WORKDIR}/matrix-gui.desktop ${D}/${sysconfdir}/xdg/autostart
}
-RRECOMMENDS_${PN} = "qt4-embedded-plugin-mousedriver-tslib"
-FILES_${PN} += "${datadir}/matrix/*"
+FILES_${PN}-autostart = "${sysconfdir}/xdg/autostart/matrix-gui.desktop"
+
+#Make autostart package depend on matrix-gui package. Doesn't make sense
+#to install the autostart package without the underlying matrix-gui package.
+RDEPENDS_${PN}-autostart += "${PN}"
+PACKAGES =+ "${PN}-autostart"
+
+RDEPENDS_${PN} += "matrix-gui-common"
diff --git a/recipes/u-boot/u-boot.inc b/recipes/u-boot/u-boot.inc
index 24dcb2b966..323eaef318 100644
--- a/recipes/u-boot/u-boot.inc
+++ b/recipes/u-boot/u-boot.inc
@@ -17,8 +17,6 @@ UBOOT_BINARY ?= "u-boot.bin"
UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.bin"
UBOOT_SYMLINK ?= "u-boot-${MACHINE}.bin"
-INSANE_SKIP_${PN} = True
-
do_compile () {
unset LDFLAGS
unset CFLAGS
@@ -29,6 +27,10 @@ do_compile () {
}
do_install () {
+ install -d ${D}/boot
+ install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
+ ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
+
if [ -e ${WORKDIR}/fw_env.config ] ; then
install -d ${D}${base_sbindir}
install -d ${D}${sysconfdir}
@@ -36,8 +38,18 @@ do_install () {
install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
fi
+
}
+FILES_${PN} = "/boot"
+# no gnu_hash in uboot.bin, by design, so skip QA
+INSANE_SKIP_${PN} = True
+
+PACKAGES += "${PN}-fw-utils"
+FILES_${PN}-fw-utils = "${sysconfdir} ${base_sbindir}"
+# u-boot doesn't use LDFLAGS for fw files, needs to get fixed, but until then:
+INSANE_SKIP_${PN}-fw-utils = True
+
do_deploy () {
install -d ${DEPLOY_DIR_IMAGE}
install ${S}/${UBOOT_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb
index 8dca7cfd53..03c0661aad 100644
--- a/recipes/u-boot/u-boot_git.bb
+++ b/recipes/u-boot/u-boot_git.bb
@@ -1,5 +1,5 @@
require u-boot.inc
-PR ="r49"
+PR ="r50"
FILESPATHPKG =. "u-boot-git:"
diff --git a/recipes/udev/udev-151/udev-compat-static.patch b/recipes/udev/udev-151/udev-compat-static.patch
new file mode 100644
index 0000000000..22f1b99fe5
--- /dev/null
+++ b/recipes/udev/udev-151/udev-compat-static.patch
@@ -0,0 +1,97 @@
+--- /dev/null
++++ b/recipes/udev/udev-151/init
+@@ -0,0 +1,91 @@
++#!/bin/sh -e
++
++### BEGIN INIT INFO
++# Provides: udev
++# Required-Start: mountvirtfs
++# Required-Stop:
++# Default-Start: S
++# Default-Stop:
++# Short-Description: Start udevd, populate /dev and load drivers.
++### END INIT INFO
++
++export TZ=/etc/localtime
++
++KERNELMICROVER="$(uname -r | awk -F. '{print $3}')"
++
++DAEMON="/sbin/udevd"
++UDEVADM="/sbin/udevadm"
++
++# If we are running an old kernel and have a static udev present use that instead
++if [ -e /sbin/udevd-124-static ] ; then
++ if [ $KERNELMICROVER -lt 27 ] ; then
++ DAEMON="/sbin/udevd-124-static"
++ UDEVADM="/sbin/udevadm-124-static"
++ fi
++fi
++
++[ -d /sys/class ] || exit 1
++[ -r /proc/mounts ] || exit 1
++[ -x $DAEMON ] || exit 1
++[ -f /etc/default/udev ] && . /etc/default/udev
++[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
++
++kill_udevd() {
++ if [ -x /sbin/pidof ]; then
++ pid=`/sbin/pidof -x udevd`
++ [ -n "$pid" ] && kill $pid
++ fi
++}
++
++export ACTION=add
++# propagate /dev from /sys
++echo "Starting udev"
++
++# mount the tmpfs on /dev, if not already done
++LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && {
++ mount -n -o mode=0755 -t tmpfs none "/dev"
++ mkdir -m 0755 /dev/pts
++ mkdir -m 1777 /dev/shm
++}
++
++if [ "$DEVCACHE" != "" ]; then
++ # Invalidate udev cache if the kernel or its bootargs/cmdline have changed
++ [ -x /bin/uname ] && /bin/uname -mrspv > /tmp/uname || touch /tmp/uname
++ [ -r /proc/cmdline ] && cat /proc/cmdline > /tmp/cmdline || touch /tmp/cmdline
++ [ -r /proc/atags ] && cat /proc/atags > /tmp/atags || touch /tmp/atags
++ if [ -e $DEVCACHE ] && \
++ cmp -s /tmp/uname /etc/udev/saved.uname && \
++ cmp -s /tmp/cmdline /etc/udev/saved.cmdline && \
++ cmp -s /tmp/atags /etc/udev/saved.atags; then
++ (cd /; tar xf $DEVCACHE > /dev/null 2>&1)
++ not_first_boot=1
++ fi
++fi
++
++if [ ! -e "/lib/modules/$(uname -r)"/modules.dep ] ; then
++ mkdir -p /lib/modules/$(uname -r)
++ depmod -ae
++fi
++
++# make_extra_nodes
++kill_udevd > "/dev/null" 2>&1
++
++ # trigger the sorted events
++ echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
++ $DAEMON -d
++
++ $UDEVADM control --env STARTUP=1
++ if [ "$not_first_boot" != "" ];then
++ $UDEVADM trigger --subsystem-nomatch=tty --subsystem-nomatch=mem \
++ --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc \
++ --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics \
++ --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform
++ ($UDEVADM settle --timeout=3; $UDEVADM control --env STARTUP=)&
++ if [ "$DEVCACHE" != "" ]; then
++ rm -f /tmp/uname
++ rm -f /tmp/cmdline
++ rm -f /tmp/atags
++ fi
++ else
++ $UDEVADM trigger
++ $UDEVADM settle
++ fi
++
++exit 0
diff --git a/recipes/udev/udev-static-124/flags.patch b/recipes/udev/udev-compat-static-124/flags.patch
index 13f20eb6a8..13f20eb6a8 100644
--- a/recipes/udev/udev-static-124/flags.patch
+++ b/recipes/udev/udev-compat-static-124/flags.patch
diff --git a/recipes/udev/udev-static-124/libvolume-id-soname.patch b/recipes/udev/udev-compat-static-124/libvolume-id-soname.patch
index 56365a4351..56365a4351 100644
--- a/recipes/udev/udev-static-124/libvolume-id-soname.patch
+++ b/recipes/udev/udev-compat-static-124/libvolume-id-soname.patch
diff --git a/recipes/udev/udev-static-124/mtd-exclude-persistent.patch b/recipes/udev/udev-compat-static-124/mtd-exclude-persistent.patch
index 204b7b487d..204b7b487d 100644
--- a/recipes/udev/udev-static-124/mtd-exclude-persistent.patch
+++ b/recipes/udev/udev-compat-static-124/mtd-exclude-persistent.patch
diff --git a/recipes/udev/udev-static-124/noasmlinkage.patch b/recipes/udev/udev-compat-static-124/noasmlinkage.patch
index d58a7ea4de..d58a7ea4de 100644
--- a/recipes/udev/udev-static-124/noasmlinkage.patch
+++ b/recipes/udev/udev-compat-static-124/noasmlinkage.patch
diff --git a/recipes/udev/udev-static-124/udevtrigger_add_devname_filtering.patch b/recipes/udev/udev-compat-static-124/udevtrigger_add_devname_filtering.patch
index 5182542461..5182542461 100644
--- a/recipes/udev/udev-static-124/udevtrigger_add_devname_filtering.patch
+++ b/recipes/udev/udev-compat-static-124/udevtrigger_add_devname_filtering.patch
diff --git a/recipes/udev/udev-static-124/vol_id_ld.patch b/recipes/udev/udev-compat-static-124/vol_id_ld.patch
index 11126eef8d..11126eef8d 100644
--- a/recipes/udev/udev-static-124/vol_id_ld.patch
+++ b/recipes/udev/udev-compat-static-124/vol_id_ld.patch
diff --git a/recipes/udev/udev-static_124.bb b/recipes/udev/udev-compat-static_124.bb
index 7348a6ca63..7348a6ca63 100644
--- a/recipes/udev/udev-static_124.bb
+++ b/recipes/udev/udev-compat-static_124.bb
diff --git a/recipes/udev/udev_151.bb b/recipes/udev/udev_151.bb
index 9bf0872b8a..d4dfc53a75 100644
--- a/recipes/udev/udev_151.bb
+++ b/recipes/udev/udev_151.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
the hotplug package and requires a kernel not older than 2.6.12."
LICENSE = "GPLv2+"
-PR = "r11"
+PR = "r12"
# Untested
DEFAULT_PREFERENCE = "-1"
@@ -27,6 +27,7 @@ SRC_URI += " \
file://default \
file://init \
file://cache \
+ file://udev-compat-static.patch \
"
SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
diff --git a/recipes/x-load/x-load.inc b/recipes/x-load/x-load.inc
index a340958d7e..0699c011ab 100644
--- a/recipes/x-load/x-load.inc
+++ b/recipes/x-load/x-load.inc
@@ -17,6 +17,7 @@ XLOAD_USB_IMAGE ?= "x-load-usb-${MACHINE}-${PV}-${PR}.bin"
XLOAD_USB_SYMLINK ?= "x-load-usb-${MACHINE}.bin"
MLO_IMAGE ?= "MLO-${MACHINE}-${PV}-${PR}"
MLO_SYMLINK ?= "MLO-${MACHINE}"
+MLO_SYMLINK_NOMACHINE ?= "MLO"
do_compile () {
unset LDFLAGS
@@ -27,8 +28,17 @@ do_compile () {
oe_runmake
}
-do_deploy () {
+do_install () {
signGP ${S}/x-load.bin
+
+ install -d ${D}/boot
+ install ${S}/x-load.bin.ift ${D}/boot/${MLO_IMAGE}
+ ln -sf ${MLO_IMAGE} ${D}/boot/${MLO_SYMLINK_NOMACHINE}
+}
+
+FILES_${PN} = "/boot"
+
+do_deploy () {
install -d ${DEPLOY_DIR_IMAGE}
install ${S}/x-load.bin.ift ${DEPLOY_DIR_IMAGE}/${XLOAD_IMAGE}
install ${S}/x-load.bin ${DEPLOY_DIR_IMAGE}/${XLOAD_USB_IMAGE}
@@ -49,4 +59,4 @@ do_deploy () {
package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${MLO_SYMLINK}
}
do_deploy[dirs] = "${S}"
-addtask deploy before do_build after do_compile
+addtask deploy before do_build after do_install
diff --git a/recipes/x-load/x-load_git.bb b/recipes/x-load/x-load_git.bb
index d40e094916..c0e7af3a53 100644
--- a/recipes/x-load/x-load_git.bb
+++ b/recipes/x-load/x-load_git.bb
@@ -10,7 +10,7 @@ SRCREV_beagleboard = "1c9276af4d6a5b7014a7630a1abeddf3b3177563"
PV = "1.42+${PR}+gitr${SRCREV}"
PV_beagleboard = "1.44+${PR}+gitr${SRCREV}"
-PR ="r10"
+PR ="r11"
PE = "1"
SRC_URI = "git://gitorious.org/x-load-omap3/mainline.git;branch=master;protocol=git"
diff --git a/recipes/xinput-calibrator/files/om-gta02/pointercal.xinput b/recipes/xinput-calibrator/files/om-gta02/pointercal.xinput
new file mode 100644
index 0000000000..be25da3529
--- /dev/null
+++ b/recipes/xinput-calibrator/files/om-gta02/pointercal.xinput
@@ -0,0 +1,2 @@
+xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 107 918 911 98
+xinput set-int-prop "Touchscreen" "Evdev Axes Swap" 8 1
diff --git a/recipes/xinput-calibrator/files/pointercal.xinput b/recipes/xinput-calibrator/files/pointercal.xinput
new file mode 100644
index 0000000000..9633fc5f32
--- /dev/null
+++ b/recipes/xinput-calibrator/files/pointercal.xinput
@@ -0,0 +1 @@
+# replace with valid machine specific pointercal.xinput
diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb b/recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb
index be03b3274e..8d0f245fe2 100644
--- a/recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb
+++ b/recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb
@@ -1,16 +1,22 @@
require xinput-calibrator.inc
SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \
+ file://pointercal.xinput \
"
SRCREV = "d2ce98b3f638667dd64b6d718721379b2dc750a7"
+PR = "r1"
S = "${WORKDIR}/git/"
do_install_append() {
install -d ${D}${bindir}
install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh
+ install -d ${D}${sysconfdir}
+ install -m 0644 ${WORKDIR}/pointercal.xinput ${D}${sysconfdir}/pointercal.xinput
ln -s ${bindir}/xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator
install -d ${D}${datadir}/applications/
install -m 0755 scripts/xinput_calibrator.desktop ${D}${datadir}/applications/xinput-calibrator.desktop
install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh
}
+
+CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput"
diff --git a/recipes/xinput-calibrator/xinput-calibrator_git.bb b/recipes/xinput-calibrator/xinput-calibrator_git.bb
index 13c6a46e5b..5fceed12d8 100644
--- a/recipes/xinput-calibrator/xinput-calibrator_git.bb
+++ b/recipes/xinput-calibrator/xinput-calibrator_git.bb
@@ -17,4 +17,3 @@ do_install_append() {
# remove this after misclick branch is well-tested and merged to master
DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_shr = "1"
diff --git a/recipes/xorg-driver/xf86-video-glamo_git.bb b/recipes/xorg-driver/xf86-video-glamo_git.bb
index 91fd549084..98e6a7b891 100644
--- a/recipes/xorg-driver/xf86-video-glamo_git.bb
+++ b/recipes/xorg-driver/xf86-video-glamo_git.bb
@@ -3,7 +3,7 @@ SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=m
S = "${WORKDIR}/git"
-SRCREV = "a5ef0525ab34d7d5590aba51651ae1a6f40858bc"
+SRCREV = "2d96367657adb21b34742e76c3a92ba1a3961106"
PV = "1.0.0+gitr${SRCPV}"
PE = "2"
PR = "r5"
diff --git a/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch b/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch
index 0409a1faef..e23bbf0347 100644
--- a/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch
+++ b/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch
@@ -2,31 +2,9 @@ Index: xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator
===================================================================
--- xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator (revision 0)
+++ xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator (revision 0)
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,12 @@
+#!/bin/sh
+
-+SYSFS_CALIBRATION_DIR=/sys/bus/i2c/devices/0-0073/s3c2440-ts/calibration
-+
-+if [ ! -d $SYSFS_CALIBRATION_DIR ]; then
-+ # moved in 2.6.31
-+ SYSFS_CALIBRATION_DIR=/sys/devices/platform/s3c2440-i2c/i2c-adapter/i2c-0/0-0073/s3c2410-ts/calibration
-+fi
-+
-+if [ ! -d $SYSFS_CALIBRATION_DIR ]; then
-+ # moved in 2.6.32
-+ SYSFS_CALIBRATION_DIR=/sys/devices/platform/s3c2440-i2c/i2c-0/0-0073/s3c2410-ts/calibration
-+fi
-+
-+if [ -d $SYSFS_CALIBRATION_DIR ]; then
-+ echo 0 > $SYSFS_CALIBRATION_DIR/0
-+ echo 80000 > $SYSFS_CALIBRATION_DIR/1
-+ echo -8000000 > $SYSFS_CALIBRATION_DIR/2
-+ echo -81000 > $SYSFS_CALIBRATION_DIR/3
-+ echo 0 > $SYSFS_CALIBRATION_DIR/4
-+ echo 75000000 > $SYSFS_CALIBRATION_DIR/5
-+ echo 65536 > $SYSFS_CALIBRATION_DIR/6
-+fi
-+
+if [ -e /usr/bin/xinput_calibrator_once.sh ] ; then
+ if [ -e /etc/pointercal.xinput ] ; then
+ if [ -e /usr/bin/fsoraw ] ; then
diff --git a/recipes/xserver-common/xserver-common_1.33.bb b/recipes/xserver-common/xserver-common_1.33.bb
index f1fcfc337a..470bc4c7ab 100644
--- a/recipes/xserver-common/xserver-common_1.33.bb
+++ b/recipes/xserver-common/xserver-common_1.33.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r2"
+PR = "r3"
PACKAGE_ARCH = "all"
DEFAULT_PREFERENCE = "-1"