armadeus-commitlog — Armadeus GIT commit logs

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-457-gccc64b4

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  ccc64b4fed59a7e2f456ab2627185107af2dd1cd (commit)
      from  4e43b7cf48559691e1412c0e094305118bbcd46d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ccc64b4fed59a7e2f456ab2627185107af2dd1cd
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Jul 20 21:36:25 2012 +0200

    [BUILDROOT] Fixes apf28test_defconfig build

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/apf28test_defconfig |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index 2b3bf7d..69d4e45 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -41,7 +41,6 @@ BR2_PACKAGE_AS_DEVICES_TESTS_CPP=y
 BR2_PACKAGE_ARMADEUS_DEMOS=y
 BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
 BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
-BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
 BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
 BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
 BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-456-g4e43b7c

[Fabien M <fa...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  4e43b7cf48559691e1412c0e094305118bbcd46d (commit)
       via  b0c7dd692fff679f3729f83b593db3ea8a0ee044 (commit)
       via  690cb8b6632a555b16c66574183820198d43d998 (commit)
      from  9cb4659fed106a037ceac6731736460bcc1300f6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4e43b7cf48559691e1412c0e094305118bbcd46d
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Jul 20 18:37:38 2012 +0200

    [package][as_devices] adding python spi wrapper

commit b0c7dd692fff679f3729f83b593db3ea8a0ee044
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Jul 20 18:36:45 2012 +0200

    [package][as_devices] fix bug in AsI2c class

commit 690cb8b6632a555b16c66574183820198d43d998
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Jul 20 16:44:47 2012 +0200

    [as_devices] __def__() -> __del__()

-----------------------------------------------------------------------

Summary of changes:
 .../packages/as_devices/python/AsDevices/AsI2c.py  |    4 +-
 .../packages/as_devices/python/AsDevices/AsSpi.py  |  149 +++++++++
 .../as_devices/python/AsDevices/__init__.py        |    1 +
 target/packages/as_devices/python/Makefile         |    1 +
 target/packages/as_devices/python/src/AsSpi_wrap.c |  348 ++++++++++++++++++++
 .../python/src/{AsI2c_wrap.h => AsSpi_wrap.h}      |   27 +-
 6 files changed, 514 insertions(+), 16 deletions(-)
 create mode 100644 target/packages/as_devices/python/AsDevices/AsSpi.py
 create mode 100644 target/packages/as_devices/python/src/AsSpi_wrap.c
 copy target/packages/as_devices/python/src/{AsI2c_wrap.h => AsSpi_wrap.h} (54%)

diff --git a/target/packages/as_devices/python/AsDevices/AsI2c.py b/target/packages/as_devices/python/AsDevices/AsI2c.py
index 9106417..809e31f 100644
--- a/target/packages/as_devices/python/AsDevices/AsI2c.py
+++ b/target/packages/as_devices/python/AsDevices/AsI2c.py
@@ -47,9 +47,9 @@ class AsI2c:
             raise AsI2cError("Can't open i2c bus number "+str(aBusNumber)+\
                                 ": "+str(e))
 
-    def __def__(self):
+    def __del__(self):
         try:
-            wrappers.i2c_close(self.__device)
+            wrapper.i2c_close(self.__device)
         except Exception, e:
             pass
 
diff --git a/target/packages/as_devices/python/AsDevices/AsSpi.py b/target/packages/as_devices/python/AsDevices/AsSpi.py
new file mode 100644
index 0000000..16eb69b
--- /dev/null
+++ b/target/packages/as_devices/python/AsDevices/AsSpi.py
@@ -0,0 +1,149 @@
+#! /usr/bin/python
+# -*- coding: utf-8 -*-
+#-----------------------------------------------------------------------------
+# Name:     AsSpi.py
+# Purpose:  
+# Author:   Fabien Marteau <fab...@ar...>
+# Created:  20/07/2012
+#-----------------------------------------------------------------------------
+#  Copyright (2012)  Armadeus Systems
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software 
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#-----------------------------------------------------------------------------
+
+__doc__ = "This class drive ARMadeus Board SPI"
+__version__ = "0.1"
+__author__ = "Fabien Marteau <fab...@ar...>"
+
+import wrappers.AsSpi_wrap as wrapper
+
+class AsSpiError(Exception):
+    def __init__(self, value):
+        self.value = value
+    def __str__(self):
+        return repr(self.value)
+
+class AsSpi:
+    """
+    """
+
+    def __init__(self, aSpidevName):
+        try:
+            self.__device = wrapper.spi_open(aSpidevName)
+        except Exception, e:
+            raise AsSpiError(str(e))
+
+    def __del__(self):
+        try:
+            wrapper.spi_close(self.__device)
+        except Exception, e:
+            pass
+
+    def setLsb(self, aLsb):
+        """ Set lsb
+        """
+        try:
+            return wrapper.spi_set_lsb(self.__device, aLsb)
+        except Exception, e:
+            raise AsSpiError(str(e))
+
+    def getLsb(self):
+        """ Get lsb
+        """
+        try:
+            return wrapper.spi_get_lsb(self.__device)
+        except Exception, e:
+            raise AsSpiError(str(e))
+
+    def setMode(self, aMode):
+        """ Set mode
+        """
+        try:
+            return wrapper.spi_set_mode(self.__device, aMode)
+        except Exception, e:
+            raise AsSpiError(str(e))
+
+    def getMode(self):
+        """ Set mode
+        """
+        try:
+            return wrapper.spi_get_mode(self.__device)
+        except Exception, e:
+            raise AsSpiError(str(e))
+
+    def setSpeed(self, aSpeed):
+        """ Set speed
+        """
+        try:
+            return wrapper.spi_set_speed(self.__device, aSpeed)
+        except Exception, e:
+            raise AsSpiError(str(e))
+
+    def getSpeed(self):
+        """ get speed
+        """
+        try:
+            return wrapper.spi_get_speed(self.__device)
+        except Exception, e:
+            raise AsSpiError(str(e))
+
+    def getBitsPerWord(self):
+        """ Get bits per word
+        """
+        try:
+            return wrapper.spi_get_bits_per_word(self.__device)
+        except Exception, e:
+            raise AsSpiError(str(e))
+
+    def setBitsPerWord(self, aBits):
+        """ Set bits per word
+        """
+        try:
+            return wrapper.spi_set_bits_per_word(self.__device, aBits)
+        except Exception, e:
+            raise AsSpiError(str(e))
+
+    def msg(self, aSpeed, aLen, aMsg):
+        """ send/rcv message
+            aSpeed : spi speed
+            aLen : number of bits to send
+            aMsg : list of bytes to send (max 8)
+        """
+        if aLen <= 0:
+            raise AsSpiError("aLen must be upper than 0")
+        if aLen > 64:
+            raise AsSpiError("aLen can't be upper than 64")
+
+        if type(aMsg) != type([]):
+            raise AsSpiError("aMsg argument must be a list")
+        if len(aMsg) <= 0:
+            raise AsSpiError("aMsg list must have at least one value")
+        if len(aMsg) > 8:
+            raise AsSpiError("aMsg list can have 8 values maximum")
+   
+        if aLen%8 == 0:
+            list_len = aLen/8
+        else:
+            list_len = (aLen/8) + 1
+
+        msg = aMsg + [0 for i in range(8 - list_len)]
+
+        try:
+            return wrapper.spi_msg(self.__device, aSpeed, aLen,
+                    msg[7], msg[6], msg[5], msg[4], msg[3], msg[2], msg[1], msg[0])
+        except Exception, e:
+            raise AsSpiError(str(e))
+
diff --git a/target/packages/as_devices/python/AsDevices/__init__.py b/target/packages/as_devices/python/AsDevices/__init__.py
index 2b9eaf1..4c96c87 100644
--- a/target/packages/as_devices/python/AsDevices/__init__.py
+++ b/target/packages/as_devices/python/AsDevices/__init__.py
@@ -39,3 +39,4 @@ from AsGpio import *
 from AsAdc  import *
 from AsDac  import *
 from AsI2c  import *
+from AsSpi  import *
diff --git a/target/packages/as_devices/python/Makefile b/target/packages/as_devices/python/Makefile
index b3fa2a3..7a6a3bd 100644
--- a/target/packages/as_devices/python/Makefile
+++ b/target/packages/as_devices/python/Makefile
@@ -19,6 +19,7 @@ WRAPPER_LIBS=AsGpio_wrap.so
 WRAPPER_LIBS+= AsAdc_wrap.so
 WRAPPER_LIBS+= AsDac_wrap.so
 WRAPPER_LIBS+= AsI2c_wrap.so
+WRAPPER_LIBS+= AsSpi_wrap.so
 WRAPPER_DIR=src
 
 PYTHON_VERS=2.7
diff --git a/target/packages/as_devices/python/src/AsSpi_wrap.c b/target/packages/as_devices/python/src/AsSpi_wrap.c
new file mode 100644
index 0000000..6cac628
--- /dev/null
+++ b/target/packages/as_devices/python/src/AsSpi_wrap.c
@@ -0,0 +1,348 @@
+/*
+**    The ARMadeus Project
+**
+**    Copyright (C) 2012 The armadeus systems team
+**    Fabien Marteau <fab...@ar...>
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; if not, write to the Free Software
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*
+*/
+
+#include "AsSpi_wrap.h"
+#include "as_spi.h"
+
+/* Methods definitions */
+static PyMethodDef AsSpi_wrap_methods[] = {
+    {"spi_open"                  , spi_open             , METH_VARARGS, "as_spi function wrapped"},
+    {"spi_close"                 , spi_close            , METH_VARARGS, "as_spi function wrapped"},
+    {"spi_set_lsb"               , spi_set_lsb          , METH_VARARGS, "as_spi function wrapped"},
+    {"spi_get_lsb"               , spi_get_lsb          , METH_VARARGS, "as_spi function wrapped"},
+    {"spi_set_mode"              , spi_set_mode         , METH_VARARGS, "as_spi function wrapped"},
+    {"spi_get_mode"              , spi_get_mode         , METH_VARARGS, "as_spi function wrapped"},
+    {"spi_set_speed"             , spi_set_speed        , METH_VARARGS, "as_spi function wrapped"},
+    {"spi_get_speed"             , spi_get_speed        , METH_VARARGS, "as_spi function wrapped"},
+    {"spi_get_bits_per_word"     , spi_get_bits_per_word, METH_VARARGS, "as_spi function wrapped"},
+    {"spi_set_bits_per_word"     , spi_set_bits_per_word, METH_VARARGS, "as_spi function wrapped"},
+    {"spi_msg"                   , spi_msg              , METH_VARARGS, "as_spi function wrapped"},
+    {NULL, NULL, 0, NULL} /* Sentinel */
+};
+
+/* Init Module */
+void initAsSpi_wrap() /* called on first import */
+{                       /* name matter if called dynamically */
+    (void) Py_InitModule("AsSpi_wrap", AsSpi_wrap_methods); /* mod name, table ptr */
+}
+
+static PyObject * spi_open(PyObject *self, PyObject *args)
+{
+    /* parameters */
+    unsigned char *aSpidevName;
+
+    int dev;
+
+    PyObject *ret;
+    char buff[300];
+    /* Get arguments */
+    if (!PyArg_ParseTuple(args, "s", &aSpidevName))
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Wrong parameters.");
+        return NULL;
+    }
+    dev = as_spi_open(aSpidevName);
+    if (dev < 0 )
+    {
+        snprintf(buff, 300,
+                "Can't open spidev %s", aSpidevName);
+        PyErr_SetString(PyExc_IOError,buff);
+        return NULL;
+    }
+
+    ret = Py_BuildValue("l", (long)dev);
+    return ret;
+}
+
+static PyObject * spi_close(PyObject *self, PyObject *args)
+{
+    /* parameters */
+    long aDev;
+
+    /* Get arguments */
+    if (!PyArg_ParseTuple(args, "l", (long *)&aDev))
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Wrong parameters.");
+        return NULL;
+    }
+
+    as_spi_close((int)aDev);
+
+    return Py_BuildValue("i", 0);
+}
+
+static PyObject * spi_set_lsb(PyObject *self, PyObject *args)
+{
+    /* parameters */
+    long aDev;
+    int  aLsb;
+
+    int ret;
+
+    /* Get arguments */
+    if (!PyArg_ParseTuple(args, "li", (long *)&aDev, &aLsb))
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Wrong parameters.");
+        return NULL;
+    }
+
+    ret = as_spi_set_lsb((int)aDev, aLsb);
+    if (ret < 0)
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Can't set lsb");
+        return NULL;
+    }
+
+    return Py_BuildValue("i", ret);
+}
+
+static PyObject * spi_get_lsb(PyObject *self, PyObject *args)
+{
+    /* parameters */
+    long aDev;
+
+    int ret;
+
+    /* Get arguments */
+    if (!PyArg_ParseTuple(args, "l", (long *)&aDev))
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Wrong parameters.");
+        return NULL;
+    }
+
+    ret = as_spi_get_lsb((int)aDev);
+    if (ret < 0)
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Can't get lsb");
+        return NULL;
+    }
+
+    return Py_BuildValue("i", ret);
+
+}
+
+static PyObject * spi_set_mode(PyObject *self, PyObject *args)
+{
+    /* parameters */
+    long aDev;
+    int  aMode;
+
+    int ret;
+
+    /* Get arguments */
+    if (!PyArg_ParseTuple(args, "li", (long *)&aDev, &aMode))
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Wrong parameters.");
+        return NULL;
+    }
+
+    ret = as_spi_set_mode((int)aDev, aMode);
+    if (ret < 0)
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Can't set mode");
+        return NULL;
+    }
+
+    return Py_BuildValue("i", ret);
+}
+
+static PyObject * spi_get_mode(PyObject *self, PyObject *args)
+{
+    /* parameters */
+    long aDev;
+
+    int ret;
+
+    /* Get arguments */
+    if (!PyArg_ParseTuple(args, "l", (long *)&aDev))
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Wrong parameters.");
+        return NULL;
+    }
+
+    ret = as_spi_get_mode((int)aDev);
+    if (ret < 0)
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Can't get lsb");
+        return NULL;
+    }
+
+    return Py_BuildValue("i", ret);
+}
+
+static PyObject * spi_set_speed(PyObject *self, PyObject *args)
+{
+    /* parameters */
+    long aDev;
+    int  aSpeed;
+
+    int ret;
+
+    /* Get arguments */
+    if (!PyArg_ParseTuple(args, "li", (long *)&aDev, &aSpeed))
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Wrong parameters.");
+        return NULL;
+    }
+
+    ret = as_spi_set_speed((int)aDev, aSpeed);
+    if (ret < 0)
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Can't set speed");
+        return NULL;
+    }
+
+    return Py_BuildValue("i", ret);
+}
+
+static PyObject * spi_get_speed(PyObject *self, PyObject *args)
+{
+    /* parameters */
+    long aDev;
+
+    int ret;
+
+    /* Get arguments */
+    if (!PyArg_ParseTuple(args, "l", (long *)&aDev))
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Wrong parameters.");
+        return NULL;
+    }
+
+    ret = as_spi_get_speed((int)aDev);
+    if (ret < 0)
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Can't get speed");
+        return NULL;
+    }
+
+    return Py_BuildValue("i", ret);
+}
+
+static PyObject * spi_get_bits_per_word(PyObject *self, PyObject *args)
+{
+    /* parameters */
+    long aDev;
+
+    int ret;
+
+    /* Get arguments */
+    if (!PyArg_ParseTuple(args, "l", (long *)&aDev))
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Wrong parameters.");
+        return NULL;
+    }
+
+    ret = as_spi_get_bits_per_word((int)aDev);
+    if (ret < 0)
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Can't get bit per word");
+        return NULL;
+    }
+
+    return Py_BuildValue("i", ret);
+}
+
+static PyObject * spi_set_bits_per_word(PyObject *self, PyObject *args)
+{
+    /* parameters */
+    long aDev;
+    int  aBits;
+
+    int ret;
+
+    /* Get arguments */
+    if (!PyArg_ParseTuple(args, "li", (long *)&aDev, &aBits))
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Wrong parameters.");
+        return NULL;
+    }
+
+    ret = as_spi_set_bits_per_word((int)aDev, aBits);
+    if (ret < 0)
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Can't set speed");
+        return NULL;
+    }
+
+    return Py_BuildValue("i", ret);
+}
+
+static PyObject * spi_msg(PyObject *self, PyObject *args)
+{
+    /* parameters */
+    long aDev;
+    int aSpeed;
+    int aLen;
+    char msg[8];
+
+    long long ret, value;
+
+    /* Get arguments */
+    if (!PyArg_ParseTuple(args, "liibbbbbbbb", (long *)&aDev, &aSpeed, &aLen,
+                        &msg[0], &msg[1], &msg[2], &msg[3],
+                        &msg[4], &msg[5], &msg[6], &msg[7]))
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Wrong parameters.");
+        return NULL;
+    }
+
+    value = 0;
+    value += (long long)msg[0] << (7-0)*8; 
+    value += (long long)msg[1] << (7-1)*8; 
+    value += (long long)msg[2] << (7-2)*8; 
+    value += (long long)msg[3] << (7-3)*8; 
+    value += (long long)msg[4] << (7-4)*8; 
+    value += (long long)msg[5] << (7-5)*8; 
+    value += (long long)msg[6] << (7-6)*8; 
+    value += (long long)msg[7] << (7-7)*8; 
+
+    ret = as_spi_msg((int)aDev, value, aLen, aSpeed);
+    if (ret < 0)
+    {
+        PyErr_SetString(PyExc_IOError,
+                        "Can't make message");
+        return NULL;
+    }
+
+    return Py_BuildValue("bbbbbbbb",msg[0], msg[1], msg[2], msg[3],
+                                    msg[4], msg[5], msg[6], msg[7]);
+}
diff --git a/target/packages/as_devices/python/src/AsI2c_wrap.h b/target/packages/as_devices/python/src/AsSpi_wrap.h
similarity index 54%
copy from target/packages/as_devices/python/src/AsI2c_wrap.h
copy to target/packages/as_devices/python/src/AsSpi_wrap.h
index 61b8147..6f5ff54 100644
--- a/target/packages/as_devices/python/src/AsI2c_wrap.h
+++ b/target/packages/as_devices/python/src/AsSpi_wrap.h
@@ -1,7 +1,7 @@
 /*
 **    THE ARMadeus Systems
 **
-**    Copyright (C) 2011  The armadeus systems team
+**    Copyright (C) 2012  The armadeus systems team
 **    Fabien Marteau <fab...@ar...>
 **
 ** This library is free software; you can redistribute it and/or
@@ -19,28 +19,27 @@
 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-
 #include <Python.h>
 
 /* Init module */
-void initAsI2c_wrap();
+void initAsSpi_wrap();
 
 /*********************/
 /* Functions wrapped */
 /*********************/
-static PyObject * i2c_open(PyObject *self, PyObject *args);
-static PyObject * i2c_close(PyObject *self, PyObject *args);
 
-static PyObject * i2c_set_slave_addr(PyObject *self, PyObject *args);
-static PyObject * i2c_get_slave_addr(PyObject *self, PyObject *args);
+static PyObject * spi_open(PyObject *self, PyObject *args);
+static PyObject * spi_close(PyObject *self, PyObject *args);
 
-static PyObject * i2c_read(PyObject *self, PyObject *args);
-static PyObject * i2c_write(PyObject *self, PyObject *args);
+static PyObject * spi_set_lsb(PyObject *self, PyObject *args);
+static PyObject * spi_get_lsb(PyObject *self, PyObject *args);
 
-static PyObject * i2c_read_reg(PyObject *self, PyObject *args);
-static PyObject * i2c_write_reg(PyObject *self, PyObject *args);
+static PyObject * spi_set_mode(PyObject *self, PyObject *args);
+static PyObject * spi_get_mode(PyObject *self, PyObject *args);
 
-static PyObject * i2c_read_reg_byte(PyObject *self, PyObject *args);
-static PyObject * i2c_write_reg_byte(PyObject *self, PyObject *args);
+static PyObject * spi_set_speed(PyObject *self, PyObject *args);
+static PyObject * spi_get_speed(PyObject *self, PyObject *args);
 
-static PyObject * i2c_read_msg(PyObject *self, PyObject *args);
+static PyObject * spi_get_bits_per_word(PyObject *self, PyObject *args);
+static PyObject * spi_set_bits_per_word(PyObject *self, PyObject *args);
+static PyObject * spi_msg(PyObject *self, PyObject *args);


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-453-g9cb4659

[Fabien M <fa...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  9cb4659fed106a037ceac6731736460bcc1300f6 (commit)
      from  1538836b51b9f30f833e5f120bc292f6ae93ee1e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9cb4659fed106a037ceac6731736460bcc1300f6
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Jul 20 14:55:18 2012 +0200

    [kernel][platform][apf51] use spidev_platform_data for spidev

-----------------------------------------------------------------------

Summary of changes:
 .../408-armadeus-add_apf51-dev_baseboard.patch     |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch b/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
index 50ac23d..2d974ab 100644
--- a/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/patches/linux/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
 
 Index: linux-2.6.38.8/arch/arm/mach-mx5/Kconfig
 ===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/Kconfig	2012-03-19 18:51:31.000000000 +0100
-+++ linux-2.6.38.8/arch/arm/mach-mx5/Kconfig	2012-03-19 19:01:08.000000000 +0100
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/Kconfig	2012-07-20 10:19:29.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/Kconfig	2012-07-20 14:54:06.000000000 +0200
 @@ -175,4 +175,27 @@
  	  Include support for Armadeus systems APF51 System On Module. This
  	  includes specific configurations for the board and its peripherals.
@@ -36,8 +36,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/Kconfig
  endif
 Index: linux-2.6.38.8/arch/arm/mach-mx5/Makefile
 ===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/Makefile	2012-03-19 18:51:31.000000000 +0100
-+++ linux-2.6.38.8/arch/arm/mach-mx5/Makefile	2012-03-19 19:01:08.000000000 +0100
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/Makefile	2012-07-20 10:19:29.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/Makefile	2012-07-20 14:54:06.000000000 +0200
 @@ -8,6 +8,7 @@
  
  obj-$(CONFIG_CPU_FREQ_IMX)    += cpu_op-mx51.o
@@ -49,8 +49,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/Makefile
 Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c	2012-03-19 19:01:24.000000000 +0100
-@@ -0,0 +1,547 @@
++++ linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c	2012-07-20 13:55:30.000000000 +0200
+@@ -0,0 +1,553 @@
 + /*
 + * Support for APF51's official development baseboard (APF51Dev)
 + *
@@ -75,6 +75,7 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
 +#include <linux/input.h>
 +#include <linux/leds.h>
 +#include <linux/spi/spi.h>
++#include <linux/spi/spidev.h>
 +#include <linux/fb.h>
 +#include <linux/mfd/imx-ipu-v3.h>
 +#include <sound/wm8960.h>
@@ -317,6 +318,10 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
 +#define APF51DEV_ECSPI2_SS1	IMX_GPIO_NR(3, 28)
 +#define APF51DEV_ECSPI2_SS2	IMX_GPIO_NR(3, 27)
 +
++static struct spidev_platform_data spidev_platdata = {
++	.init = NULL,
++};
++
 +static struct spi_board_info apf51dev_spi2_board_info[] = {
 +	{
 +		.modalias = "mcp2515",
@@ -333,7 +338,7 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
 +		.bus_num = 1,
 +		.chip_select = 1,
 +		.mode = SPI_MODE_0,
-+		.platform_data = &mcp4912_dat,
++		.platform_data = &spidev_platdata,
 +	},
 +};
 +
@@ -560,6 +565,7 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/apf51dev-baseboard.c
 +	spi_register_board_info(apf51dev_spi1_board_info,
 +				ARRAY_SIZE(apf51dev_spi1_board_info));
 +	imx51_add_ecspi(0, &apf51dev_spi1_pdata);
++
 +	spi_register_board_info(apf51dev_spi2_board_info,
 +				ARRAY_SIZE(apf51dev_spi2_board_info));
 +	imx51_add_ecspi(1, &apf51dev_spi2_pdata);


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-452-g1538836

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  1538836b51b9f30f833e5f120bc292f6ae93ee1e (commit)
      from  6bc49fe1bae8448049792597648916d5a7e79e9a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1538836b51b9f30f833e5f120bc292f6ae93ee1e
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Jul 19 09:22:42 2012 +0200

    [LINUX] apf28: Extend ethernet PHY reset to 1ms

-----------------------------------------------------------------------

Summary of changes:
 .../450-armadeus-add_apf28_module_support.patch    |    4 ++--
 ...1-armadeus-add_apf28dev_baseboard_support.patch |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/patches/linux/2.6.35/450-armadeus-add_apf28_module_support.patch b/patches/linux/2.6.35/450-armadeus-add_apf28_module_support.patch
index 61dbc14..9d60244 100644
--- a/patches/linux/2.6.35/450-armadeus-add_apf28_module_support.patch
+++ b/patches/linux/2.6.35/450-armadeus-add_apf28_module_support.patch
@@ -456,7 +456,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/mach-apf28.c
 +int mx28evk_enet_gpio_init(void)
 +{
 +	gpio_direction_output(MXS_PIN_TO_GPIO(PINID_ENET0_RX_CLK), 0);
-+	udelay(100);
++	mdelay(1);
 +	gpio_direction_output(MXS_PIN_TO_GPIO(PINID_ENET0_RX_CLK), 1);
 +	mx287_fec1_gpio_init();
 +
@@ -481,7 +481,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/mach-apf28.c
 +int apf28_fec0_gpio_init(void)
 +{
 +	gpio_direction_output(MXS_PIN_TO_GPIO(PINID_ENET0_RX_CLK), 0);
-+	udelay(100);
++	mdelay(1);
 +	gpio_direction_output(MXS_PIN_TO_GPIO(PINID_ENET0_RX_CLK), 1);
 +
 +	return 0;
diff --git a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
index 16cafcd..fced9a8 100644
--- a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -825,7 +825,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
 +{
 +	/* reset 2nd phy */
 +	gpio_direction_output(MXS_PIN_TO_GPIO(PINID_LCD_HSYNC), 0);
-+	udelay(100);
++	mdelay(1);
 +	gpio_direction_output(MXS_PIN_TO_GPIO(PINID_LCD_HSYNC), 1);
 +
 +	return 0;


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-451-g6bc49fe

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  6bc49fe1bae8448049792597648916d5a7e79e9a (commit)
      from  aa9e96e6e547727faa7747a86774c90c1f0774d3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6bc49fe1bae8448049792597648916d5a7e79e9a
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Jul 16 17:00:58 2012 +0200

    [BUILDROOT] apf28: add evtest tool to the APF28 default configuration

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/apf28_defconfig |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 92f0785..068ef58 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -38,6 +38,10 @@ BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
 BR2_PACKAGE_IMXREGS=y
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_INPUT_TOOLS=y
+# BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH is not set
+# BR2_PACKAGE_INPUT_TOOLS_JSCAL is not set
+# BR2_PACKAGE_INPUT_TOOLS_JSTEST is not set
 BR2_PACKAGE_MTD=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 BR2_PACKAGE_UBOOT_TOOLS=y


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-450-gaa9e96e

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  aa9e96e6e547727faa7747a86774c90c1f0774d3 (commit)
      from  a2385a6675d94f8f7e89f36292534c9a2512c426 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aa9e96e6e547727faa7747a86774c90c1f0774d3
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Jul 16 16:58:32 2012 +0200

    [LINUX] apf28: build gpio_keys driver as a module

-----------------------------------------------------------------------

Summary of changes:
 .../armadeus/apf28/apf28-linux-2.6.35.config       |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
index 214340c..12d2966 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
@@ -921,7 +921,7 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
+CONFIG_KEYBOARD_GPIO=m
 # CONFIG_KEYBOARD_TCA6416 is not set
 # CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_LM8323 is not set


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-449-ga2385a6

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  a2385a6675d94f8f7e89f36292534c9a2512c426 (commit)
      from  f5584f29212053a9c521c50906ec8f5643201d3e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a2385a6675d94f8f7e89f36292534c9a2512c426
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Jul 16 16:52:18 2012 +0200

    [LINUX] apf28: enable mx28 wakeup through GPIO irq - enable user button wakeup behavior

-----------------------------------------------------------------------

Summary of changes:
 ...1-armadeus-add_apf28dev_baseboard_support.patch |    2 +-
 .../2.6.35/458-armadeus-gpio_set_wake_irq.patch    |   71 ++++++++++++++++++++
 2 files changed, 72 insertions(+), 1 deletions(-)
 create mode 100644 patches/linux/2.6.35/458-armadeus-gpio_set_wake_irq.patch

diff --git a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
index b3e3b75..16cafcd 100644
--- a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -768,7 +768,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
 +		.gpio = MXS_PIN_TO_GPIO(PINID_GPMI_CE1N), /* GPIO number */
 +		.active_low = 1,
 +		.desc = "user", /* Button description*/
-+		.wakeup = 0, /* no wakeup possible with this button */
++		.wakeup = 1,
 +	},
 +};
 +
diff --git a/patches/linux/2.6.35/458-armadeus-gpio_set_wake_irq.patch b/patches/linux/2.6.35/458-armadeus-gpio_set_wake_irq.patch
new file mode 100644
index 0000000..c63b8ab
--- /dev/null
+++ b/patches/linux/2.6.35/458-armadeus-gpio_set_wake_irq.patch
@@ -0,0 +1,71 @@
+Enable mx28 GPIO pins to support system wakeup.
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+Index: linux-2.6.35.3/arch/arm/plat-mxs/gpio.c
+===================================================================
+--- linux-2.6.35.3/arch/arm/plat-mxs/gpio.c
++++ linux-2.6.35.3/arch/arm/plat-mxs/gpio.c
+@@ -22,6 +22,7 @@
+ #include <linux/string.h>
+ #include <linux/gpio.h>
+ #include <linux/list.h>
++#include <linux/interrupt.h>
+ #include <linux/irq.h>
+ 
+ #include <mach/hardware.h>
+@@ -166,7 +167,8 @@ static void mxs_gpio_mask_irq(unsigned i
+ 	port = mxs_gpios[GPIO_TO_BANK(gpio)];
+ 	if (port->child_irq < 0)
+ 		return;
+-	port->chip->mask_irq(port, GPIO_TO_PINS(gpio));
++	if (!(port->suspend_wakeup & (1 << gpio)))
++		port->chip->mask_irq(port, GPIO_TO_PINS(gpio));
+ }
+ 
+ static void mxs_gpio_unmask_irq(unsigned int irq)
+@@ -179,6 +181,24 @@ static void mxs_gpio_unmask_irq(unsigned
+ 	port->chip->unmask_irq(port, GPIO_TO_PINS(gpio));
+ }
+ 
++static int mxs_gpio_set_wake_irq(u32 irq, u32 enable)
++{
++	struct mxs_gpio_port *port;
++	unsigned int gpio = irq_to_gpio(irq);
++	port = mxs_gpios[GPIO_TO_BANK(gpio)];
++	if (port->child_irq < 0)
++		return -EINVAL;
++
++	if (enable) {
++		port->suspend_wakeup |= (1 << gpio);
++		enable_irq_wake(port->irq);
++	} else {
++		port->suspend_wakeup &= ~(1 << gpio);
++		disable_irq_wake(port->irq);
++	}
++	return 0;
++}
++
+ static struct irq_chip gpio_irq_chip = {
+ 	.ack = mxs_gpio_ack_irq,
+ 	.mask = mxs_gpio_mask_irq,
+@@ -186,6 +206,7 @@ static struct irq_chip gpio_irq_chip = {
+ 	.enable = mxs_gpio_unmask_irq,
+ 	.disable = mxs_gpio_mask_irq,
+ 	.set_type = mxs_gpio_set_irq_type,
++	.set_wake = mxs_gpio_set_wake_irq,
+ };
+ 
+ int __init mxs_add_gpio_port(struct mxs_gpio_port *port)
+Index: linux-2.6.35.3/arch/arm/plat-mxs/include/mach/gpio.h
+===================================================================
+--- linux-2.6.35.3/arch/arm/plat-mxs/include/mach/gpio.h
++++ linux-2.6.35.3/arch/arm/plat-mxs/include/mach/gpio.h
+@@ -51,6 +51,7 @@ struct mxs_gpio_port {
+ 	struct mxs_gpio_chip *chip;
+ 	struct gpio_chip port;
+ 	u32 both_edges;
++	u32 suspend_wakeup;
+ };
+ 
+ extern int mxs_add_gpio_port(struct mxs_gpio_port *port);


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-448-gf5584f2

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  f5584f29212053a9c521c50906ec8f5643201d3e (commit)
      from  1b799b25d6b2d081ef4ad4e0a776fb9f70332399 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f5584f29212053a9c521c50906ec8f5643201d3e
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Jul 16 01:03:32 2012 +0200

    [BUILDROOT] apf28: Use GCC-4.4.x that is compatible both linux DCP/tcrypt drivers and OpenSSL

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/apf28_defconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 235edcd..92f0785 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -10,7 +10,7 @@ BR2_STRIP_sstrip=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.35.3"
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
-BR2_GCC_VERSION_4_6_X=y
+BR2_GCC_VERSION_4_4_X=y
 BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_GDB_HOST=y
 BR2_ENABLE_LOCALE_PURGE=y


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-447-g1b799b2

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  1b799b25d6b2d081ef4ad4e0a776fb9f70332399 (commit)
      from  b8b6025a10f96f664d786ac882059b551f4ed532 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1b799b25d6b2d081ef4ad4e0a776fb9f70332399
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Jul 13 18:32:12 2012 +0200

    [LINUX] apf28: replace VFP layer that is not present on this cpu by the FastFPE FPU emulation

-----------------------------------------------------------------------

Summary of changes:
 .../armadeus/apf28/apf28-linux-2.6.35.config       |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
index 1178068..214340c 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
@@ -383,8 +383,8 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 # At least one emulation must be selected
 #
 # CONFIG_FPE_NWFPE is not set
-# CONFIG_FPE_FASTFPE is not set
-CONFIG_VFP=y
+CONFIG_FPE_FASTFPE=y
+# CONFIG_VFP is not set
 
 #
 # Userspace binary formats


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-446-gb8b6025

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  b8b6025a10f96f664d786ac882059b551f4ed532 (commit)
      from  007f49d4537d79c67f89fac3e84b61b388e9f318 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b8b6025a10f96f664d786ac882059b551f4ed532
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Jul 11 16:19:33 2012 +0200

    [LINUX] apf28: support hardware crypto controller DCP - bump to GCC 4.6.x to fix tcrypt code relocation issue

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/apf28_defconfig                  |    1 +
 .../armadeus/apf28/apf28-linux-2.6.35.config       |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 63a4cfe..235edcd 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -10,6 +10,7 @@ BR2_STRIP_sstrip=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.35.3"
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
+BR2_GCC_VERSION_4_6_X=y
 BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_GDB_HOST=y
 BR2_ENABLE_LOCALE_PURGE=y
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
index 52a6d1b..1178068 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.35.3
-# Sun Jul  8 15:46:38 2012
+# Wed Jul 11 16:09:28 2012
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -2343,7 +2343,7 @@ CONFIG_CRYPTO_ECB=y
 #
 # Hash modes
 #
-CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_HMAC is not set
 # CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_VMAC is not set
 
@@ -2359,8 +2359,8 @@ CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_RMD160 is not set
 # CONFIG_CRYPTO_RMD256 is not set
 # CONFIG_CRYPTO_RMD320 is not set
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
 # CONFIG_CRYPTO_SHA512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
 # CONFIG_CRYPTO_WP512 is not set


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-445-g007f49d

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  007f49d4537d79c67f89fac3e84b61b388e9f318 (commit)
       via  629e42c30eb6de5c81da811a6d078118950657e6 (commit)
       via  e26da7e2ef4422dde7a275b65a52ca99eda7d5f7 (commit)
       via  285cd3b4c994857543ca293d50724fa0cf15d047 (commit)
       via  fe63b8ea86e05e486815d255e8f9062f5dbff9ac (commit)
      from  1fdbf211cfe46717457052e4742b61e7b69ba8d0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 007f49d4537d79c67f89fac3e84b61b388e9f318
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Jul 11 03:38:18 2012 +0200

    [LINUX] apf9328,2.6.26: enable imx watchdog driver

commit 629e42c30eb6de5c81da811a6d078118950657e6
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Jul 11 03:36:59 2012 +0200

    [LINUX] apf9328,2.6.26: add watchdog driver

commit e26da7e2ef4422dde7a275b65a52ca99eda7d5f7
Merge: 285cd3b 1fdbf21
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Jul 10 22:17:48 2012 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 285cd3b4c994857543ca293d50724fa0cf15d047
Merge: fe63b8e 7a1c774
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Jun 26 11:30:11 2012 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit fe63b8ea86e05e486815d255e8f9062f5dbff9ac
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Jun 25 16:49:47 2012 +0200

    [UBOOT] apf9328: update Nico email from copyrights

-----------------------------------------------------------------------

Summary of changes:
 .../armadeus/apf9328/apf9328-linux-2.6.29.config   |   16 ++-
 patches/linux/2.6.29/021-armadeus-apf9328.patch    |   19 ++-
 .../2.6.29/442-armadeus-support_watchdog.patch     |  168 ++++++++++++++++++++
 patches/u-boot/2012.04/103-apf9328.patch           |    4 +-
 4 files changed, 202 insertions(+), 5 deletions(-)
 create mode 100644 patches/linux/2.6.29/442-armadeus-support_watchdog.patch

diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config b/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config
index 819da46..d07e803 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29.6
-# Tue Aug  9 09:23:34 2011
+# Wed Jul 11 03:20:51 2012
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -830,7 +830,19 @@ CONFIG_HWMON=m
 # CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_IMX_WDT=y
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 
 #
diff --git a/patches/linux/2.6.29/021-armadeus-apf9328.patch b/patches/linux/2.6.29/021-armadeus-apf9328.patch
index e5b2ab3..70aadd7 100644
--- a/patches/linux/2.6.29/021-armadeus-apf9328.patch
+++ b/patches/linux/2.6.29/021-armadeus-apf9328.patch
@@ -5,7 +5,7 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ linux-2.6.29.6/arch/arm/mach-imx/apf9328.c	2011-06-15 12:16:40.000000000 +0200
-@@ -0,0 +1,585 @@
+@@ -0,0 +1,602 @@
 +/*
 + * linux/arch/arm/mach-imx/apf9328.c
 + *
@@ -501,6 +501,21 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
 +	.num_resources = 1,
 +};
 +
++static struct resource imx_wdt_resources[] = {
++	[0] = {
++		.start  = 0x00201000,
++		.end    = 0x00201008,
++		.flags  = IORESOURCE_MEM,
++	},
++};
++
++struct platform_device imx_wdt_device = {
++	.name           = "imx-wdt",
++	.id             = 0,
++	.resource       = imx_wdt_resources,
++	.num_resources  = ARRAY_SIZE(imx_wdt_resources),
++};
++
 +static struct platform_device *devices[] __initdata = {
 +	&imx_uart1_device,
 +	&imx_uart2_device,
@@ -519,6 +534,8 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
 +	&apf9328_ssi_device,
 +#endif
 +	&apf9328_flash_device,
++	&imx_wdt_device,
++
 +};
 +
 +static void __init apf9328_init(void)
diff --git a/patches/linux/2.6.29/442-armadeus-support_watchdog.patch b/patches/linux/2.6.29/442-armadeus-support_watchdog.patch
new file mode 100644
index 0000000..4e8ee24
--- /dev/null
+++ b/patches/linux/2.6.29/442-armadeus-support_watchdog.patch
@@ -0,0 +1,168 @@
+make imx-wdt driver compatible with the ARCH_IMX configs
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+
+Index: linux-2.6.29.6/drivers/watchdog/imx-wdt.c
+===================================================================
+--- linux-2.6.29.6/drivers/watchdog/imx-wdt.c
++++ linux-2.6.29.6/drivers/watchdog/imx-wdt.c
+@@ -37,7 +37,7 @@
+ #include <mach/hardware.h>
+ #include <linux/clk.h>
+ 
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ # define WDT_MAX_TIME		63		/* seconds */
+ 
+ # define IMX_WDT_WCR		0x00		/* Control reg */
+@@ -81,7 +81,7 @@ static unsigned int timeout = WDT_DEFAUL
+ static struct watchdog_info imx_wdt_info = {
+ 	.identity	= "imx watchdog",
+ 	.options	= WDIOF_KEEPALIVEPING
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ 			| WDIOF_SETTIMEOUT
+ #endif
+ };
+@@ -91,7 +91,7 @@ static inline void imx_wdt_stop(struct i
+ {
+ 	dev_dbg(imx_wdt->dev, "<%s>\n", __func__);
+ 
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ 	__raw_writew(0, imx_wdt->base + IMX_WDT_WCR);
+ #else
+ 	dev_info(imx_wdt->dev, "watchdog is unstoppable on i.MX2/3 !\n");
+@@ -105,11 +105,14 @@ static inline void imx_wdt_start(struct
+ 
+ 	dev_dbg(imx_wdt->dev, "<%s>\n", __func__);
+ 
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
++	__raw_writew(0, imx_wdt->base + IMX_WDT_WCR);
++#endif
+ 	temp = __raw_readw(imx_wdt->base + IMX_WDT_WCR);
+-	temp |= imx_wdt->wdt_time << 8;
++	temp |= (imx_wdt->wdt_time << 8) & WCR_WT;
+ 	__raw_writew(temp, imx_wdt->base + IMX_WDT_WCR);
+ 
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ # ifndef CONFIG_WATCHDOG_NOWAYOUT
+ 	temp |= WCR_WDEC;
+ 	__raw_writew(temp, imx_wdt->base + IMX_WDT_WCR);
+@@ -121,7 +124,7 @@ static inline void imx_wdt_start(struct
+ 	__raw_writew(temp, imx_wdt->base + IMX_WDT_WCR);
+ #endif
+ 
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ 	__raw_writew(WDT_SEQ1, imx_wdt->base + IMX_WDT_WSR);
+ 	__raw_writew(WDT_SEQ2, imx_wdt->base + IMX_WDT_WSR);
+ #endif
+@@ -167,7 +170,7 @@ static int imx_wdt_close(struct inode *i
+ 	return 0;
+ }
+ 
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ /* Change the watchdog time interval. */
+ static int imx_wdt_settimeout(struct imx_wdt_struct *imx_wdt, int new_time)
+ {
+@@ -189,7 +192,7 @@ static int imx_wdt_ioctl(struct inode *i
+ 
+ 	void __user *argp = (void __user *)arg;
+ 	int __user *p = argp;
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ 	int new_value;
+ #endif
+ 
+@@ -203,7 +206,7 @@ static int imx_wdt_ioctl(struct inode *i
+ 	case WDIOC_GETSUPPORT:
+ 		return copy_to_user(argp, &imx_wdt_info,
+ 			sizeof(imx_wdt_info)) ? -EFAULT : 0;
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ 	case WDIOC_SETTIMEOUT:
+ 		if (get_user(new_value, p))
+ 			return -EFAULT;
+@@ -296,6 +299,7 @@ static int __init imx_wdt_probe(struct p
+ 		goto fail1;
+ 	}
+ 
++#if !defined(CONFIG_ARCH_MX1) && !defined(CONFIG_ARCH_IMX)
+ 	imx_wdt->clk = clk_get(&pdev->dev, "wdog_clk");
+ 	if (IS_ERR(imx_wdt->clk)) {
+ 		dev_err(&pdev->dev, "can't get Watchdog clock\n");
+@@ -303,6 +307,7 @@ static int __init imx_wdt_probe(struct p
+ 		goto fail2;
+ 	}
+ 	clk_enable(imx_wdt->clk);
++#endif
+ 
+ 	/* Setup imx_wdt driver structure */
+ 	imx_wdt->dev			= &pdev->dev;
+@@ -333,9 +338,11 @@ static int __init imx_wdt_probe(struct p
+ 	return 0;
+ 
+ fail3:
++#if !defined(CONFIG_ARCH_MX1) && !defined(CONFIG_ARCH_IMX)
+ 	clk_disable(imx_wdt->clk);
+ 	clk_put(imx_wdt->clk);
+ fail2:
++#endif
+ 	platform_set_drvdata(pdev, NULL);
+ 	kfree(imx_wdt);
+ fail1:
+@@ -359,9 +366,10 @@ static int __exit imx_wdt_remove(struct
+ 	release_mem_region(imx_wdt->res->start,
+ 		imx_wdt->res->end - imx_wdt->res->start + 1);
+ 
++#if !defined(CONFIG_ARCH_MX1) && !defined(CONFIG_ARCH_IMX)
+ 	clk_disable(imx_wdt->clk);
+ 	clk_put(imx_wdt->clk);
+-
++#endif
+ 	kfree(imx_wdt);
+ 	return 0;
+ }
+@@ -370,7 +378,7 @@ static int __exit imx_wdt_remove(struct
+ 
+ static int imx_wdt_suspend(struct platform_device *pdev, pm_message_t message)
+ {
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ 	struct imx_wdt_struct *imx_wdt = platform_get_drvdata(pdev);
+ 
+ 	u32 temp = __raw_readw(imx_wdt->base + IMX_WDT_WCR);
+@@ -381,7 +389,7 @@ static int imx_wdt_suspend(struct platfo
+ 
+ static int imx_wdt_resume(struct platform_device *pdev)
+ {
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ 	struct imx_wdt_struct *imx_wdt = platform_get_drvdata(pdev);
+ 	u32 temp;
+ 
+@@ -405,7 +413,7 @@ static struct platform_driver imx_wdt_dr
+ 	.suspend	= imx_wdt_suspend,
+ 	.resume		= imx_wdt_resume,
+ 	.driver		= {
+-#ifdef CONFIG_MACH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ 		.name	= "imx-wdt",
+ #else
+ 		.name	= "mxc_wdt",
+Index: linux-2.6.29.6/drivers/watchdog/Kconfig
+===================================================================
+--- linux-2.6.29.6/drivers/watchdog/Kconfig
++++ linux-2.6.29.6/drivers/watchdog/Kconfig
+@@ -68,7 +68,7 @@ config WM8350_WATCHDOG
+ 
+ config IMX_WDT
+ 	tristate "IMX Watchdog"
+-	depends on ARCH_MXC
++	depends on ARCH_MXC || ARCH_IMX
+ 	help
+ 	  This is the driver for the hardware watchdog
+ 	  on the Freescale IMX processors.
diff --git a/patches/u-boot/2012.04/103-apf9328.patch b/patches/u-boot/2012.04/103-apf9328.patch
index 5be9d3d..6719864 100644
--- a/patches/u-boot/2012.04/103-apf9328.patch
+++ b/patches/u-boot/2012.04/103-apf9328.patch
@@ -92,7 +92,7 @@ index 0000000..b72491d
 @@ -0,0 +1,106 @@
 +/*
 + * (C) Copyright 2005-2011
-+ * Nicolas Colombin <th...@us...>
++ * Nicolas Colombain <nic...@ar...>
 + * Eric Jarrige <eri...@ar...>
 + * Copyright (C) 2004 Sascha Hauer, Synertronixx GmbH
 + *
@@ -204,7 +204,7 @@ index 0000000..4c63c4e
 @@ -0,0 +1,100 @@
 +/*
 + * (C) Copyright 2005-2011
-+ * Nicolas Colombin <th...@us...>
++ * Nicolas Colombain <nic...@ar...>
 + * Eric Jarrige <eri...@ar...>
 + *
 + * See file CREDITS for list of people who contributed to this


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-440-g1fdbf21

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  1fdbf211cfe46717457052e4742b61e7b69ba8d0 (commit)
      from  06cedea95a036376b111a4a7c5e3e5be5d238024 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1fdbf211cfe46717457052e4742b61e7b69ba8d0
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Jul 10 19:09:50 2012 +0200

    [LINUX] apf28: update i2c buses to use chipset internal pad keeper

-----------------------------------------------------------------------

Summary of changes:
 ...1-armadeus-add_apf28dev_baseboard_support.patch |   35 +++++++++++++++++--
 1 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
index aa81eea..b3e3b75 100644
--- a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -45,7 +45,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
 ===================================================================
 --- /dev/null
 +++ linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
-@@ -0,0 +1,871 @@
+@@ -0,0 +1,898 @@
 +/*
 + * Copyright (C) 2012 Armadeus systems
 + *
@@ -512,23 +512,51 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
 +#endif
 +#if defined(CONFIG_I2C_MXS) || \
 +	defined(CONFIG_I2C_MXS_MODULE)
++#if defined(CONFIG_I2C_MXS_SELECT0)
 +	{
 +		.name		= "I2C0_SCL",
 +		.id		= PINID_I2C0_SCL,
 +		.fun		= PIN_FUN1,
-+		.strength	= PAD_4MA,
++		.strength	= PAD_8MA,
 +		.voltage	= PAD_3_3V,
 +		.drive		= 1,
++		.pullup		= 0,
++		.pull		= 1,
 +	},
 +	{
 +		.name		= "I2C0_SDA",
 +		.id		= PINID_I2C0_SDA,
 +		.fun		= PIN_FUN1,
-+		.strength	= PAD_4MA,
++		.strength	= PAD_8MA,
 +		.voltage	= PAD_3_3V,
 +		.drive		= 1,
++		.pullup		= 0,
++		.pull		= 1,
 +	},
 +#endif
++#if defined(CONFIG_I2C_MXS_SELECT1)
++	{
++		.name		= "I2C1_SCL",
++		.id		= PINID_AUART2_CTS,
++		.fun		= PIN_FUN2,
++		.strength	= PAD_8MA,
++		.voltage	= PAD_3_3V,
++		.drive		= 1,
++		.pullup		= 0,
++		.pull		= 1,
++	},
++	{
++		.name		= "I2C1_SDA",
++		.id		= PINID_AUART2_RTS,
++		.fun		= PIN_FUN2,
++		.strength	= PAD_8MA,
++		.voltage	= PAD_3_3V,
++		.drive		= 1,
++		.pullup		= 0,
++		.pull		= 1,
++	},
++#endif
++#endif
 +#if defined(CONFIG_SND_MXS_SOC_DAI) || defined(CONFIG_SND_MXS_SOC_DAI_MODULE)
 +	/* Configurations of SAIF0 port pins */
 +	{
@@ -916,7 +944,6 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
 +#endif /* defined(CONFIG_SPI_MXS) || defined(CONFIG_SPI_MXS_MODULE) */
 +}
 +
-+
 Index: linux-2.6.35.3/drivers/video/mxs/Kconfig
 ===================================================================
 --- linux-2.6.35.3.orig/drivers/video/mxs/Kconfig


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-439-g06cedea

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  06cedea95a036376b111a4a7c5e3e5be5d238024 (commit)
      from  cd8f9fb63a794fd62a08013bf0b4413db90d481c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 06cedea95a036376b111a4a7c5e3e5be5d238024
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Jul 9 14:13:50 2012 +0200

    [BUILDROOT] Add apf28test_defconfig (to be tested by release engineer ;-) )

-----------------------------------------------------------------------

Summary of changes:
 .../{apf28_defconfig => apf28test_defconfig}       |   29 ++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)
 copy buildroot/configs/{apf28_defconfig => apf28test_defconfig} (79%)

diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28test_defconfig
similarity index 79%
copy from buildroot/configs/apf28_defconfig
copy to buildroot/configs/apf28test_defconfig
index 63a4cfe..2b3bf7d 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -10,6 +10,7 @@ BR2_STRIP_sstrip=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.35.3"
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
+BR2_PACKAGE_GDB=y
 BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_GDB_HOST=y
 BR2_ENABLE_LOCALE_PURGE=y
@@ -33,24 +34,52 @@ BR2_BOARD_NAME="apf28"
 BR2_CPU_NAME="imx28"
 BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_AS_DEVICES=y
+BR2_PACKAGE_AS_DEVICES_TESTS=y
+BR2_PACKAGE_AS_DEVICES_CPP=y
+BR2_PACKAGE_AS_DEVICES_TESTS_CPP=y
+BR2_PACKAGE_ARMADEUS_DEMOS=y
+BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
+BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
+BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
+BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
 BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
 BR2_PACKAGE_IMXREGS=y
+BR2_PACKAGE_ARMADEUS_TESTSUITE=y
+BR2_PACKAGE_MPLAYER=y
+BR2_PACKAGE_LTRACE=y
 BR2_PACKAGE_STRACE=y
+BR2_PACKAGE_PRBOOM=y
+BR2_PACKAGE_DOOM_WAD=y
+BR2_PACKAGE_FBTEST=y
+BR2_PACKAGE_SDL_WATER=y
 BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_MTD=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_LUA=y
+BR2_PACKAGE_LUA_INTERPRETER=y
+BR2_PACKAGE_LUA_INTERPRETER_READLINE=y
+BR2_PACKAGE_PYTHON=y
 BR2_PACKAGE_LZO=y
 BR2_PACKAGE_ZLIB=y
 BR2_PACKAGE_TSLIB=y
+BR2_PACKAGE_LIBUSB=y
 BR2_PACKAGE_NCURSES_TARGET_PANEL=y
 BR2_PACKAGE_NCURSES_TARGET_FORM=y
 BR2_PACKAGE_NCURSES_TARGET_MENU=y
 BR2_PACKAGE_CAN_UTILS=y
+BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_IPROUTE2=y
+BR2_PACKAGE_LINKS=y
 BR2_PACKAGE_NTP=y
 # BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_PORTMAP=y
+BR2_PACKAGE_TCPDUMP=y
 BR2_PACKAGE_UUCP=y
 BR2_PACKAGE_WIRELESS_TOOLS=y
 BR2_PACKAGE_NANO=y


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-438-gcd8f9fb

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  cd8f9fb63a794fd62a08013bf0b4413db90d481c (commit)
       via  2cf580bb039ba2f8418c38cc6cd0a8179b6fadf0 (commit)
      from  c6f615585034a937078a44cbb5d06eecfc7f5d8f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cd8f9fb63a794fd62a08013bf0b4413db90d481c
Merge: 2cf580b c6f6155
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Jul 9 09:35:16 2012 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 2cf580bb039ba2f8418c38cc6cd0a8179b6fadf0
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Jul 9 09:34:41 2012 +0200

    [LINUX] Add 3.5 with device tree support for APF28 (preliminary)

-----------------------------------------------------------------------

Summary of changes:
 .../armadeus/apf28/apf28-linux-3.5-rc5.config      |    1 +
 ...f28-linux-3.4.config => apf28-linux-3.5.config} |    7 +-
 patches/linux/{3.5-rc4 => 3.5-rc5}                 |    0
 ...0400-freescale-mx28_add_gpmi-nand_support.patch |   90 +++++++++++++++
 ...dts-mx28evk-Add-auart0-and-auart3-support.patch |  116 ++++++++++++++++++++
 ...-additionnal-muxing-options-to-iMX28-DTSI.patch |   51 +++++++++
 .../3.5/0403-armadeus-Add-apf28-dts-files.patch    |   57 ++++++++++
 7 files changed, 318 insertions(+), 4 deletions(-)
 create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.5-rc5.config
 copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.4.config => apf28-linux-3.5.config} (99%)
 copy patches/linux/{3.5-rc4 => 3.5-rc5} (100%)
 create mode 100644 patches/linux/3.5/0400-freescale-mx28_add_gpmi-nand_support.patch
 create mode 100644 patches/linux/3.5/0401-freescale-ARM-dts-mx28evk-Add-auart0-and-auart3-support.patch
 create mode 100644 patches/linux/3.5/0402-free-electrons-ARM-dts-imx28-Add-additionnal-muxing-options-to-iMX28-DTSI.patch
 create mode 100644 patches/linux/3.5/0403-armadeus-Add-apf28-dts-files.patch

diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.5-rc5.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.5-rc5.config
new file mode 120000
index 0000000..d95fa64
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.5-rc5.config
@@ -0,0 +1 @@
+apf28-linux-3.5.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.5.config
similarity index 99%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.4.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.5.config
index 3ac10f1..2fbedd1 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.5.config
@@ -3,6 +3,8 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_EMBEDDED=y
 # CONFIG_COMPAT_BRK is not set
@@ -16,11 +18,8 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_BSD_DISKLABEL=y
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_MXS=y
+CONFIG_MACH_MXS_DT=y
 CONFIG_MACH_MX28EVK=y
-CONFIG_MACH_APF28=y
-CONFIG_MACH_APF28_DEV=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
diff --git a/patches/linux/3.5-rc4 b/patches/linux/3.5-rc5
similarity index 100%
copy from patches/linux/3.5-rc4
copy to patches/linux/3.5-rc5
diff --git a/patches/linux/3.5/0400-freescale-mx28_add_gpmi-nand_support.patch b/patches/linux/3.5/0400-freescale-mx28_add_gpmi-nand_support.patch
new file mode 100644
index 0000000..3361c3f
--- /dev/null
+++ b/patches/linux/3.5/0400-freescale-mx28_add_gpmi-nand_support.patch
@@ -0,0 +1,90 @@
+From 5ed18fcf1309b9c62f56993371c63ba462d422d6 Mon Sep 17 00:00:00 2001
+From: Huang Shijie <b3...@fr...>
+Date: Fri, 25 May 2012 17:25:35 +0800
+Subject: [PATCH] ARM: mx28: add gpmi-nand support
+
+add gpmi-nand device tree support.
+add gpmi-nand pinctrl support.
+
+Also enable the gpmi support for mx28-evk board.
+
+Signed-off-by: Huang Shijie <b3...@fr...>
+Signed-off-by: Shawn Guo <sha...@li...>
+---
+ arch/arm/boot/dts/imx28-evk.dts |    6 ++++++
+ arch/arm/boot/dts/imx28.dtsi    |   35 ++++++++++++++++++++++++++---------
+ 2 files changed, 32 insertions(+), 9 deletions(-)
+
+diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
+index ee520a5..e53cf67 100644
+--- a/arch/arm/boot/dts/imx28-evk.dts
++++ b/arch/arm/boot/dts/imx28-evk.dts
+@@ -22,6 +22,12 @@
+ 
+ 	apb@80000000 {
+ 		apbh@80000000 {
++			gpmi-nand@8000c000 {
++				pinctrl-names = "default";
++				pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
++				status = "okay";
++			};
++
+ 			ssp0: ssp@80010000 {
+ 				compatible = "fsl,imx28-mmc";
+ 				pinctrl-names = "default";
+diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
+index 4634cb8..a89da5a 100644
+--- a/arch/arm/boot/dts/imx28.dtsi
++++ b/arch/arm/boot/dts/imx28.dtsi
+@@ -68,15 +68,15 @@
+ 				status = "disabled";
+ 			};
+ 
+-			bch@8000a000 {
+-				reg = <0x8000a000 2000>;
+-				interrupts = <41>;
+-				status = "disabled";
+-			};
+-
+-			gpmi@8000c000 {
+-				reg = <0x8000c000 2000>;
+-				interrupts = <42 88>;
++			gpmi-nand@8000c000 {
++				compatible = "fsl,imx28-gpmi-nand";
++				#address-cells = <1>;
++				#size-cells = <1>;
++				reg = <0x8000c000 2000>, <0x8000a000 2000>;
++				reg-names = "gpmi-nand", "bch";
++				interrupts = <88>, <41>;
++				interrupt-names = "gpmi-dma", "bch";
++				fsl,gpmi-dma-channel = <4>;
+ 				status = "disabled";
+ 			};
+ 
+@@ -167,6 +167,23 @@
+ 					fsl,pull-up = <0>;
+ 				};
+ 
++				gpmi_pins_a: gpmi-nand@0 {
++					reg = <0>;
++					fsl,pinmux-ids = <0x0000 0x0010 0x0020
++						0x0030 0x0040 0x0050 0x0060
++						0x0070 0x0100 0x0110 0x0140
++						0x0150 0x0180 0x0190 0x01a0
++						0x01b0 0x01c0>;
++					fsl,drive-strength = <0>;
++					fsl,voltage = <1>;
++					fsl,pull-up = <0>;
++				};
++
++				gpmi_status_cfg: gpmi-status-cfg {
++					fsl,pinmux-ids = <0x0180 0x0190 0x01c0>;
++					fsl,drive-strength = <2>;
++				};
++
+ 				mac0_pins_a: mac0@0 {
+ 					reg = <0>;
+ 					fsl,pinmux-ids = <0x4000 0x4010 0x4020
+-- 
+1.7.0.4
+
diff --git a/patches/linux/3.5/0401-freescale-ARM-dts-mx28evk-Add-auart0-and-auart3-support.patch b/patches/linux/3.5/0401-freescale-ARM-dts-mx28evk-Add-auart0-and-auart3-support.patch
new file mode 100644
index 0000000..dde4267
--- /dev/null
+++ b/patches/linux/3.5/0401-freescale-ARM-dts-mx28evk-Add-auart0-and-auart3-support.patch
@@ -0,0 +1,116 @@
+From 65513dde63e0c7633aefd30d8fa69fd571b84d5b Mon Sep 17 00:00:00 2001
+From: Fabio Estevam <fab...@fr...>
+Date: Fri, 15 Jun 2012 12:35:56 -0300
+Subject: [PATCH] ARM: dts: mx28evk: Add auart0 and auart3 support
+
+Add auart0 and auart3 support.
+
+Signed-off-by: Fabio Estevam <fab...@fr...>
+Reviewed-by: Marek Vasut <ma...@de...>
+Signed-off-by: Shawn Guo <sha...@li...>
+---
+ arch/arm/boot/dts/imx28-evk.dts |   12 ++++++++++++
+ arch/arm/boot/dts/imx28.dtsi    |   26 ++++++++++++++++++++++++++
+ 2 files changed, 38 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
+index e53cf67..319c75a 100644
+--- a/arch/arm/boot/dts/imx28-evk.dts
++++ b/arch/arm/boot/dts/imx28-evk.dts
+@@ -79,6 +79,18 @@
+ 				pinctrl-0 = <&duart_pins_a>;
+ 				status = "okay";
+ 			};
++
++			auart0: serial@8006a000 {
++				pinctrl-names = "default";
++				pinctrl-0 = <&auart0_pins_a>;
++				status = "okay";
++			};
++
++			auart3: serial@80070000 {
++				pinctrl-names = "default";
++				pinctrl-0 = <&auart3_pins_a>;
++				status = "okay";
++			};
+ 		};
+ 	};
+ 
+diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
+index a89da5a..ee3778a 100644
+--- a/arch/arm/boot/dts/imx28.dtsi
++++ b/arch/arm/boot/dts/imx28.dtsi
+@@ -22,6 +22,11 @@
+ 		gpio4 = &gpio4;
+ 		saif0 = &saif0;
+ 		saif1 = &saif1;
++		serial0 = &auart0;
++		serial1 = &auart1;
++		serial2 = &auart2;
++		serial3 = &auart3;
++		serial4 = &auart4;
+ 	};
+ 
+ 	cpus {
+@@ -184,6 +189,22 @@
+ 					fsl,drive-strength = <2>;
+ 				};
+ 
++				auart0_pins_a: auart0@0 {
++					reg = <0>;
++					fsl,pinmux-ids = <0x3000 0x3010 0x3020 0x3030>;
++					fsl,drive-strength = <0>;
++					fsl,voltage = <1>;
++					fsl,pull-up = <0>;
++				};
++
++				auart3_pins_a: auart3@0 {
++					reg = <0>;
++					fsl,pinmux-ids = <0x30c0 0x30d0 0x30e0 0x30f0>;
++					fsl,drive-strength = <0>;
++					fsl,voltage = <1>;
++					fsl,pull-up = <0>;
++				};
++
+ 				mac0_pins_a: mac0@0 {
+ 					reg = <0>;
+ 					fsl,pinmux-ids = <0x4000 0x4010 0x4020
+@@ -421,30 +442,35 @@
+ 			};
+ 
+ 			auart0: serial@8006a000 {
++				compatible = "fsl,imx28-auart", "fsl,imx23-auart";
+ 				reg = <0x8006a000 0x2000>;
+ 				interrupts = <112 70 71>;
+ 				status = "disabled";
+ 			};
+ 
+ 			auart1: serial@8006c000 {
++				compatible = "fsl,imx28-auart", "fsl,imx23-auart";
+ 				reg = <0x8006c000 0x2000>;
+ 				interrupts = <113 72 73>;
+ 				status = "disabled";
+ 			};
+ 
+ 			auart2: serial@8006e000 {
++				compatible = "fsl,imx28-auart", "fsl,imx23-auart";
+ 				reg = <0x8006e000 0x2000>;
+ 				interrupts = <114 74 75>;
+ 				status = "disabled";
+ 			};
+ 
+ 			auart3: serial@80070000 {
++				compatible = "fsl,imx28-auart", "fsl,imx23-auart";
+ 				reg = <0x80070000 0x2000>;
+ 				interrupts = <115 76 77>;
+ 				status = "disabled";
+ 			};
+ 
+ 			auart4: serial@80072000 {
++				compatible = "fsl,imx28-auart", "fsl,imx23-auart";
+ 				reg = <0x80072000 0x2000>;
+ 				interrupts = <116 78 79>;
+ 				status = "disabled";
+-- 
+1.7.0.4
+
diff --git a/patches/linux/3.5/0402-free-electrons-ARM-dts-imx28-Add-additionnal-muxing-options-to-iMX28-DTSI.patch b/patches/linux/3.5/0402-free-electrons-ARM-dts-imx28-Add-additionnal-muxing-options-to-iMX28-DTSI.patch
new file mode 100644
index 0000000..fa8b9f1
--- /dev/null
+++ b/patches/linux/3.5/0402-free-electrons-ARM-dts-imx28-Add-additionnal-muxing-options-to-iMX28-DTSI.patch
@@ -0,0 +1,51 @@
+From 3e04b45679625db2804e5edabe55d45b603664e9 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <max...@fr...>
+Date: Wed, 27 Jun 2012 10:18:11 +0200
+Subject: [PATCH] ARM: dts: imx28: Add additionnal muxing options to iMX28 DTSI
+
+Signed-off-by: Maxime Ripard <max...@fr...>
+Cc: Brian Lily <br...@cr...>
+Reviewed-by: Marek Vasut <ma...@de...>
+Signed-off-by: Shawn Guo <sha...@li...>
+---
+ arch/arm/boot/dts/imx28.dtsi |   17 +++++++++++++++++
+ 1 files changed, 17 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
+index ee3778a..65d6a53 100644
+--- a/arch/arm/boot/dts/imx28.dtsi
++++ b/arch/arm/boot/dts/imx28.dtsi
+@@ -172,6 +172,14 @@
+ 					fsl,pull-up = <0>;
+ 				};
+ 
++				duart_pins_b: duart@1 {
++					reg = <1>;
++					fsl,pinmux-ids = <0x3022 0x3032>;
++					fsl,drive-strength = <0>;
++					fsl,voltage = <1>;
++					fsl,pull-up = <0>;
++				};
++
+ 				gpmi_pins_a: gpmi-nand@0 {
+ 					reg = <0>;
+ 					fsl,pinmux-ids = <0x0000 0x0010 0x0020
+@@ -234,6 +242,15 @@
+ 					fsl,pull-up = <1>;
+ 				};
+ 
++				mmc0_4bit_pins_a: mmc0-4bit@0 {
++					reg = <0>;
++					fsl,pinmux-ids = <0x2000 0x2010 0x2020
++						0x2030 0x2080 0x2090 0x20a0>;
++					fsl,drive-strength = <1>;
++					fsl,voltage = <1>;
++					fsl,pull-up = <1>;
++				};
++
+ 				mmc0_cd_cfg: mmc0-cd-cfg {
+ 					fsl,pinmux-ids = <0x2090>;
+ 					fsl,pull-up = <0>;
+-- 
+1.7.0.4
+
diff --git a/patches/linux/3.5/0403-armadeus-Add-apf28-dts-files.patch b/patches/linux/3.5/0403-armadeus-Add-apf28-dts-files.patch
new file mode 100644
index 0000000..8e1a561
--- /dev/null
+++ b/patches/linux/3.5/0403-armadeus-Add-apf28-dts-files.patch
@@ -0,0 +1,57 @@
+Index: linux-3.5-rc5/arch/arm/boot/dts/imx28-apf28.dts
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.5-rc5/arch/arm/boot/dts/imx28-apf28.dts	2012-07-09 08:29:09.000000000 +0200
+@@ -0,0 +1,52 @@
++/*
++ * Copyright 2012 Armadeus Systems - <su...@ar...>
++ *
++ * Based on code which is:
++ * Copyright 2012 Freescale Semiconductor, Inc.
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/dts-v1/;
++/include/ "imx28.dtsi"
++
++/ {
++	model = "Armadeus Systems APF28 module";
++	compatible = "armadeus,imx28-apf28", "fsl,imx28";
++
++	memory {
++		reg = <0x40000000 0x08000000>;
++	};
++
++	apb@80000000 {
++		apbh@80000000 {
++			gpmi-nand@8000c000 {
++				pinctrl-names = "default";
++				pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
++				status = "okay";
++			};
++		};
++
++		apbx@80040000 {
++			duart: serial@80074000 {
++				pinctrl-names = "default";
++				pinctrl-0 = <&duart_pins_a>;
++				status = "okay";
++			};
++		};
++	};
++
++	ahb@80080000 {
++		mac0: ethernet@800f0000 {
++			phy-mode = "rmii";
++			pinctrl-names = "default";
++			pinctrl-0 = <&mac0_pins_a>;
++			status = "okay";
++		};
++	};
++};


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-436-gc6f6155

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  c6f615585034a937078a44cbb5d06eecfc7f5d8f (commit)
      from  fa64cebf0ef2674518cbea9e1b33665119f88fad (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c6f615585034a937078a44cbb5d06eecfc7f5d8f
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Jul 9 00:55:27 2012 +0200

    [TOOLS] apf27: Bump U-Boot to 2012.04 and improve apf27_recover reliability

-----------------------------------------------------------------------

Summary of changes:
 software/uboot_recover/apf27-u-boot-nand.bin |  Bin 0 -> 414012 bytes
 software/uboot_recover/apf27-u-boot.bin      |  Bin 372288 -> 0 bytes
 software/uboot_recover/apf27_recover.py      |   11 +++++++++--
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 software/uboot_recover/apf27-u-boot-nand.bin
 delete mode 100644 software/uboot_recover/apf27-u-boot.bin

diff --git a/software/uboot_recover/apf27-u-boot-nand.bin b/software/uboot_recover/apf27-u-boot-nand.bin
new file mode 100644
index 0000000..7933184
Binary files /dev/null and b/software/uboot_recover/apf27-u-boot-nand.bin differ
diff --git a/software/uboot_recover/apf27-u-boot.bin b/software/uboot_recover/apf27-u-boot.bin
deleted file mode 100644
index e9c202d..0000000
Binary files a/software/uboot_recover/apf27-u-boot.bin and /dev/null differ
diff --git a/software/uboot_recover/apf27_recover.py b/software/uboot_recover/apf27_recover.py
index 5ccd017..0c8e379 100644
--- a/software/uboot_recover/apf27_recover.py
+++ b/software/uboot_recover/apf27_recover.py
@@ -257,7 +257,14 @@ class apf27Bootloader:
     def initSDRAM1( self ):
 
         print "SDRAM INIT1 APF",
-        self.put("10027818","0000080f","l")
+        self.put("10000000","20040304","l") #/* AIPI1_PSR0 */
+        self.put("10000004","DFFBFCFB","l") #/* AIPI1_PSR1 */
+        self.put("10020000","00000000","l") #/* AIPI2_PSR0 */
+        self.put("10020004","FFFFFFFF","l") #/* AIPI2_PSR1 */
+        self.put("10027818","0003000F","l") #/* GPCR */
+
+        self.put("D8002060","00002200","l") #/* EIM / WCR */
+
         self.put("D8001010","0000002C","l")
 
         self.put("D8001004","0069D42A","l")
@@ -305,7 +312,7 @@ class UBoot:
         return response
  
     def load(self):
-        BINARY = "apf27-u-boot.bin"
+        BINARY = "apf27-u-boot-nand.bin"
         if not os.path.exists(BINARY):
             raise Error("file "+BINARY+" doesn't exit",0)
         self.fsize = "%08x" % os.path.getsize(BINARY) #os.stat(filesize)[6]


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-435-gfa64ceb

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  fa64cebf0ef2674518cbea9e1b33665119f88fad (commit)
      from  3b4e0131fc8e8fc06036baab02c794a3fbfa2e52 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fa64cebf0ef2674518cbea9e1b33665119f88fad
Author: Eric Jarrige <eri...@ar...>
Date:   Sun Jul 8 16:17:18 2012 +0200

    [LINUX] apf28: cleanup linux config (derived from apf51 config) also speed-up linux boot process

-----------------------------------------------------------------------

Summary of changes:
 .../armadeus/apf28/apf28-linux-2.6.35.config       |  478 +++++++++++++++-----
 1 files changed, 360 insertions(+), 118 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
index 83f7baa..52a6d1b 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.35.3
-# Thu Jul  5 17:40:52 2012
+# Sun Jul  8 15:46:38 2012
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -38,7 +38,7 @@ CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_LZO=y
@@ -46,7 +46,7 @@ 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_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -59,38 +59,29 @@ CONFIG_AUDIT=y
 #
 # RCU Subsystem
 #
-CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU is not set
+CONFIG_TREE_PREEMPT_RCU=y
 # CONFIG_TINY_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=17
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=16
 # CONFIG_CGROUPS is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
-CONFIG_NAMESPACES=y
-# CONFIG_UTS_NS is not set
-# CONFIG_IPC_NS is not set
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
-# CONFIG_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_NAMESPACES is not set
+# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
-# CONFIG_EMBEDDED is not set
+CONFIG_EMBEDDED=y
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_EXTRA_PASS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
@@ -113,16 +104,15 @@ CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_PERF_COUNTERS is not set
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_DEBUG is not set
 CONFIG_COMPAT_BRK=y
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
+CONFIG_OPROFILE=y
 CONFIG_HAVE_OPROFILE=y
-CONFIG_KPROBES=y
-CONFIG_KRETPROBES=y
+# CONFIG_KPROBES is not set
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_CLK=y
@@ -133,18 +123,17 @@ CONFIG_HAVE_CLK=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_SLOW_WORK is not set
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
+# CONFIG_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_BSG is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
 #
@@ -152,11 +141,11 @@ CONFIG_BLK_DEV_BSG=y
 #
 CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_DEFAULT_IOSCHED="deadline"
 # CONFIG_INLINE_SPIN_TRYLOCK is not set
 # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
 # CONFIG_INLINE_SPIN_LOCK is not set
@@ -395,7 +384,7 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 #
 # CONFIG_FPE_NWFPE is not set
 # CONFIG_FPE_FASTFPE is not set
-# CONFIG_VFP is not set
+CONFIG_VFP=y
 
 #
 # Userspace binary formats
@@ -404,7 +393,7 @@ 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
+# CONFIG_BINFMT_MISC is not set
 
 #
 # Power management options
@@ -415,7 +404,7 @@ CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND_NVS=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
-# CONFIG_APM_EMULATION is not set
+CONFIG_APM_EMULATION=y
 CONFIG_PM_RUNTIME=y
 CONFIG_PM_OPS=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
@@ -449,18 +438,36 @@ CONFIG_IP_PNP_BOOTP=y
 # 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_TUNNEL=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_LRO is not set
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
+# 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_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_BEET=y
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=y
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETLABEL is not set
 CONFIG_NETWORK_SECMARK=y
 # CONFIG_NETFILTER is not set
@@ -490,11 +497,10 @@ CONFIG_NETWORK_SECMARK=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_TCPPROBE is not set
 # CONFIG_HAMRADIO is not set
 CONFIG_CAN=y
 CONFIG_CAN_RAW=y
-# CONFIG_CAN_BCM is not set
+CONFIG_CAN_BCM=m
 
 #
 # CAN Device Drivers
@@ -510,7 +516,9 @@ CONFIG_BT_L2CAP=m
 CONFIG_BT_SCO=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BT_BNEP is not set
+CONFIG_BT_BNEP=m
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
 CONFIG_BT_HIDP=m
 
 #
@@ -520,7 +528,7 @@ CONFIG_BT_HCIBTUSB=m
 # CONFIG_BT_HCIBTSDIO is not set
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART_BCSP is not set
+CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIUART_LL is not set
 # CONFIG_BT_HCIBCM203X is not set
 # CONFIG_BT_HCIBPA10X is not set
@@ -530,8 +538,10 @@ CONFIG_BT_HCIUART_H4=y
 # CONFIG_BT_ATH3K is not set
 # CONFIG_AF_RXRPC is not set
 CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
 CONFIG_WEXT_CORE=y
 CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
 CONFIG_CFG80211=y
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -545,6 +555,7 @@ CONFIG_LIB80211=y
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_MAC80211=y
 CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_PID=y
 CONFIG_MAC80211_RC_MINSTREL=y
 # CONFIG_MAC80211_RC_DEFAULT_PID is not set
 CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
@@ -689,10 +700,7 @@ CONFIG_BLK_DEV_LOOP=y
 #
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=1
-CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_BLK_DEV_RAM is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_MG_DISK is not set
@@ -754,7 +762,6 @@ CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_ISCSI_ATTRS=m
-# 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
@@ -832,7 +839,12 @@ CONFIG_RTL8187=m
 # CONFIG_B43LEGACY is not set
 # CONFIG_HOSTAP is not set
 # CONFIG_IWM is not set
-# CONFIG_LIBERTAS is not set
+CONFIG_LIBERTAS=m
+# CONFIG_LIBERTAS_USB is not set
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
+# CONFIG_LIBERTAS_DEBUG is not set
+# CONFIG_LIBERTAS_MESH is not set
 # CONFIG_P54_COMMON is not set
 CONFIG_RT2X00=m
 # CONFIG_RT2500USB is not set
@@ -864,8 +876,17 @@ CONFIG_ZD1211RW=m
 # CONFIG_USB_HSO is not set
 # CONFIG_USB_IPHETH is not set
 # CONFIG_WAN is not set
-# CONFIG_PPP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+# CONFIG_PPP_DEFLATE is not set
+# CONFIG_PPP_BSDCOMP is not set
+# CONFIG_PPP_MPPE is not set
+# CONFIG_PPPOE is not set
 # CONFIG_SLIP is not set
+CONFIG_SLHC=m
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
@@ -876,7 +897,7 @@ CONFIG_ZD1211RW=m
 # Input device support
 #
 CONFIG_INPUT=y
-CONFIG_INPUT_FF_MEMLESS=y
+# CONFIG_INPUT_FF_MEMLESS is not set
 # CONFIG_INPUT_POLLDEV is not set
 # CONFIG_INPUT_SPARSEKMAP is not set
 
@@ -887,9 +908,10 @@ CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_JOYDEV=y
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_APMPOWER is not set
 
 #
 # Input Device Drivers
@@ -910,7 +932,14 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_KEYBOARD_MXS=m
-# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_MOUSE=y
+# CONFIG_MOUSE_PS2 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_GPIO is not set
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
 CONFIG_INPUT_JOYSTICK=y
 # CONFIG_JOYSTICK_ANALOG is not set
 # CONFIG_JOYSTICK_A3D is not set
@@ -951,7 +980,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
 # CONFIG_TOUCHSCREEN_INEXIO is not set
 # CONFIG_TOUCHSCREEN_MK712 is not set
-CONFIG_TOUCHSCREEN_MXS=m
+CONFIG_TOUCHSCREEN_MXS=y
 # CONFIG_TOUCHSCREEN_PENMOUNT is not set
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
@@ -991,12 +1020,8 @@ CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
 CONFIG_DEVKMEM=y
-CONFIG_SERIAL_NONSTANDARD=y
-# CONFIG_N_HDLC is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-CONFIG_STALDRV=y
 CONFIG_MXS_VIIM=y
 
 #
@@ -1009,7 +1034,7 @@ CONFIG_MXS_VIIM=y
 #
 CONFIG_SERIAL_MXS_DUART=y
 CONFIG_SERIAL_MXS_AUART=y
-# CONFIG_SERIAL_MXS_AUART_CONSOLE is not set
+CONFIG_SERIAL_MXS_AUART_CONSOLE=y
 CONFIG_SERIAL_MXS_DUART_CONSOLE=y
 # CONFIG_SERIAL_MAX3100 is not set
 CONFIG_SERIAL_CORE=y
@@ -1019,20 +1044,14 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_ALTERA_UART is not set
 CONFIG_UNIX98_PTYS=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_LEGACY_PTYS is not set
 # CONFIG_FSL_OTP is not set
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMI_HANDLER is not set
 CONFIG_HW_RANDOM=m
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_R3964 is not set
 CONFIG_RAW_DRIVER=y
-CONFIG_MAX_RAW_DEVS=8192
+CONFIG_MAX_RAW_DEVS=16
 # CONFIG_TCG_TPM is not set
 # CONFIG_RAMOOPS is not set
 CONFIG_I2C=y
@@ -1136,6 +1155,7 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PDA_POWER is not set
+# CONFIG_APM_POWER is not set
 # CONFIG_TEST_POWER is not set
 # CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2782 is not set
@@ -1144,7 +1164,83 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_BATTERY_MXS=m
 # CONFIG_MXS_VBUS_CURRENT_DRAW is not set
 # CONFIG_BATTERY_DS2438 is not set
-# CONFIG_HWMON is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_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_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM73 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LM95241 is not set
+# CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX17135 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_EMC1403 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_ADS7871 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP102 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
 # CONFIG_THERMAL is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_NOWAYOUT=y
@@ -1165,10 +1261,7 @@ CONFIG_SSB_POSSIBLE=y
 #
 # Sonics Silicon Backplane
 #
-CONFIG_SSB=m
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-# CONFIG_SSB_SDIOHOST is not set
-# CONFIG_SSB_DEBUG is not set
+# CONFIG_SSB is not set
 CONFIG_MFD_SUPPORT=y
 # CONFIG_MFD_CORE is not set
 # CONFIG_MFD_88PM860X is not set
@@ -1331,11 +1424,62 @@ CONFIG_VIDEO_IR_I2C=y
 #
 # CONFIG_VIDEO_UPD64031A is not set
 # CONFIG_VIDEO_UPD64083 is not set
+# CONFIG_VIDEO_VIVI is not set
 CONFIG_VIDEO_MXS_PXP=y
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
 # CONFIG_SOC_CAMERA is not set
-# CONFIG_V4L_USB_DRIVERS is not set
+CONFIG_V4L_USB_DRIVERS=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+# CONFIG_USB_M5602 is not set
+# CONFIG_USB_STV06XX is not set
+# CONFIG_USB_GL860 is not set
+# CONFIG_USB_GSPCA_BENQ is not set
+# CONFIG_USB_GSPCA_CONEX is not set
+# CONFIG_USB_GSPCA_CPIA1 is not set
+# CONFIG_USB_GSPCA_ETOMS is not set
+# CONFIG_USB_GSPCA_FINEPIX is not set
+# CONFIG_USB_GSPCA_JEILINJ is not set
+# CONFIG_USB_GSPCA_MARS is not set
+# CONFIG_USB_GSPCA_MR97310A is not set
+# CONFIG_USB_GSPCA_OV519 is not set
+# CONFIG_USB_GSPCA_OV534 is not set
+# CONFIG_USB_GSPCA_OV534_9 is not set
+# CONFIG_USB_GSPCA_PAC207 is not set
+# CONFIG_USB_GSPCA_PAC7302 is not set
+# CONFIG_USB_GSPCA_PAC7311 is not set
+# CONFIG_USB_GSPCA_SN9C2028 is not set
+# CONFIG_USB_GSPCA_SN9C20X is not set
+# CONFIG_USB_GSPCA_SONIXB is not set
+# CONFIG_USB_GSPCA_SONIXJ is not set
+# CONFIG_USB_GSPCA_SPCA500 is not set
+# CONFIG_USB_GSPCA_SPCA501 is not set
+# CONFIG_USB_GSPCA_SPCA505 is not set
+# CONFIG_USB_GSPCA_SPCA506 is not set
+# CONFIG_USB_GSPCA_SPCA508 is not set
+# CONFIG_USB_GSPCA_SPCA561 is not set
+# CONFIG_USB_GSPCA_SQ905 is not set
+# CONFIG_USB_GSPCA_SQ905C is not set
+# CONFIG_USB_GSPCA_STK014 is not set
+# CONFIG_USB_GSPCA_STV0680 is not set
+# CONFIG_USB_GSPCA_SUNPLUS is not set
+# CONFIG_USB_GSPCA_T613 is not set
+# CONFIG_USB_GSPCA_TV8532 is not set
+# CONFIG_USB_GSPCA_VC032X is not set
+# CONFIG_USB_GSPCA_ZC3XX is not set
+# CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_HDPVR is not set
+# CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_CX231XX is not set
+# CONFIG_VIDEO_USBVISION is not set
+# CONFIG_USB_ET61X251 is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_ZC0301 is not set
+# CONFIG_USB_ZR364XX is not set
+# CONFIG_USB_STKWEBCAM is not set
+# CONFIG_USB_S2255 is not set
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
 # CONFIG_RADIO_ADAPTERS is not set
 # CONFIG_DAB is not set
@@ -1379,7 +1523,14 @@ CONFIG_FB_MXS_LCD_LW700=y
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_LCD_CLASS_DEVICE=y
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+CONFIG_LCD_PLATFORM=y
+# CONFIG_LCD_S6E63M0 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
@@ -1388,7 +1539,11 @@ CONFIG_BACKLIGHT_MXS=y
 #
 # Display device support
 #
-# CONFIG_DISPLAY_SUPPORT is not set
+CONFIG_DISPLAY_SUPPORT=y
+
+#
+# Display hardware drivers
+#
 
 #
 # Console display driver support
@@ -1398,9 +1553,17 @@ 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 is not set
+CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
@@ -1453,7 +1616,7 @@ CONFIG_SND_SOC_MXS_SPDIF=y
 # CONFIG_SOUND_PRIME is not set
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
-# CONFIG_HIDRAW is not set
+CONFIG_HIDRAW=y
 
 #
 # USB Input Devices
@@ -1519,8 +1682,8 @@ CONFIG_USB_ARCH_HAS_HCD=y
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB=y
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+CONFIG_USB_DEBUG=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 
 #
 # Miscellaneous USB options
@@ -1550,7 +1713,7 @@ CONFIG_USB_EHCI_ARC_OTG=y
 # CONFIG_USB_EHCI_FSL_1504 is not set
 CONFIG_USB_EHCI_FSL_UTMI=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
@@ -1564,9 +1727,9 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
 #
 # USB Device Class drivers
 #
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_WDM is not set
+CONFIG_USB_ACM=y
+CONFIG_USB_PRINTER=y
+CONFIG_USB_WDM=y
 # CONFIG_USB_TMC is not set
 
 #
@@ -1625,8 +1788,8 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_ISIGHTFW is not set
 CONFIG_USB_GADGET=y
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_DEBUG_FILES=y
+CONFIG_USB_GADGET_DEBUG_FS=y
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_AT91 is not set
@@ -1662,14 +1825,16 @@ CONFIG_USB_ETH_RNDIS=y
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_FSL_UTP is not set
 # CONFIG_USB_FILE_STORAGE_TEST is not set
-# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_G_SERIAL=m
 # CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_G_PRINTER is not set
-# CONFIG_USB_CDC_COMPOSITE is not set
+CONFIG_USB_CDC_COMPOSITE=m
 # CONFIG_USB_G_NOKIA is not set
-# CONFIG_USB_G_MULTI is not set
-# CONFIG_USB_G_HID is not set
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_MULTI_RNDIS=y
+CONFIG_USB_G_MULTI_CDC=y
+CONFIG_USB_G_HID=m
 # CONFIG_USB_G_WEBCAM is not set
 
 #
@@ -1682,7 +1847,7 @@ CONFIG_USB_OTG_UTILS=y
 CONFIG_MXC_OTG=y
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_UNSAFE_RESUME=y
+# CONFIG_MMC_UNSAFE_RESUME is not set
 
 #
 # MMC/SD/SDIO Card Drivers
@@ -1696,7 +1861,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 # MMC/SD/SDIO Host Controller Drivers
 #
 # CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_SPI is not set
+CONFIG_MMC_SPI=m
 # CONFIG_MMC_IMX_ESDHCI_PIO_MODE is not set
 CONFIG_MMC_MXS=y
 # CONFIG_MEMSTICK is not set
@@ -1807,8 +1972,84 @@ CONFIG_DMADEVICES=y
 # CONFIG_MXC_PXP is not set
 # CONFIG_TIMB_DMA is not set
 # CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
-# CONFIG_STAGING is not set
+CONFIG_UIO=y
+CONFIG_UIO_PDRV=y
+CONFIG_UIO_PDRV_GENIRQ=y
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+# CONFIG_VIDEO_TM6000 is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+# CONFIG_OTUS is not set
+# CONFIG_RT2870 is not set
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_TRANZPORT is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_VT6656 is not set
+# CONFIG_FB_UDL is not set
+
+#
+# RAR Register Driver
+#
+CONFIG_IIO=m
+# CONFIG_IIO_RING_BUFFER is not set
+# CONFIG_IIO_TRIGGER is not set
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADIS16220 is not set
+# CONFIG_ADIS16240 is not set
+# CONFIG_KXSD9 is not set
+# CONFIG_LIS3L02DQ is not set
+
+#
+# Analog to digital convertors
+#
+# CONFIG_MAX1363 is not set
+
+#
+# Digital gyroscope sensors
+#
+# CONFIG_ADIS16260 is not set
+
+#
+# Inertial measurement units
+#
+# CONFIG_ADIS16300 is not set
+# CONFIG_ADIS16350 is not set
+# CONFIG_ADIS16400 is not set
+
+#
+# Light sensors
+#
+# CONFIG_SENSORS_TSL2563 is not set
+
+#
+# Triggers - standalone
+#
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_FB_SM7XX is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+# CONFIG_TI_ST is not set
+# CONFIG_ST_BT is not set
+# CONFIG_ADIS16255 is not set
+
+#
+# Android
+#
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_LOGGER=y
+CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 
 #
 # File systems
@@ -1823,9 +2064,15 @@ CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
-# CONFIG_EXT4_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_DEBUG=y
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
@@ -1866,7 +2113,7 @@ CONFIG_FAT_FS=y
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_NTFS_FS is not set
 
 #
@@ -1892,7 +2139,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_JFFS2_FS is not set
 CONFIG_UBIFS_FS=y
 # CONFIG_UBIFS_FS_XATTR is not set
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
 # CONFIG_UBIFS_FS_DEBUG is not set
@@ -1911,14 +2158,16 @@ 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_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
 CONFIG_ROOT_NFS=y
 # CONFIG_NFSD is not set
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
+CONFIG_SUNRPC_GSS=y
+CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_CEPH_FS is not set
@@ -1935,7 +2184,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_AMIGA_PARTITION is not set
 # CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
+# CONFIG_MAC_PARTITION is not set
 CONFIG_MSDOS_PARTITION=y
 CONFIG_BSD_DISKLABEL=y
 # CONFIG_MINIX_SUBPARTITION is not set
@@ -1953,7 +2202,7 @@ CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_850=y
 CONFIG_NLS_CODEPAGE_852=m
 CONFIG_NLS_CODEPAGE_855=m
 CONFIG_NLS_CODEPAGE_857=m
@@ -1974,7 +2223,7 @@ CONFIG_NLS_ISO8859_8=m
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS_CODEPAGE_1251=m
 CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_2=m
 CONFIG_NLS_ISO8859_3=m
 CONFIG_NLS_ISO8859_4=m
@@ -1994,8 +2243,8 @@ CONFIG_NLS_UTF8=m
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_STRIP_ASM_SYMS is not set
@@ -2003,11 +2252,8 @@ CONFIG_FRAME_WARN=1024
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_FRAME_POINTER=y
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_LKDTM is not set
 # CONFIG_LATENCYTOP is not set
@@ -2021,7 +2267,7 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_ARM_UNWIND is not set
+CONFIG_ARM_UNWIND=y
 # CONFIG_DEBUG_USER is not set
 # CONFIG_OC_ETM is not set
 
@@ -2163,17 +2409,13 @@ CONFIG_CRC16=y
 # CONFIG_CRC_T10DIF is not set
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
+CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
 CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_LZO=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-434-g3b4e013

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  3b4e0131fc8e8fc06036baab02c794a3fbfa2e52 (commit)
      from  7140c12a9ef59f9273d15c848bd088f984fc8393 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3b4e0131fc8e8fc06036baab02c794a3fbfa2e52
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Jul 5 17:49:09 2012 +0200

    [LINUX] apf28: activate AUART 1 & 4 on the expension connector - remove SSP2 that can be replaced by the SSP2 with its 3 chip select

-----------------------------------------------------------------------

Summary of changes:
 .../armadeus/apf28/apf28-linux-2.6.35.config       |   10 +-
 ...1-armadeus-add_apf28dev_baseboard_support.patch |   80 +++++++++++--------
 2 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
index 7206406..83f7baa 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.35.3
-# Wed Jun 13 00:36:04 2012
+# Thu Jul  5 17:40:52 2012
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -275,14 +275,14 @@ CONFIG_MXS_AUART_DMA_SUPPORT=y
 CONFIG_MXS_AUART_PORTS=5
 CONFIG_MXS_AUART0_DEVICE_ENABLE=y
 CONFIG_MXS_AUART0_DMA_ENABLE=y
-# CONFIG_MXS_AUART1_DEVICE_ENABLE is not set
-# CONFIG_MXS_AUART1_DMA_ENABLE is not set
+CONFIG_MXS_AUART1_DEVICE_ENABLE=y
+CONFIG_MXS_AUART1_DMA_ENABLE=y
 CONFIG_MXS_AUART2_DEVICE_ENABLE=y
 CONFIG_MXS_AUART2_DMA_ENABLE=y
 CONFIG_MXS_AUART3_DEVICE_ENABLE=y
 CONFIG_MXS_AUART3_DMA_ENABLE=y
-# CONFIG_MXS_AUART4_DEVICE_ENABLE is not set
-# CONFIG_MXS_AUART4_DMA_ENABLE is not set
+CONFIG_MXS_AUART4_DEVICE_ENABLE=y
+CONFIG_MXS_AUART4_DMA_ENABLE=y
 CONFIG_MXS_RAM_FREQ_SCALING=y
 # CONFIG_MXS_RAM_MDDR is not set
 # CONFIG_MXS_RAM_DDR is not set
diff --git a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
index 9ce73f6..aa81eea 100644
--- a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -45,7 +45,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
 ===================================================================
 --- /dev/null
 +++ linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
-@@ -0,0 +1,859 @@
+@@ -0,0 +1,871 @@
 +/*
 + * Copyright (C) 2012 Armadeus systems
 + *
@@ -380,6 +380,28 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
 +		.fun		= PIN_FUN1,
 +	},
 +#endif
++#ifdef CONFIG_MXS_AUART1_DEVICE_ENABLE
++	{
++		.name		= "AUART1.RX",
++		.id		= PINID_AUART1_RX,
++		.fun		= PIN_FUN1,
++		},
++	{
++		.name		= "AUART1.TX",
++		.id		= PINID_AUART1_TX,
++		.fun		= PIN_FUN1,
++	},
++	{
++		.name		= "AUART1.CTS",
++		.id		= PINID_AUART1_CTS,
++		.fun		= PIN_FUN1,
++		},
++	{
++		.name		= "AUART1.RTS",
++		.id		= PINID_AUART1_RTS,
++		.fun		= PIN_FUN1,
++	},
++#endif
 +#ifdef CONFIG_MXS_AUART2_DEVICE_ENABLE
 +	{
 +		.name		= "AUART2.RX",
@@ -424,6 +446,28 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
 +		.fun		= PIN_FUN1,
 +	},
 +#endif
++#ifdef CONFIG_MXS_AUART4_DEVICE_ENABLE
++	{
++		.name		= "AUART4.RX",
++		.id		= PINID_SSP3_MOSI,
++		.fun		= PIN_FUN2,
++	},
++	{
++		.name		= "AUART4.TX",
++		.id		= PINID_SSP3_SCK,
++		.fun		= PIN_FUN2,
++	},
++	{
++		.name		= "AUART4.CTS",
++		.id		= PINID_SSP3_SS0,
++		.fun		= PIN_FUN2,
++	},
++	{
++		.name		= "AUART4.RTS",
++		.id		= PINID_SSP3_MISO,
++		.fun		= PIN_FUN2,
++	},
++#endif
 +#if defined(CONFIG_CAN_FLEXCAN) || defined(CONFIG_CAN_FLEXCAN_MODULE)
 +	{
 +		.name		= "CAN0_TX",
@@ -510,7 +554,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
 +	{
 +		.name		= "SAIF0_BITCLK",
 +		.id		= PINID_SAIF0_BITCLK,
-+		.fun		= PIN_FUN3,
++		.fun		= PIN_FUN1,
 +		.strength	= PAD_4MA,
 +		.voltage	= PAD_3_3V,
 +		.pullup		= 1,
@@ -686,38 +730,6 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
 +		.voltage	= PAD_3_3V,
 +		.drive		= 1,
 +	},
-+	{
-+		.name		= "SSP3 MOSI",
-+		.id		= PINID_SSP3_MOSI,
-+		.fun		= PIN_FUN1,
-+		.strength	= PAD_4MA,
-+		.voltage	= PAD_3_3V,
-+		.drive		= 1,
-+	},
-+	{
-+		.name		= "SSP3 MISO",
-+		.id		= PINID_SSP3_MISO,
-+		.fun		= PIN_FUN1,
-+		.strength	= PAD_4MA,
-+		.voltage	= PAD_3_3V,
-+		.drive		= 1,
-+	},
-+	{
-+		.name		= "SSP3 SCK",
-+		.id		= PINID_SSP3_SCK,
-+		.fun		= PIN_FUN1,
-+		.strength	= PAD_4MA,
-+		.voltage	= PAD_3_3V,
-+		.drive		= 1,
-+	},
-+	{
-+		.name		= "SSP3 SS0",
-+		.id		= PINID_SSP3_SS0,
-+		.fun		= PIN_FUN1,
-+		.strength	= PAD_4MA,
-+		.voltage	= PAD_3_3V,
-+		.drive		= 1,
-+	},
 +#endif
 +};
 +


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-433-g7140c12

[Gwenhael Goavec-M. <gwe...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  7140c12a9ef59f9273d15c848bd088f984fc8393 (commit)
       via  fe128828e0a4678f1e64348cfe14cd216aed2d69 (commit)
      from  a6002d16be8fb445655f03ff789edd5374d90df5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7140c12a9ef59f9273d15c848bd088f984fc8393
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sat Jun 30 15:05:03 2012 +0200

    [LINUX][APF28] 3.4.2: Declares apf28_dev_init as external function in apf28.c

commit fe128828e0a4678f1e64348cfe14cd216aed2d69
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sat Jun 30 14:55:24 2012 +0200

    [LINUX][APF28] 3.4.2: Adds i2c0 registration and configuration of the related pins

-----------------------------------------------------------------------

Summary of changes:
 ...1-armadeus-add_apf28dev_baseboard_support.patch |   36 ++++++++++++-------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
index 0d062e7..bcb8330 100644
--- a/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
 
 Index: linux-3.4.2/arch/arm/mach-mxs/Kconfig
 ===================================================================
---- linux-3.4.2.orig/arch/arm/mach-mxs/Kconfig	2012-06-22 21:47:40.000000000 +0200
-+++ linux-3.4.2/arch/arm/mach-mxs/Kconfig	2012-06-22 21:47:48.000000000 +0200
-@@ -116,4 +116,21 @@
+--- linux-3.4.2.orig/arch/arm/mach-mxs/Kconfig
++++ linux-3.4.2/arch/arm/mach-mxs/Kconfig
+@@ -116,4 +116,21 @@ config MACH_APF28
  	  Include support for the Armadeus systems APF28 SOM. This includes
  	  specific configurations for the module and its peripherals.
  
@@ -30,9 +30,9 @@ Index: linux-3.4.2/arch/arm/mach-mxs/Kconfig
  endif
 Index: linux-3.4.2/arch/arm/mach-mxs/Makefile
 ===================================================================
---- linux-3.4.2.orig/arch/arm/mach-mxs/Makefile	2012-06-22 21:47:40.000000000 +0200
-+++ linux-3.4.2/arch/arm/mach-mxs/Makefile	2012-06-22 21:47:48.000000000 +0200
-@@ -15,5 +15,6 @@
+--- linux-3.4.2.orig/arch/arm/mach-mxs/Makefile
++++ linux-3.4.2/arch/arm/mach-mxs/Makefile
+@@ -15,5 +15,6 @@ obj-$(CONFIG_MACH_APX4DEVKIT) += mach-ap
  obj-$(CONFIG_MODULE_TX28) += module-tx28.o
  obj-$(CONFIG_MACH_TX28)    += mach-tx28.o
  obj-$(CONFIG_MACH_APF28)	+= mach-apf28.o
@@ -41,9 +41,9 @@ Index: linux-3.4.2/arch/arm/mach-mxs/Makefile
  obj-y += devices/
 Index: linux-3.4.2/arch/arm/mach-mxs/apf28dev-baseboard.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.2/arch/arm/mach-mxs/apf28dev-baseboard.c	2012-06-22 21:47:48.000000000 +0200
-@@ -0,0 +1,201 @@
+--- /dev/null
++++ linux-3.4.2/arch/arm/mach-mxs/apf28dev-baseboard.c
+@@ -0,0 +1,209 @@
 +/*
 + * Copyright 2011 Armadeus systems.
 + *
@@ -170,6 +170,12 @@ Index: linux-3.4.2/arch/arm/mach-mxs/apf28dev-baseboard.c
 +	MX28_PAD_GPMI_RDY1__GPIO_0_21 | MXS_PAD_CTRL,
 +	/* User button */
 +	MX28_PAD_GPMI_RDY2__GPIO_0_22 | MXS_PAD_CTRL,
++
++	/* I2C0 */
++	MX28_PAD_I2C0_SCL__I2C0_SCL |
++		(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP),
++	MX28_PAD_I2C0_SDA__I2C0_SDA |
++		(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP),
 +};
 +
 +/* fec */
@@ -243,13 +249,15 @@ Index: linux-3.4.2/arch/arm/mach-mxs/apf28dev-baseboard.c
 +	mx28_add_mxsfb(&apf28dev_mxsfb_pdata);
 +
 +	mx28_add_mxs_mmc(0, &apf28dev_mmc0_pdata);
++
++	mx28_add_mxs_i2c(0);
 +}
 +EXPORT_SYMBOL_GPL(apf28dev_init);
 Index: linux-3.4.2/arch/arm/mach-mxs/mach-apf28.c
 ===================================================================
---- linux-3.4.2.orig/arch/arm/mach-mxs/mach-apf28.c	2012-06-22 21:47:40.000000000 +0200
-+++ linux-3.4.2/arch/arm/mach-mxs/mach-apf28.c	2012-06-22 21:47:48.000000000 +0200
-@@ -78,6 +78,17 @@
+--- linux-3.4.2.orig/arch/arm/mach-mxs/mach-apf28.c
++++ linux-3.4.2/arch/arm/mach-mxs/mach-apf28.c
+@@ -78,6 +78,19 @@ static struct fec_platform_data mx28_fec
  	.phy = PHY_INTERFACE_MODE_RMII,
  };
  
@@ -264,10 +272,12 @@ Index: linux-3.4.2/arch/arm/mach-mxs/mach-apf28.c
 +}
 +__setup("baseboard=", apf28_get_baseboard);
 +
++extern void __init apf28dev_init(void);
++
  static void __init apf28_init(void)
  {
  	mxs_iomux_setup_multiple_pads(apf28_pads, ARRAY_SIZE(apf28_pads));
-@@ -86,6 +97,12 @@
+@@ -86,6 +99,12 @@ static void __init apf28_init(void)
  
  	apf28_fec_reset();
  	mx28_add_fec(0, &mx28_fec0_pdata);


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-431-ga6002d1

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  a6002d16be8fb445655f03ff789edd5374d90df5 (commit)
      from  bd89ce3df07ead11f920a8d24beb6eb0f4d309c6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a6002d16be8fb445655f03ff789edd5374d90df5
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Jun 29 16:13:36 2012 +0200

    [LINUX] apf27: Enable NAND and imx features to be compatible with U-Boot behavior

-----------------------------------------------------------------------

Summary of changes:
 ...d-device-tree-file-for-the-armadeus-apf27.patch |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/patches/linux/3.5/0003-Add-device-tree-file-for-the-armadeus-apf27.patch b/patches/linux/3.5/0003-Add-device-tree-file-for-the-armadeus-apf27.patch
index b0b6fb8..3f87a27 100644
--- a/patches/linux/3.5/0003-Add-device-tree-file-for-the-armadeus-apf27.patch
+++ b/patches/linux/3.5/0003-Add-device-tree-file-for-the-armadeus-apf27.patch
@@ -4,6 +4,7 @@ Date: Thu, 28 Jun 2012 20:16:05 +0200
 Subject: [PATCH 3/3] Add device tree file for the armadeus apf27
 
 Signed-off-by: Philippe Reynes <tr...@ya...>
+Signed-off-by: Eric Jarrige <eri...@ar...>
 ---
  arch/arm/boot/dts/imx27-apf27.dts |   89 +++++++++++++++++++++++++++++++++++++
  1 files changed, 89 insertions(+), 0 deletions(-)
@@ -14,7 +15,7 @@ new file mode 100644
 index 0000000..d0d0793
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx27-apf27.dts
-@@ -0,0 +1,89 @@
+@@ -0,0 +1,91 @@
 +/*
 + * Copyright 2012 Philippe Reynes <tr...@ya...>
 + *
@@ -67,9 +68,11 @@ index 0000000..d0d0793
 +
 +		};
 +
-+       	nand@d8000000 {
++		nand@d8000000 {
 +			status = "okay";
 +			nand-bus-width = <16>;
++			nand-ecc-mode = "hw";
++			nand-on-flash-bbt;
 +
 +			partition@0 {
 +				label = "u-boot";
@@ -99,7 +102,7 @@ index 0000000..d0d0793
 +				label = "rootfs";
 +				reg = <0x800000 0xf800000>;
 +			};
-+  		};
++		};
 +
 +	};
 +


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-430-gbd89ce3

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  bd89ce3df07ead11f920a8d24beb6eb0f4d309c6 (commit)
       via  250df8d4bfe23279fe7adc4b5403e94c3e46dcb9 (commit)
       via  0a0e584669f79347716b9ea131a96bec7a6c8e5b (commit)
      from  a87b61328422aee58a495ca158e6836968772645 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bd89ce3df07ead11f920a8d24beb6eb0f4d309c6
Author: Philippe Reynes <tr...@ya...>
Date:   Thu Jun 28 22:30:40 2012 +0200

    Add config for the kernel 3.5-rc4
    
    Signed-off-by: Philippe Reynes <tr...@ya...>

commit 250df8d4bfe23279fe7adc4b5403e94c3e46dcb9
Author: Philippe Reynes <tr...@ya...>
Date:   Thu Jun 28 22:30:39 2012 +0200

    Add dts for the armadeus apf27
    
    Signed-off-by: Philippe Reynes <tr...@ya...>

commit 0a0e584669f79347716b9ea131a96bec7a6c8e5b
Author: Philippe Reynes <tr...@ya...>
Date:   Thu Jun 28 22:30:38 2012 +0200

    Add a patch to fix the nand platform on kernel 3.5-rc4
    
    Signed-off-by: Philippe Reynes <tr...@ya...>

-----------------------------------------------------------------------

Summary of changes:
 .../armadeus/apf27/apf27-linux-3.5-rc4.config      |  132 ++++++++++++++++++++
 ...002-Add-nand-platform-on-imx27-devicetree.patch |   25 ++++
 ...d-device-tree-file-for-the-armadeus-apf27.patch |  109 ++++++++++++++++
 3 files changed, 266 insertions(+), 0 deletions(-)
 create mode 100644 buildroot/target/device/armadeus/apf27/apf27-linux-3.5-rc4.config
 create mode 100644 patches/linux/3.5/0002-Add-nand-platform-on-imx27-devicetree.patch
 create mode 100644 patches/linux/3.5/0003-Add-device-tree-file-for-the-armadeus-apf27.patch

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.5-rc4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.5-rc4.config
new file mode 100644
index 0000000..ef43bc3
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.5-rc4.config
@@ -0,0 +1,132 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_CGROUPS=y
+CONFIG_EXPERT=y
+CONFIG_PERF_EVENTS=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARCH_MXC=y
+CONFIG_ARCH_IMX_V4_V5=y
+CONFIG_MACH_IMX27_DT=y
+CONFIG_MXC_IRQ_PRIOR=y
+CONFIG_MXC_DEBUG_BOARD=y
+CONFIG_PREEMPT=y
+CONFIG_AEABI=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_FPE_NWFPE=y
+CONFIG_FPE_NWFPE_XP=y
+CONFIG_PM_DEBUG=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_WIRELESS is not set
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
+# CONFIG_MTD_CFI_I2 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_MXC=y
+CONFIG_MTD_UBI=y
+CONFIG_EEPROM_AT24=y
+CONFIG_EEPROM_AT25=y
+CONFIG_NETDEVICES=y
+CONFIG_CS89x0=y
+CONFIG_CS89x0_PLATFORM=y
+CONFIG_DM9000=y
+CONFIG_SMC91X=y
+CONFIG_SMC911X=y
+CONFIG_SMSC911X=y
+# CONFIG_WLAN is not set
+# CONFIG_INPUT_MOUSEDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=m
+# CONFIG_SERIO is not set
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_IMX=y
+CONFIG_SPI=y
+CONFIG_SPI_IMX=y
+CONFIG_SPI_SPIDEV=y
+CONFIG_W1=y
+CONFIG_W1_MASTER_MXC=y
+CONFIG_W1_SLAVE_THERM=y
+CONFIG_WATCHDOG=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_FB=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_LCD_L4F00242T03=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_LOGO=y
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_PCF8563=y
+CONFIG_DMADEVICES=y
+CONFIG_IMX_SDMA=y
+CONFIG_IMX_DMA=y
+# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_EXT2_FS=y
+# CONFIG_DNOTIFY is not set
+# CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_TMPFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_UBIFS_FS=y
+CONFIG_NFS_FS=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS=y
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_15=m
+CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_FS=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_DEBUG_PREEMPT is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_FTRACE is not set
+CONFIG_DEBUG_LL=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/patches/linux/3.5/0002-Add-nand-platform-on-imx27-devicetree.patch b/patches/linux/3.5/0002-Add-nand-platform-on-imx27-devicetree.patch
new file mode 100644
index 0000000..966062d
--- /dev/null
+++ b/patches/linux/3.5/0002-Add-nand-platform-on-imx27-devicetree.patch
@@ -0,0 +1,25 @@
+From 0306902e25b823ecb9166f2b6360509333d08923 Mon Sep 17 00:00:00 2001
+From: Philippe Reynes <tr...@ya...>
+Date: Thu, 28 Jun 2012 20:24:38 +0200
+Subject: [PATCH 2/3] Add nand platform on imx27 devicetree
+
+Signed-off-by: Philippe Reynes <tr...@ya...>
+---
+ arch/arm/mach-imx/Kconfig |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
+index eff4db5..565422b 100644
+--- a/arch/arm/mach-imx/Kconfig
++++ b/arch/arm/mach-imx/Kconfig
+@@ -381,6 +381,7 @@ config MACH_IMX27_DT
+ 	bool "Support i.MX27 platforms from device tree"
+ 	select SOC_IMX27
+ 	select USE_OF
++	select IMX_HAVE_PLATFORM_MXC_NAND
+ 	help
+ 	  Include support for Freescale i.MX27 based platforms
+ 	  using the device tree for discovery
+-- 
+1.7.1
+
diff --git a/patches/linux/3.5/0003-Add-device-tree-file-for-the-armadeus-apf27.patch b/patches/linux/3.5/0003-Add-device-tree-file-for-the-armadeus-apf27.patch
new file mode 100644
index 0000000..b0b6fb8
--- /dev/null
+++ b/patches/linux/3.5/0003-Add-device-tree-file-for-the-armadeus-apf27.patch
@@ -0,0 +1,109 @@
+From 3268e6cafbdd935d42ace97328b2e8c4b2250c4b Mon Sep 17 00:00:00 2001
+From: Philippe Reynes <tr...@ya...>
+Date: Thu, 28 Jun 2012 20:16:05 +0200
+Subject: [PATCH 3/3] Add device tree file for the armadeus apf27
+
+Signed-off-by: Philippe Reynes <tr...@ya...>
+---
+ arch/arm/boot/dts/imx27-apf27.dts |   89 +++++++++++++++++++++++++++++++++++++
+ 1 files changed, 89 insertions(+), 0 deletions(-)
+ create mode 100644 arch/arm/boot/dts/imx27-apf27.dts
+
+diff --git a/arch/arm/boot/dts/imx27-apf27.dts b/arch/arm/boot/dts/imx27-apf27.dts
+new file mode 100644
+index 0000000..d0d0793
+--- /dev/null
++++ b/arch/arm/boot/dts/imx27-apf27.dts
+@@ -0,0 +1,89 @@
++/*
++ * Copyright 2012 Philippe Reynes <tr...@ya...>
++ *
++ * Based on imx27-phytec-phycore.dts
++ * Copyright 2012 Sascha Hauer, Pengutronix
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/dts-v1/;
++/include/ "imx27.dtsi"
++
++/ {
++	model = "Armadeus apf27";
++	compatible = "armadeus,imx27-apf27", "fsl,imx27";
++
++	memory {
++		reg = <0xa0000000 0x04000000>;
++	};
++
++	clocks {
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		osc26m {
++			compatible = "fsl,imx-osc26m", "fixed-clock";
++			clock-frequency = <33554432>;
++		};
++	};
++
++	soc {
++		aipi@10000000 { /* aipi */
++
++			wdog@10002000 {
++				status = "okay";
++			};
++
++			serial@1000a000 {
++				status = "okay";
++			};
++
++			ethernet@1002b000 {
++				status = "okay";
++			};
++
++		};
++
++       	nand@d8000000 {
++			status = "okay";
++			nand-bus-width = <16>;
++
++			partition@0 {
++				label = "u-boot";
++				reg = <0x0 0x100000>;
++			};
++			partition@100000 {
++				label = "env";
++				reg = <0x100000 0x80000>;
++			};
++			partition@180000 {
++				label = "env2";
++				reg = <0x180000 0x80000>;
++			};
++			partition@200000 {
++				label = "firmware";
++				reg = <0x200000 0x80000>;
++			};
++			partition@280000 {
++				label = "dtb";
++				reg = <0x280000 0x80000>;
++			};
++			partition@300000 {
++				label = "kernel";
++				reg = <0x300000 0x500000>;
++			};
++			partition@800000 {
++				label = "rootfs";
++				reg = <0x800000 0xf800000>;
++			};
++  		};
++
++	};
++
++};
+-- 
+1.7.1
+


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-427-ga87b613

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  a87b61328422aee58a495ca158e6836968772645 (commit)
       via  c20c2203868a076cd79a165960965b88475b2e20 (commit)
      from  9598699e959a1d9531bedbe7b8f6710112a2335d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a87b61328422aee58a495ca158e6836968772645
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Jun 29 11:22:30 2012 +0200

    [LINUX] apf27: fix the nand driver on 3.5-rc4

commit c20c2203868a076cd79a165960965b88475b2e20
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Jun 29 11:05:35 2012 +0200

    [LINUX] start development of kernel 3.5x patches

-----------------------------------------------------------------------

Summary of changes:
 patches/linux/3.5-rc4                              |    1 +
 ...001-mtd-mxc_nand-use-32bit-copy-functions.patch |  122 ++++++++++++++++++++
 2 files changed, 123 insertions(+), 0 deletions(-)
 create mode 120000 patches/linux/3.5-rc4
 create mode 100644 patches/linux/3.5/0001-mtd-mxc_nand-use-32bit-copy-functions.patch

diff --git a/patches/linux/3.5-rc4 b/patches/linux/3.5-rc4
new file mode 120000
index 0000000..56e972a
--- /dev/null
+++ b/patches/linux/3.5-rc4
@@ -0,0 +1 @@
+3.5
\ No newline at end of file
diff --git a/patches/linux/3.5/0001-mtd-mxc_nand-use-32bit-copy-functions.patch b/patches/linux/3.5/0001-mtd-mxc_nand-use-32bit-copy-functions.patch
new file mode 100644
index 0000000..a30b1b6
--- /dev/null
+++ b/patches/linux/3.5/0001-mtd-mxc_nand-use-32bit-copy-functions.patch
@@ -0,0 +1,122 @@
+From 065af3d5c54df784b8262817d530c9341d84f2d6 Mon Sep 17 00:00:00 2001
+From: Sascha Hauer <s....@pe...>
+Date: Tue, 29 May 2012 10:16:09 +0200
+Subject: [PATCH 1/3] mtd mxc_nand: use 32bit copy functions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The following commit changes the function used to copy from/to
+the hardware buffer to memcpy_[from|to]io. This does not work
+since the hardware cannot handle the byte accesses used by these
+functions. Instead of reverting this patch introduce 32bit
+correspondents of these functions.
+
+| commit 5775ba36ea9c760c2d7e697dac04f2f7fc95aa62
+| Author: Uwe Kleine-König <u.k...@pe...>
+| Date:   Tue Apr 24 10:05:22 2012 +0200
+|
+|    mtd: mxc_nand: fix several sparse warnings about incorrect address space
+|
+|     Signed-off-by: Uwe Kleine-König <u.k...@pe...>
+|     Signed-off-by: Artem Bityutskiy <art...@li...>
+
+Signed-off-by: Sascha Hauer <s....@pe...>
+Cc: Uwe Kleine-König <u.k...@pe...>
+tested-by: Philippe Reynes <tr...@ya...>
+---
+ drivers/mtd/nand/mxc_nand.c |   37 +++++++++++++++++++++++++++++--------
+ 1 files changed, 29 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
+index c58e6a9..6acc790 100644
+--- a/drivers/mtd/nand/mxc_nand.c
++++ b/drivers/mtd/nand/mxc_nand.c
+@@ -273,6 +273,26 @@ static struct nand_ecclayout nandv2_hw_eccoob_4k = {
+ 
+ static const char *part_probes[] = { "RedBoot", "cmdlinepart", "ofpart", NULL };
+ 
++static void memcpy32_fromio(void *trg, const void __iomem  *src, size_t size)
++{
++	int i;
++	u32 *t = trg;
++	const __iomem u32 *s = src;
++
++	for (i = 0; i < (size >> 2); i++)
++		*t++ = __raw_readl(s++);
++}
++
++static void memcpy32_toio(void __iomem *trg, const void *src, int size)
++{
++	int i;
++	u32 __iomem *t = trg;
++	const u32 *s = src;
++
++	for (i = 0; i < (size >> 2); i++)
++		__raw_writel(*s++, t++);
++}
++
+ static int check_int_v3(struct mxc_nand_host *host)
+ {
+ 	uint32_t tmp;
+@@ -519,7 +539,7 @@ static void send_read_id_v3(struct mxc_nand_host *host)
+ 
+ 	wait_op_done(host, true);
+ 
+-	memcpy_fromio(host->data_buf, host->main_area0, 16);
++	memcpy32_fromio(host->data_buf, host->main_area0, 16);
+ }
+ 
+ /* Request the NANDFC to perform a read of the NAND device ID. */
+@@ -535,7 +555,7 @@ static void send_read_id_v1_v2(struct mxc_nand_host *host)
+ 	/* Wait for operation to complete */
+ 	wait_op_done(host, true);
+ 
+-	memcpy_fromio(host->data_buf, host->main_area0, 16);
++	memcpy32_fromio(host->data_buf, host->main_area0, 16);
+ 
+ 	if (this->options & NAND_BUSWIDTH_16) {
+ 		/* compress the ID info */
+@@ -797,16 +817,16 @@ static void copy_spare(struct mtd_info *mtd, bool bfrom)
+ 
+ 	if (bfrom) {
+ 		for (i = 0; i < n - 1; i++)
+-			memcpy_fromio(d + i * j, s + i * t, j);
++			memcpy32_fromio(d + i * j, s + i * t, j);
+ 
+ 		/* the last section */
+-		memcpy_fromio(d + i * j, s + i * t, mtd->oobsize - i * j);
++		memcpy32_fromio(d + i * j, s + i * t, mtd->oobsize - i * j);
+ 	} else {
+ 		for (i = 0; i < n - 1; i++)
+-			memcpy_toio(&s[i * t], &d[i * j], j);
++			memcpy32_toio(&s[i * t], &d[i * j], j);
+ 
+ 		/* the last section */
+-		memcpy_toio(&s[i * t], &d[i * j], mtd->oobsize - i * j);
++		memcpy32_toio(&s[i * t], &d[i * j], mtd->oobsize - i * j);
+ 	}
+ }
+ 
+@@ -1070,7 +1090,8 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
+ 
+ 		host->devtype_data->send_page(mtd, NFC_OUTPUT);
+ 
+-		memcpy_fromio(host->data_buf, host->main_area0, mtd->writesize);
++		memcpy32_fromio(host->data_buf, host->main_area0,
++				mtd->writesize);
+ 		copy_spare(mtd, true);
+ 		break;
+ 
+@@ -1086,7 +1107,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
+ 		break;
+ 
+ 	case NAND_CMD_PAGEPROG:
+-		memcpy_toio(host->main_area0, host->data_buf, mtd->writesize);
++		memcpy32_toio(host->main_area0, host->data_buf, mtd->writesize);
+ 		copy_spare(mtd, false);
+ 		host->devtype_data->send_page(mtd, NFC_INPUT);
+ 		host->devtype_data->send_cmd(host, command, true);
+-- 
+1.7.1
+


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-425-g9598699

[jscheer <js...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  9598699e959a1d9531bedbe7b8f6710112a2335d (commit)
      from  cf135893b8af8d14bcb8fb2f8a45823b864b0577 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9598699e959a1d9531bedbe7b8f6710112a2335d
Author: Jeremie Scheer <jer...@ar...>
Date:   Tue Jun 26 18:24:35 2012 +0200

    [DEMOS] Update custom QMakeSpec in ApfDacClientServer demos and use it in build.sh.
    [DEMOS] Fix includes in ApfDacClientServer demos (ApfServerMain).

-----------------------------------------------------------------------

Summary of changes:
 .../QtopiaMkspec/linux-arm-g++/qplatformdefs.h     |  118 ++++++++------------
 .../src/Server/ApfServerMain.cpp                   |    2 +
 software/demos/ApfDacClientServer/src/build.sh     |    2 +-
 3 files changed, 52 insertions(+), 70 deletions(-)

diff --git a/software/demos/ApfDacClientServer/QtopiaMkspec/linux-arm-g++/qplatformdefs.h b/software/demos/ApfDacClientServer/QtopiaMkspec/linux-arm-g++/qplatformdefs.h
index 87d4ae2..07cab1d 100644
--- a/software/demos/ApfDacClientServer/QtopiaMkspec/linux-arm-g++/qplatformdefs.h
+++ b/software/demos/ApfDacClientServer/QtopiaMkspec/linux-arm-g++/qplatformdefs.h
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt...@no...)
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #ifndef QPLATFORMDEFS_H
 #define QPLATFORMDEFS_H
 
@@ -19,14 +60,13 @@
 
 // We are hot - unistd.h should have turned on the specific APIs we requested
 
-
+#include <features.h>
 #include <pthread.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <grp.h>
 #include <pwd.h>
 #include <signal.h>
-#include <dlfcn.h>
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -37,78 +77,19 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
-
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_STATBUF              struct stat64
-#define QT_STATBUF4TSTAT        struct stat64
-#define QT_STAT                 ::stat64
-#define QT_FSTAT                ::fstat64
-#define QT_LSTAT                ::lstat64
-#define QT_OPEN                 ::open64
-#define QT_TRUNCATE             ::truncate64
-#define QT_FTRUNCATE            ::ftruncate64
-#define QT_LSEEK                ::lseek64
-#else
-#define QT_STATBUF              struct stat
-#define QT_STATBUF4TSTAT        struct stat
-#define QT_STAT                 ::stat
-#define QT_FSTAT                ::fstat
-#define QT_LSTAT                ::lstat
-#define QT_OPEN                 ::open
-#define QT_TRUNCATE             ::truncate
-#define QT_FTRUNCATE            ::ftruncate
-#define QT_LSEEK                ::lseek
+#ifndef QT_NO_IPV6IFNAME
+#include <net/if.h>
 #endif
 
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_FOPEN                ::fopen64
-#define QT_FSEEK                ::fseeko
-#define QT_FTELL                ::ftello
-#define QT_FGETPOS              ::fgetpos64
-#define QT_FSETPOS              ::fsetpos64
-#define QT_FPOS_T               fpos64_t
-#define QT_OFF_T                off_t
-#else
-#define QT_FOPEN                ::fopen
-#define QT_FSEEK                ::fseek
-#define QT_FTELL                ::ftell
-#define QT_FGETPOS              ::fgetpos
-#define QT_FSETPOS              ::fsetpos
-#define QT_FPOS_T               fpos_t
-#define QT_OFF_T                long
-#endif
+#define QT_USE_XOPEN_LFS_EXTENSIONS
+#include "../common/posix/qplatformdefs.h"
 
-#define QT_STAT_REG		S_IFREG
-#define QT_STAT_DIR		S_IFDIR
-#define QT_STAT_MASK		S_IFMT
-#define QT_STAT_LNK		S_IFLNK
-#define QT_SOCKET_CONNECT	::connect
-#define QT_SOCKET_BIND		::bind
-#define QT_SOCKET_BIND		::bind
-#define QT_FILENO		fileno
-#define QT_CLOSE		::close
-#define QT_READ			::read
-#define QT_WRITE		::write
-#define QT_ACCESS		::access
-#define QT_GETCWD		::getcwd
-#define QT_CHDIR		::chdir
-#define QT_MKDIR		::mkdir
-#define QT_RMDIR		::rmdir
-#define QT_OPEN_RDONLY		O_RDONLY
-#define QT_OPEN_WRONLY		O_WRONLY
-#define QT_OPEN_RDWR		O_RDWR
-#define QT_OPEN_CREAT		O_CREAT
-#define QT_OPEN_TRUNC		O_TRUNC
-#define QT_OPEN_APPEND		O_APPEND
-
-#define QT_SIGNAL_RETTYPE	void
-#define QT_SIGNAL_ARGS		int
-#define QT_SIGNAL_IGNORE	SIG_IGN
+#undef QT_SOCKLEN_T
 
 #if defined(__GLIBC__) && (__GLIBC__ >= 2)
-#define QT_SOCKLEN_T		socklen_t
+#define QT_SOCKLEN_T            socklen_t
 #else
-#define QT_SOCKLEN_T		int
+#define QT_SOCKLEN_T            int
 #endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
@@ -116,5 +97,4 @@
 #define QT_VSNPRINTF		::vsnprintf
 #endif
 
-
 #endif // QPLATFORMDEFS_H
diff --git a/software/demos/ApfDacClientServer/src/Server/ApfServerMain.cpp b/software/demos/ApfDacClientServer/src/Server/ApfServerMain.cpp
index 44cbf1e..e79f0f6 100755
--- a/software/demos/ApfDacClientServer/src/Server/ApfServerMain.cpp
+++ b/software/demos/ApfDacClientServer/src/Server/ApfServerMain.cpp
@@ -23,7 +23,9 @@
 */
 
 
+
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/software/demos/ApfDacClientServer/src/build.sh b/software/demos/ApfDacClientServer/src/build.sh
index 70ca5d3..124fc65 100755
--- a/software/demos/ApfDacClientServer/src/build.sh
+++ b/software/demos/ApfDacClientServer/src/build.sh
@@ -88,7 +88,7 @@ export OUTPUT_DIR=../../bin/apf
 #export QTDIR=$ARMADEUS_ROOTFS_DIR/qt/qtopia.4.2.0/
 export QTDIR=$ARMADEUS_QTE_DIR
 ## due to some installation problems.... I use a custom qmake spec
-export QMAKESPEC=$ARMADEUS_QTE_DIR/mkspecs/qws/linux-arm-g++
+export QMAKESPEC=../../QtopiaMkspec/linux-arm-g++
 export PATH=$ARMADEUS_TOOLCHAIN_PATH:$QTDIR/bin:$INITIALPATH
 
 buildForEnvironment "APF board" $1


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-424-gcf13589

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  cf135893b8af8d14bcb8fb2f8a45823b864b0577 (commit)
      from  7fca8b9e7544ff0c73fa9244e0e9e9bc446db7d2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cf135893b8af8d14bcb8fb2f8a45823b864b0577
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Jun 26 18:04:00 2012 +0200

    [LINUX] 3.4: Fixes APF28Dev initialization call

-----------------------------------------------------------------------

Summary of changes:
 ...1-armadeus-add_apf28dev_baseboard_support.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
index b6c905c..0d062e7 100644
--- a/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -273,7 +273,7 @@ Index: linux-3.4.2/arch/arm/mach-mxs/mach-apf28.c
  	mx28_add_fec(0, &mx28_fec0_pdata);
 +
 +	printk("--- APF28 baseboard: (%s)\n", apf28_baseboard);
-+#ifdef CONFIG_APF28_DEV
++#ifdef CONFIG_MACH_APF28_DEV
 +	if (!strcmp(apf28_baseboard, "apf28dev"))
 +               apf28dev_init();
 +#endif


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-423-g7fca8b9

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  7fca8b9e7544ff0c73fa9244e0e9e9bc446db7d2 (commit)
      from  248a99404d5029b9d8d82776d8e4dbde47c57e29 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7fca8b9e7544ff0c73fa9244e0e9e9bc446db7d2
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Jun 26 13:49:12 2012 +0200

    [UBOOT] apf51: fix typo / checkpatch

-----------------------------------------------------------------------

Summary of changes:
 .../device/armadeus/apf51/apf51-u-boot-2012.04.h   |   66 ++++----
 patches/u-boot/2012.04/400-imx51.patch             |    7 +-
 patches/u-boot/2012.04/401-apf51.patch             |   87 ++++++------
 .../u-boot/2012.04/405-remove_extra_printk.patch   |   10 +-
 patches/u-boot/2012.04/407-imx51-nand.patch        |  158 ++++++++++---------
 5 files changed, 170 insertions(+), 158 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
index 6b9d2ed..5fe195a 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
@@ -24,7 +24,7 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"1.2"
+#define CONFIG_ENV_VERSION	"1.2"
 #define CONFIG_IDENT_STRING	" apf51 patch 1.5"
 #define CONFIG_BOARD_NAME	apf51
 
@@ -33,7 +33,7 @@
  */
 #define CONFIG_ARMV7			/* This is armv7 Cortex-A8 CPU  */
 #define CONFIG_MX51			/* in a Freescale i.MX51 Chip */
-#define CONFIG_MACH_TYPE 	2795	/* APF51 */
+#define CONFIG_MACH_TYPE	2795	/* APF51 */
 
 /*
  * Enable the call to miscellaneous platform dependent initialization.
@@ -114,7 +114,7 @@
 #define PHYS_SDRAM_SIZE			256
 #define PHYS_SDRAM_1_SIZE		(PHYS_SDRAM_SIZE) * 1024 * 1024
 #define PHYS_SDRAM_2_SIZE		(PHYS_SDRAM_SIZE) * 1024 * 1024
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (2 * 1024 * 1024) )
+#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (2 * 1024 * 1024))
 #define CONFIG_SYS_MEMTEST_START	0x90000000	/* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x90100000	/* 1st MiB in DRAM */
 
@@ -145,13 +145,13 @@
 #define	CONFIG_KERNEL_OFFSET		0x00400000
 #define	CONFIG_ROOTFS_OFFSET		0x00C00000
 
-#define CONFIG_MTDMAP   		"mxc_nand"
+#define CONFIG_MTDMAP			"mxc_nand"
 #define MTDIDS_DEFAULT			"nand0=" CONFIG_MTDMAP
 #define MTDPARTS_DEFAULT	"mtdparts=" CONFIG_MTDMAP \
-				":1M(u-boot)ro," \
+				":1M(u-boot)ro,"\
 				"512K(env),"	\
 				"512K(env2),"	\
-				"1M(firmware)," \
+				"1M(firmware),"	\
 				"512K(dtb),"	\
 				"512K(splash),"	\
 				"8M(kernel),"	\
@@ -163,7 +163,7 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PROMPT		"BIOS> "	/* prompt string */
 #define CONFIG_SYS_CBSIZE		2048		/* console I/O buffer */
-#define CONFIG_SYS_PBSIZE 		\
+#define CONFIG_SYS_PBSIZE		\
 				(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 						/* Print buffer size */
 #define CONFIG_SYS_MAXARGS		16		/* max command args */
@@ -178,7 +178,7 @@
  * Boot Linux
  */
 #define CONFIG_CMDLINE_TAG		/* send commandline to Kernel	*/
-#define CONFIG_SETUP_MEMORY_TAGS 	/* send memory definition to kernel */
+#define CONFIG_SETUP_MEMORY_TAGS	/* send memory definition to kernel */
 #define CONFIG_INITRD_TAG		/* send initrd params	*/
 
 /* #define CONFIG_REVISION_TAG */
@@ -187,7 +187,7 @@
 #define CONFIG_BOOTDELAY	5
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define	CONFIG_BOOTFILE		MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
-#define CONFIG_BOOTARGS 	"console=" MK_STR(ACFG_CONSOLE_DEV) "," \
+#define CONFIG_BOOTARGS		"console=" MK_STR(ACFG_CONSOLE_DEV) "," \
 				MK_STR(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
 			" ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
 
@@ -221,7 +221,7 @@
 	"addubifsargs=setenv bootargs ${bootargs} "			\
 		"ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"    \
 	"addmmcargs=setenv bootargs ${bootargs} "			\
-		"root=/dev/mmcblk0p1 rootfstype=ext2\0"   		\
+		"root=/dev/mmcblk0p1 rootfstype=ext2\0"			\
 	"addipargs=setenv bootargs ${bootargs} "			\
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
 		"${hostname}:eth0:off\0"				\
@@ -292,7 +292,7 @@
  */
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART3_BASE
-#define CONFIG_SYS_BAUDRATE_TABLE 	{ 9600, 19200, 38400, 57600, 115200 }
+#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_BAUDRATE			115200
 
 /*
@@ -349,7 +349,7 @@
 #define CONFIG_MII
 #define CONFIG_DISCOVER_PHY
 
-/*-----------------------------------------------------------------------
+/*
  * FPGA
  */
 #define CONFIG_FPGA			CONFIG_SYS_SPARTAN3
@@ -448,21 +448,21 @@
 #define APF_PERCLK	55	/* 55.4 MHZ PERCLK frequency */
 #define APF_NFC_CLK	23	/* MHZ NFC Clock from EMI clk */
 #define APF_USB_CLK	54	/* external USB serial bus frequency PLL3 */
-#define APF_ESDHC_CLK 	54	/* MHz ESDHC controller frequency / PLL3 */
+#define APF_ESDHC_CLK	54	/* MHz ESDHC controller frequency / PLL3 */
 #define APF_UART_CLK	66	/* 66.5 MHz UART frequency from PLL2 */
 
-//#define APF_SSI_CLK   54      /* MHz SSI controller frequency */
-//#define APF_TVE_CLK   216     /* MHz TVE controller frequency */
-//#define APF_DI_CLK    0       /* MHz DISPLAY controller frequency*/
-//#define APF_VPU_CLK   0       /* MHz VPU controller frequency*/
-//#define APF_SPDIF_CLK 10      /* MHz SPDIF controller frequency 10.3 MHz*/
-//#define APF_SIM_CLK   54      /* MHz SIM controller frequency */
-//#define APF_FIRI_CLK  54      /* MHz FIRI controller frequency */
-//#define APF_HSI2C_CLK 54      /* MHz HS I2C controller frequency */
-//#define APF_CSI_CLK   54      /* MHz HS CSI controller frequency */
-//#define APF_ECSPI_CLK 54      /* MHz HECSPI controller frequency */
-//#define APF_WRCK_CLK  13      /* MHz WRCK 13.3 MHz */
-//#define APF_LPSR_CLK  0       /* MHz  */
+/*#define APF_SSI_CLK	54*/	/* MHz SSI controller frequency */
+/*#define APF_TVE_CLK	216*/	/* MHz TVE controller frequency */
+/*#define APF_DI_CLK	0*/	/* MHz DISPLAY controller frequency*/
+/*#define APF_VPU_CLK	0*/	/* MHz VPU controller frequency*/
+/*#define APF_SPDIF_CLK	10*/	/* MHz SPDIF controller frequency 10.3 MHz*/
+/*#define APF_SIM_CLK	54*/	/* MHz SIM controller frequency */
+/*#define APF_FIRI_CLK	54*/	/* MHz FIRI controller frequency */
+/*#define APF_HSI2C_CLK	54*/	/* MHz HS I2C controller frequency */
+/*#define APF_CSI_CLK	54*/	/* MHz HS CSI controller frequency */
+/*#define APF_ECSPI_CLK	54*/	/* MHz HECSPI controller frequency */
+/*#define APF_WRCK_CLK	13*/	/* MHz WRCK 13.3 MHz */
+/*#define APF_LPSR_CLK	0*/	/* MHz  */
 #define APF_PGC_CLK	66	/* MHz 66.5 MHz */
 
 /* PLL parameters assuming 32.768kHz *1024 input clock with doubler ON */
@@ -601,7 +601,7 @@
 #include <asm/arch/imx-regs.h>
 
 /* Issue Mode register Command to SDRAM*/
-#define ACFG_DRR_MR_VAL ( 0x0\
+#define ACFG_DRR_MR_VAL (0x0\
 	| (((ACFG_SDRAM_BURST_LENGTH)&0x7)<<(0))\
 	| ((3)<<(4)) \
 	| (((ACFG_SDRAM_SINGLE_ACCESS)&0x1)<<(3)))
@@ -709,14 +709,14 @@
 /* CCM Configuration */
 
 #define CONFIG_SYS_PLL_DP_CTL		0x00001332	/* use fpm_clk */
-#define CONFIG_SYS_CLKCTL_CCMR 		0x00001FFF
-#define CONFIG_SYS_CLKCTL_CSR 		0x0000003E
-#define CONFIG_SYS_CLKCTL_CCSR 		0x00000200
+#define CONFIG_SYS_CLKCTL_CCMR		0x00001FFF
+#define CONFIG_SYS_CLKCTL_CSR		0x0000003E
+#define CONFIG_SYS_CLKCTL_CCSR		0x00000200
 
 #define CCBDR_MASK 0x40000000
 
 #define CONFIG_SYS_CLKTL_CBCDR\
-	(CCBDR_MASK 					\
+	(CCBDR_MASK					\
 	|((((ACFG_PLL1_CLK/APF_DDR_CLK)-1)&0x07)<<27)	\
 	|((((ACFG_PLL2_CLK/APF_EMI_CLK)-1)&0x07)<<22)	\
 	|((((ACFG_PLL2_CLK/APF_AXIB_CLK)-1)&0x07)<<19)	\
@@ -734,7 +734,7 @@
 #define CONFIG_SYS_CLKTL_CBCMR1 0xA5A2A020
 
 #define CONFIG_SYS_CLKTL_CSCDR1\
-	( 0x0							\
+	(0x0							\
 	|((((ACFG_PLL3_CLK/APF_ESDHC_CLK)/8)&0x07)<<19)		\
 	|(((((ACFG_PLL3_CLK/APF_ESDHC_CLK)			\
 	 /((ACFG_PLL3_CLK/APF_ESDHC_CLK)/8+1))-1)&0x07)<<22)	\
@@ -755,7 +755,7 @@
 
 #define ACFG_SDRAM_ESDMISC_REGISTER_VAL 0x000a5680
 
-#if ((2*ACFG_SDRAM_RC_DELAY)>(16*CONFIG_SYS_2XDDRCLK_LGTH))
+#if ((2*ACFG_SDRAM_RC_DELAY) > (16*CONFIG_SYS_2XDDRCLK_LGTH))
 #define REG_FIELD_RC_VAL 0
 #else
 #define REG_FIELD_RC_VAL \
@@ -763,7 +763,7 @@
 	/CONFIG_SYS_2XDDRCLK_LGTH)-1)
 #endif
 
-#if ((2*ACFG_SDRAM_RFC_DELAY)>(25*CONFIG_SYS_2XDDRCLK_LGTH))
+#if ((2*ACFG_SDRAM_RFC_DELAY) > (25*CONFIG_SYS_2XDDRCLK_LGTH))
 #define REG_FIELD_RFC_VAL \
 	(((2*ACFG_SDRAM_RFC_DELAY+CONFIG_SYS_2XDDRCLK_LGTH-1)	\
 	/CONFIG_SYS_2XDDRCLK_LGTH/2)-10)
diff --git a/patches/u-boot/2012.04/400-imx51.patch b/patches/u-boot/2012.04/400-imx51.patch
index fd09a3d..e27535a 100644
--- a/patches/u-boot/2012.04/400-imx51.patch
+++ b/patches/u-boot/2012.04/400-imx51.patch
@@ -76,7 +76,7 @@ index f972498..ba46365 100644
 +	DEFINE(ESDCTL_ESDPRCT0, offsetof(struct esdctl_regs, esdprct0));
 +	DEFINE(ESDCTL_ESDPRCT1, offsetof(struct esdctl_regs, esdprct1));
 +	BLANK();
-+	COMMENT( "IOMUX" );
++	COMMENT("IOMUX");
 +	DEFINE(IOMUXC_SW_PAD_CTL_GRP_DDRPKS, PAD_I_START
 +				+ PIN_TO_IOMUX_PAD(MX51_PIN_CTL_GRP_DDRPKS));
 +	DEFINE(IOMUXC_SW_PAD_CTL_GRP_PKEDDR, PAD_I_START
@@ -374,7 +374,7 @@ new file mode 100644
 index 0000000..c1707af
 --- /dev/null
 +++ b/arch/arm/include/asm/arch-mx5/regs_esdctl.h
-@@ -0,0 +1,130 @@
+@@ -0,0 +1,131 @@
 +/*
 + * Copyright (C) 2012
 + * Eric Jarrige, Armadeus Project, <eri...@ar...>
@@ -502,7 +502,8 @@ index 0000000..c1707af
 +#define DDR_NOP_CMD(cs)		(0x00008000 + (cs << 2))
 +#define DRR_PRECHARGE_CMD(cs, ba)	(0x04008008 + (cs << 2) + ba)
 +#define DRR_AUTOREFRESH_CMD(cs)	(0x00008010 + (cs << 2))
-+#define DRR_LMR_CMD(cs, ba, addr)	(0x00008018 + (addr << 16) + (cs << 2) + ba)
++#define DRR_LMR_CMD(cs, ba, addr)	(0x00008018 + (addr << 16)\
++						+ (cs << 2) + ba)
 +
 +#endif /* __REGS_ESDCTL_H__ */
 -- 
diff --git a/patches/u-boot/2012.04/401-apf51.patch b/patches/u-boot/2012.04/401-apf51.patch
index 043867e..fa56207 100644
--- a/patches/u-boot/2012.04/401-apf51.patch
+++ b/patches/u-boot/2012.04/401-apf51.patch
@@ -67,7 +67,7 @@ new file mode 100644
 index 0000000..e09b561
 --- /dev/null
 +++ b/board/armadeus/apf51/apf51.c
-@@ -0,0 +1,1220 @@
+@@ -0,0 +1,1222 @@
 +/*
 + * (C) Copyright 2010-2012 Eric Jarrige, Armadeus Project
 + *
@@ -111,7 +111,7 @@ index 0000000..e09b561
 +
 +DECLARE_GLOBAL_DATA_PTR;
 +
-+unsigned long boot_verb = 0;
++unsigned long boot_verb;
 +
 +u32 get_board_rev(void)
 +{
@@ -136,10 +136,10 @@ index 0000000..e09b561
 +
 +int dram_init(void)
 +{
-+		
++
 +	gd->ram_size = get_ram_size((void *)CSD0_BASE_ADDR, PHYS_SDRAM_1_SIZE);
 +	if (get_num_ram_bank() > 1) {
-+		gd->ram_size += 
++		gd->ram_size +=
 +			get_ram_size((void *)CSD1_BASE_ADDR, PHYS_SDRAM_2_SIZE);
 +	}
 +
@@ -152,9 +152,10 @@ index 0000000..e09b561
 +	gd->bd->bi_dram[0].size = gd->ram_size / get_num_ram_bank();
 +	if (CONFIG_NR_DRAM_BANKS > 1) {
 +		gd->bd->bi_dram[1].start = CSD1_BASE_ADDR;
-+		gd->bd->bi_dram[1].size = gd->ram_size -gd->bd->bi_dram[0].size;
++		gd->bd->bi_dram[1].size = gd->ram_size
++					- gd->bd->bi_dram[0].size;
 +	}
-+			
++
 +}
 +
 +void setup_usb(void)
@@ -407,10 +408,10 @@ index 0000000..e09b561
 +	mxc_request_iomux(MX51_PIN_EIM_CS0, IOMUX_CONFIG_ALT0);
 +	mxc_request_iomux(MX51_PIN_EIM_CS1, IOMUX_CONFIG_ALT0);
 +	mxc_request_iomux(MX51_PIN_EIM_DTACK, IOMUX_CONFIG_ALT0);
-+// missing in DS        mxc_request_iomux(MX51_PIN_EIM_WAIT, IOMUX_CONFIG_ALT0);
++/* missing in DS mxc_request_iomux(MX51_PIN_EIM_WAIT, IOMUX_CONFIG_ALT0); */
 +	mxc_request_iomux(MX51_PIN_EIM_LBA, IOMUX_CONFIG_ALT0);
-+// missing in DS        mxc_request_iomux(MX51_PIN_EIM_BCLK, IOMUX_CONFIG_ALT0);
-+// missing in DS        mxc_request_iomux(MX51_PIN_EIM_RW , IOMUX_CONFIG_ALT0);
++/* missing in DS mxc_request_iomux(MX51_PIN_EIM_BCLK, IOMUX_CONFIG_ALT0); */
++/* missing in DS mxc_request_iomux(MX51_PIN_EIM_RW , IOMUX_CONFIG_ALT0); */
 +
 +	/*
 +	 * Configure Register for each chip select
@@ -551,10 +552,10 @@ index 0000000..e09b561
 +	 * Configure iomux for display 1 interface
 +	 */
 +	mxc_request_iomux(MX51_PIN_DI1_D1_CS, IOMUX_CONFIG_ALT4);
-+// missing in DS mxc_request_iomux(MX51_PIN_DI1_DISP_CLK, IOMUX_CONFIG_ALT0);
++/* missing in DS mxc_request_iomux(MX51_PIN_DI1_DISP_CLK, IOMUX_CONFIG_ALT0);*/
 +	mxc_request_iomux(MX51_PIN_DI1_PIN2, IOMUX_CONFIG_ALT0);
 +	mxc_request_iomux(MX51_PIN_DI1_PIN3, IOMUX_CONFIG_ALT0);
-+// missing in DS mxc_request_iomux(MX51_PIN_DI1_PIN15, IOMUX_CONFIG_ALT0);
++/* missing in DS mxc_request_iomux(MX51_PIN_DI1_PIN15, IOMUX_CONFIG_ALT0);*/
 +
 +	mxc_request_iomux(MX51_PIN_DISP1_DAT0, IOMUX_CONFIG_ALT0);
 +	mxc_request_iomux(MX51_PIN_DISP1_DAT1, IOMUX_CONFIG_ALT0);
@@ -588,12 +589,12 @@ index 0000000..e09b561
 +	 * Configure iomux for NFC interface
 +	 */
 +#define NAND_PAD47K_CFG		(PAD_CTL_DRV_VOT_HIGH | PAD_CTL_HYS_NONE | \
-+				 PAD_CTL_PKE_ENABLE | PAD_CTL_47K_PU | 	\
-+				 PAD_CTL_DRV_HIGH)
++				PAD_CTL_PKE_ENABLE | PAD_CTL_47K_PU |	\
++				PAD_CTL_DRV_HIGH)
 +
 +#define NAND_PAD100K_CFG	(PAD_CTL_DRV_VOT_HIGH | PAD_CTL_HYS_NONE | \
-+				 PAD_CTL_PKE_ENABLE | PAD_CTL_100K_PU | \
-+				 PAD_CTL_DRV_HIGH)
++				PAD_CTL_PKE_ENABLE | PAD_CTL_100K_PU | \
++				PAD_CTL_DRV_HIGH)
 +
 +	mxc_request_iomux(MX51_PIN_NANDF_WE_B, IOMUX_CONFIG_ALT0);
 +	mxc_iomux_set_pad(MX51_PIN_NANDF_WE_B, NAND_PAD47K_CFG);
@@ -612,8 +613,8 @@ index 0000000..e09b561
 +
 +	mxc_request_iomux(MX51_PIN_NANDF_RB0, IOMUX_CONFIG_ALT0);
 +	mxc_iomux_set_pad(MX51_PIN_NANDF_RB0, PAD_CTL_DRV_VOT_HIGH |
-+			  PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE |
-+			  PAD_CTL_PUE_PULL | PAD_CTL_100K_PU);
++				PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE |
++				PAD_CTL_PUE_PULL | PAD_CTL_100K_PU);
 +
 +	mxc_request_iomux(MX51_PIN_NANDF_CS0, IOMUX_CONFIG_ALT0);
 +
@@ -653,8 +654,8 @@ index 0000000..e09b561
 +	 * Configure iomux for SPI interface
 +	 */
 +#define CSPI_PAD_CFG		(PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE | \
-+				 PAD_CTL_PUE_KEEPER | PAD_CTL_100K_PU |	\
-+				 PAD_CTL_DRV_HIGH | PAD_CTL_SRE_FAST)
++				PAD_CTL_PUE_KEEPER | PAD_CTL_100K_PU |	\
++				PAD_CTL_DRV_HIGH | PAD_CTL_SRE_FAST)
 +	/*
 +	 * ECSPI1
 +	 */
@@ -808,7 +809,7 @@ index 0000000..e09b561
 +	mxc_request_iomux(MX51_PIN_DISP2_DAT15, IOMUX_CONFIG_ALT2);
 +	mxc_iomux_set_pad(MX51_PIN_DISP2_DAT15, CFG_FEC_PAD);
 +
-+	/* 
++	/*
 +	 * FEC signals involved in daisy chain should be mapped
 +	 * to DISP2/DI2 pads
 +	 */
@@ -830,7 +831,7 @@ index 0000000..e09b561
 +#endif
 +}
 +
-+int board_eth_init(bd_t * bis)
++int board_eth_init(bd_t *bis)
 +{
 +#define STR_ENV_ETHADDR	"ethaddr"
 +	int rc = -ENODEV;
@@ -1011,8 +1012,8 @@ index 0000000..e09b561
 +#if defined(CONFIG_FPGA)
 +	/* init and download fpga */
 +	if ((autoload) && (0 == strcmp(autoload, "1"))) {
-+		if (mtdparts_init() == 0)
-+		if (find_dev_and_part("firmware", &dev, &pnum, &part) == 0) {
++		if ((mtdparts_init() == 0) && (find_dev_and_part("firmware",
++			&dev, &pnum, &part) == 0)) {
 +			size = part->size;
 +			if (nand_read_skip_bad(&nand_info[0], part->offset,
 +				&size, firmware_buffer))
@@ -1086,7 +1087,8 @@ index 0000000..e09b561
 +/*
 + * display dcd table. to delete
 + */
-+int do_mx51_show_dcd_tab(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
++int do_mx51_show_dcd_tab(cmd_tbl_t *cmdtp, int flag, int argc,
++				char *const argv[])
 +{
 +	ulong i = 1;
 +	struct esdctl_regs *esdctl = (struct esdctl_regs *)ESDCTL_BASE_ADDR;
@@ -1286,14 +1288,14 @@ index 0000000..e09b561
 +/***************************************************/
 +
 +U_BOOT_CMD(dcdshow, 1, 1, do_mx51_show_dcd_tab,
-+	   "display mx51 dcd tab\n", "");
++		"display mx51 dcd tab\n", "");
 +#endif /* CONFIG_CMD_BSP */
 diff --git a/board/armadeus/apf51/fpga.c b/board/armadeus/apf51/fpga.c
 new file mode 100644
 index 0000000..52f1869
 --- /dev/null
 +++ b/board/armadeus/apf51/fpga.c
-@@ -0,0 +1,267 @@
+@@ -0,0 +1,266 @@
 +/*
 + * (C) Copyright 2002-2010
 + * Nicolas Colombain <nic...@ar...>
@@ -1335,9 +1337,9 @@ index 0000000..52f1869
 +#include <spartan3.h>
 +
 +#ifdef FPGA_DEBUG
-+#define		PRINTF(fmt,args...)	printf (fmt ,##args)
++#define		PRINTF(fmt, args...)	printf(fmt , ##args)
 +#else
-+#define		PRINTF(fmt,args...)
++#define		PRINTF(fmt, args...)
 +#endif
 +
 +u32 temp_clk;		/* use to restore the emi_clk_sel after donwload */
@@ -1384,7 +1386,7 @@ index 0000000..52f1869
 +
 +	temp_rcr1 = readl(&weim->cs1rcr1);
 +	writel(0x01000010, &weim->cs1rcr1);
-+	temp_wcr1 = readl(&weim->cs1wcr1);	
++	temp_wcr1 = readl(&weim->cs1wcr1);
 +	writel(0x01000008, &weim->cs1wcr1);
 +
 +	/* change emi_clk_sel to ensure blck smaller than 50MHz */
@@ -1419,8 +1421,8 @@ index 0000000..52f1869
 + */
 +int fpga_pgm_fn(int assert, int flush, int cookie)
 +{
-+	PRINTF("%s:%d: FPGA PROGRAM %s\n", __FUNCTION__, __LINE__,
-+	       assert ? "high" : "low");
++	PRINTF("%s:%d: FPGA PROGRAM %s\n", __func__, __LINE__,
++		assert ? "high" : "low");
 +	gpio_set_value(IOMUX_TO_GPIO(ACFG_FPGA_PRG), !assert);
 +	return assert;
 +}
@@ -1440,7 +1442,7 @@ index 0000000..52f1869
 +int fpga_init_fn(int cookie)
 +{
 +	int value;
-+	PRINTF("%s:%d: INIT check... \n", __FUNCTION__, __LINE__);
++	PRINTF("%s:%d: INIT check...\n", __func__, __LINE__);
 +	value = gpio_get_value(IOMUX_TO_GPIO(ACFG_FPGA_INIT));
 +	PRINTF("init value read %x\n", value);
 +	if (value)
@@ -1455,9 +1457,9 @@ index 0000000..52f1869
 +{
 +	int value;
 +	value = gpio_get_value(IOMUX_TO_GPIO(ACFG_FPGA_DONE));
-+	PRINTF("%s:%d: DONE check... %s", __FUNCTION__, __LINE__,
++	PRINTF("%s:%d: DONE check... %s", __func__, __LINE__,
 +	       value ? "high" : "low");
-+	return (value ? FPGA_SUCCESS : FPGA_FAIL);
++	return value ? FPGA_SUCCESS : FPGA_FAIL;
 +}
 +
 +/*
@@ -1475,7 +1477,7 @@ index 0000000..52f1869
 +
 +int fpga_rdata_fn(unsigned char *data, int cookie)
 +{
-+	PRINTF("%s:%d: FPGA READ DATA %02X \n", __FUNCTION__, __LINE__,
++	PRINTF("%s:%d: FPGA READ DATA %02X\n", __func__, __LINE__,
 +	       *((char *)ACFG_FPGA_RDATA));
 +	*data =
 +	    (unsigned char)((*((unsigned short *)ACFG_FPGA_RDATA)) &
@@ -1485,9 +1487,9 @@ index 0000000..52f1869
 +
 +int fpga_wdata_fn(unsigned char data, int flush, int cookie)
 +{
-+	PRINTF("%s:%d: FPGA WRITE DATA %02X \n", __FUNCTION__, __LINE__, data);
++	PRINTF("%s:%d: FPGA WRITE DATA %02X\n", __func__, __LINE__, data);
 +	static u32 temp;
-+	static u32 index = 0;
++	static u32 index;
 +
 +	switch (index++) {
 +	case 0:
@@ -1500,8 +1502,7 @@ index 0000000..52f1869
 +		temp = temp + (data << 24);
 +		break;
 +	default:
-+		*((volatile unsigned long *)ACFG_FPGA_WDATA) =
-+		    temp + (data << 16);
++		*((unsigned long *)ACFG_FPGA_WDATA) = temp + (data << 16);
 +		index = 0;
 +		break;
 +	}
@@ -1523,7 +1524,7 @@ index 0000000..52f1869
 +{
 +	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE;
 +	struct weim *weim = (struct weim *)WEIM_BASE_ADDR;
-+	PRINTF("%s:%d: FPGA POST \n", __FUNCTION__, __LINE__);
++	PRINTF("%s:%d: FPGA POST\n", __func__, __LINE__);
 +	/* restore emi_clk_sel */
 +	writel(temp_clk, &mxc_ccm->cbcdr);
 +	udelay(10);		/* wait a few us after emi_clk_sel change */
@@ -1536,14 +1537,14 @@ index 0000000..52f1869
 +/*
 + * Initialize the fpga.  Return 1 on success, 0 on failure.
 + */
-+int APF51_init_fpga(u_char * buffer, size_t size)
++int APF51_init_fpga(u_char *buffer, size_t size)
 +{
 +	int i, lout = 0;
 +
 +	fpga_init();
 +
 +	for (i = 0; i < CONFIG_FPGA_COUNT; i++) {
-+		PRINTF("%s:%d: Adding fpga %d\n", __FUNCTION__, __LINE__, i);
++		PRINTF("%s:%d: Adding fpga %d\n", __func__, __LINE__, i);
 +		fpga_add(fpga_xilinx, &fpga[i]);
 +	}
 +
@@ -1592,7 +1593,7 @@ index 0000000..f7a0064
 + * MA 02111-1307 USA
 + *
 + */
-+extern int APF51_init_fpga(u_char * buffer, size_t size);
++extern int APF51_init_fpga(u_char *buffer, size_t size);
 +
 +extern int fpga_pre_fn(int cookie);
 +extern int fpga_pgm_fn(int assert_pgm, int flush, int cookie);
diff --git a/patches/u-boot/2012.04/405-remove_extra_printk.patch b/patches/u-boot/2012.04/405-remove_extra_printk.patch
index 768e829..2a1831c 100644
--- a/patches/u-boot/2012.04/405-remove_extra_printk.patch
+++ b/patches/u-boot/2012.04/405-remove_extra_printk.patch
@@ -10,24 +10,26 @@ diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
 index 2b730e0..922f82f 100644
 --- a/drivers/mtd/nand/nand_bbt.c
 +++ b/drivers/mtd/nand/nand_bbt.c
-@@ -261,8 +261,9 @@ static int read_bbt(struct mtd_info *mtd, uint8_t *buf, int page, int num,
+@@ -261,8 +261,10 @@ static int read_bbt(struct mtd_info *mtd, uint8_t *buf, int page, int num,
  				}
  				/* Leave it for now, if its matured we can move this
  				 * message to MTD_DEBUG_LEVEL0 */
 -				printk(KERN_DEBUG "nand_read_bbt: Bad block at 0x%012llx\n",
 -				       (loff_t)((offs << 2) + (act >> 1)) << this->bbt_erase_shift);
-+				debug(KERN_DEBUG "nand_read_bbt: Bad block at 0x%012llx\n",
++				debug(KERN_DEBUG "nand_read_bbt: "
++					"Bad block at 0x%012llx\n",
 +					(loff_t)((offs << 2) + (act >> 1)) <<
 +					this->bbt_erase_shift);
  				/* Factory marked bad or worn ou

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-422-g248a994

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  248a99404d5029b9d8d82776d8e4dbde47c57e29 (commit)
      from  7a1c774b3a3b583567a7fb846e3188445e33b382 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 248a99404d5029b9d8d82776d8e4dbde47c57e29
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Jun 26 12:29:04 2012 +0200

    [UBOOT] apf28: fix typo / checkpatch

-----------------------------------------------------------------------

Summary of changes:
 .../device/armadeus/apf28/apf28-u-boot-2012.04.h   |   49 +++++++-------
 .../503-imx28_suppport_battery_power_supply.patch  |   67 +++++++++----------
 2 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
index 0154045..0b9257a 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
@@ -25,7 +25,7 @@
 #include <asm/arch/regs-base.h>
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"1.2"
+#define CONFIG_ENV_VERSION	"1.2"
 #define CONFIG_IDENT_STRING	" apf28 patch 1.5"
 #define CONFIG_BOARD_NAME	apf28
 
@@ -38,7 +38,7 @@
 /*
  * Enable the call to miscellaneous platform dependent initialization.
  */
-#define CONFIG_SYS_NO_FLASH	/* to be define before <config_cmd_default.h> */
+#define CONFIG_SYS_NO_FLASH	/* to be define before <config_cmd_default.h>*/
 #define CONFIG_SYS_DCACHE_OFF
 #define	CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT
@@ -141,12 +141,12 @@
 #define	CONFIG_SYS_MEMTEST_END		0x40400000	/* 4 MB RAM test */
 /* Point initial SP in SRAM so SPL can use it too. */
 
-#define CONFIG_SYS_INIT_RAM_ADDR       0x00002000
-#define CONFIG_SYS_INIT_RAM_SIZE       (128 * 1024)
+#define CONFIG_SYS_INIT_RAM_ADDR	0x00002000
+#define CONFIG_SYS_INIT_RAM_SIZE	(128 * 1024)
 #define CONFIG_SYS_INIT_SP_OFFSET \
-       (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_ADDR \
-       (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
+	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 #define	CONFIG_SYS_TEXT_BASE		0x40000000
 
@@ -200,7 +200,7 @@
  * Boot Linux
  */
 #define CONFIG_CMDLINE_TAG		/* send commandline to Kernel	*/
-#define CONFIG_SETUP_MEMORY_TAGS 	/* send memory definition to kernel */
+#define CONFIG_SETUP_MEMORY_TAGS	/* send memory definition to kernel */
 #define CONFIG_INITRD_TAG		/* send initrd params	*/
 
 /* #define CONFIG_REVISION_TAG */
@@ -209,7 +209,7 @@
 #define	CONFIG_BOOTDELAY	5
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define	CONFIG_BOOTFILE		MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
-#define CONFIG_BOOTARGS 	"console=" MK_STR(ACFG_CONSOLE_DEV) "," \
+#define CONFIG_BOOTARGS		"console=" MK_STR(ACFG_CONSOLE_DEV) "," \
 				MK_STR(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
 			" ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
 
@@ -227,22 +227,22 @@
  * Extra Environments
  */
 #define	CONFIG_EXTRA_ENV_SETTINGS					\
-	"env_version=" 		CONFIG_ENV_VERSION "\0"			\
-	"consoledev="		MK_STR(ACFG_CONSOLE_DEV)		"\0" \
-	"mtdparts="		MTDPARTS_DEFAULT			"\0" \
+	"env_version="		CONFIG_ENV_VERSION "\0"			\
+	"consoledev="		MK_STR(ACFG_CONSOLE_DEV)		"\0"\
+	"mtdparts="		MTDPARTS_DEFAULT			"\0"\
 	"partition=nand0,6\0"						\
-	"u-boot_addr="		MK_STR(CONFIG_SYS_MONITOR_OFFSET)	"\0" \
-	"u-boot_len="		MK_STR(CONFIG_SYS_MONITOR_LEN)		"\0" \
-	"kernel_addr="		MK_STR(CONFIG_KERNEL_OFFSET)		"\0" \
-	"rootfs_addr="		MK_STR(CONFIG_ROOTFS_OFFSET)		"\0" \
-	"board_name="		MK_STR(CONFIG_BOARD_NAME)		"\0" \
+	"u-boot_addr="		MK_STR(CONFIG_SYS_MONITOR_OFFSET)	"\0"\
+	"u-boot_len="		MK_STR(CONFIG_SYS_MONITOR_LEN)		"\0"\
+	"kernel_addr="		MK_STR(CONFIG_KERNEL_OFFSET)		"\0"\
+	"rootfs_addr="		MK_STR(CONFIG_ROOTFS_OFFSET)		"\0"\
+	"board_name="		MK_STR(CONFIG_BOARD_NAME)		"\0"\
 	"kernel_addr_r=40000000\0" \
 	"addnfsargs=setenv bootargs ${bootargs} "			\
 		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
 	"addubifsargs=setenv bootargs ${bootargs} "			\
 		"ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"    \
 	"addmmcargs=setenv bootargs ${bootargs} "			\
-		"root=/dev/mmcblk0p1 rootfstype=ext2\0"   	\
+		"root=/dev/mmcblk0p1 rootfstype=ext2\0"			\
 	"addipargs=setenv bootargs ${bootargs} "			\
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
 		"${hostname}:eth0:off\0"				\
@@ -270,12 +270,13 @@
 		"nand erase ${u-boot_addr} ${u-boot_len} ; "		\
 		"nand write.trimffs ${fileaddr} ${u-boot_addr} ${filesize};" \
 		"nand erase ${u-boot2_addr} ${u-boot_len};"		\
-		"if nand write.trimffs ${fileaddr} ${u-boot2_addr} ${filesize};"\
-			"then echo Flashing of uboot succeed;"	\
+		"if nand write.trimffs ${fileaddr} ${u-boot2_addr}"	\
+			" ${filesize};"					\
+			"then echo Flashing of uboot succeed;"		\
 			"else echo Flashing of uboot failed;"		\
 		"fi; "							\
 		"fi; \0"						\
-	"flash_kernel=nand erase.part kernel;"	\
+	"flash_kernel=nand erase.part kernel;"				\
 		"if nand write.trimffs ${fileaddr} ${kernel_addr} ${filesize};"\
 			"then echo Flashing of kernel succeed;"		\
 			"else echo Flashing of kernel failed;"		\
@@ -293,13 +294,13 @@
 	"flash_reset_env=env default -f; saveenv;"			\
 		"echo Flash environment variables erased!\0"		\
 	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot.sb\0"	\
-	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
-	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0" \
-	"download_dtb=tftpboot ${loadaddr} imx28-${board_name}.dtb\0" \
+	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0"\
+	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0"\
+	"download_dtb=tftpboot ${loadaddr} imx28-${board_name}.dtb\0"	\
 	"update_uboot=run download_uboot flash_uboot\0"			\
 	"update_kernel=run download_kernel flash_kernel\0"		\
 	"update_rootfs=run download_rootfs flash_rootfs\0"		\
-	"update_dtb=run download_dtb flash_dtb\0"		\
+	"update_dtb=run download_dtb flash_dtb\0"			\
 	"update_all=run download_kernel flash_kernel download_rootfs "	\
 		"flash_rootfs download_uboot flash_uboot\0"		\
 	"unlock_regs=echo unlock_reg not needed anymore\0"
diff --git a/patches/u-boot/2012.04/503-imx28_suppport_battery_power_supply.patch b/patches/u-boot/2012.04/503-imx28_suppport_battery_power_supply.patch
index f84f9a4..2863ee1 100644
--- a/patches/u-boot/2012.04/503-imx28_suppport_battery_power_supply.patch
+++ b/patches/u-boot/2012.04/503-imx28_suppport_battery_power_supply.patch
@@ -164,7 +164,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  
  	if (xfer) {
  		setbits_le32(&power_regs->hw_power_5vctrl,
-@@ -230,19 +227,25 @@ void mx28_enable_4p2_dcdc_input(int xfer
+@@ -230,19 +227,24 @@ void mx28_enable_4p2_dcdc_input(int xfer
  
  	early_delay(25);
  
@@ -176,8 +176,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 -
 -	if (!pwd_bo)
 -		clrbits_le32(&power_regs->hw_power_minpwr, POWER_MINPWR_PWD_BO);
-+	if(readl(&power_regs->hw_power_ctrl) & POWER_CTRL_VBUS_VALID_IRQ)
-+	{
++	if (readl(&power_regs->hw_power_ctrl) & POWER_CTRL_VBUS_VALID_IRQ) {
 +		writel(POWER_5VCTRL_PWD_CHARGE_4P2_MASK,
 +			&power_regs->hw_power_5vctrl_set);
 +		writel(POWER_5VCTRL_PWD_CHARGE_4P2_MASK,
@@ -198,7 +197,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  	if (prev_5v_brnout) {
  		writel(POWER_5VCTRL_PWDN_5VBRNOUT,
  			&power_regs->hw_power_5vctrl_set);
-@@ -255,10 +258,6 @@ void mx28_enable_4p2_dcdc_input(int xfer
+@@ -255,10 +257,6 @@ void mx28_enable_4p2_dcdc_input(int xfer
  			&power_regs->hw_power_reset);
  	}
  
@@ -209,7 +208,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  	if (prev_5v_droop)
  		clrbits_le32(&power_regs->hw_power_ctrl,
  				POWER_CTRL_ENIRQ_VDD5V_DROOP);
-@@ -299,55 +298,38 @@ void mx28_power_init_4p2_regulator(void)
+@@ -299,55 +297,38 @@ void mx28_power_init_4p2_regulator(void)
  		 * not present. Exiting to not enable DCDC power during 5V
  		 * connected state.
  		 */
@@ -290,7 +289,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  	writel(POWER_CTRL_DCDC4P2_BO_IRQ, &power_regs->hw_power_ctrl_clr);
  }
  
-@@ -356,20 +338,14 @@ void mx28_power_init_dcdc_4p2_source(voi
+@@ -356,20 +337,14 @@ void mx28_power_init_dcdc_4p2_source(voi
  	struct mx28_power_regs *power_regs =
  		(struct mx28_power_regs *)MXS_POWER_BASE;
  
@@ -316,7 +315,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  	}
  }
  
-@@ -450,15 +426,6 @@ void mx28_boot_valid_5v(void)
+@@ -450,15 +425,6 @@ void mx28_boot_valid_5v(void)
  	mx28_power_enable_4p2();
  }
  
@@ -332,7 +331,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  void mx28_handle_5v_conflict(void)
  {
  	struct mx28_power_regs *power_regs =
-@@ -530,10 +497,10 @@ void mx28_init_batt_bo(void)
+@@ -530,10 +496,10 @@ void mx28_init_batt_bo(void)
  	struct mx28_power_regs *power_regs =
  		(struct mx28_power_regs *)MXS_POWER_BASE;
  
@@ -345,21 +344,19 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  
  	writel(POWER_CTRL_BATT_BO_IRQ, &power_regs->hw_power_ctrl_clr);
  	writel(POWER_CTRL_ENIRQ_BATT_BO, &power_regs->hw_power_ctrl_clr);
-@@ -601,15 +568,418 @@ int mx28_is_batt_good(void)
+@@ -601,15 +567,416 @@ int mx28_is_batt_good(void)
  	return 0;
  }
  
 -void mx28_power_configure_power_source(void)
 +void mx28_lradc_init(int bEnableOnChipGroundRef, int eFreq)
-+{
-+	static int lradcInitialized = 0;
+ {
++	static int lradcInitialized;
 +	struct mx28_lradc_regs *lradc_regs =
 +		(struct mx28_lradc_regs *)MXS_LRADC_BASE;
 +
-+	if( lradcInitialized )
-+	{
++	if (lradcInitialized)
 +		return;
-+	}
 +
 +	/* Clear the Soft Reset for normal operation */
 +	clrbits_le32(&lradc_regs->hw_lradc_ctrl0, LRADC_CTRL0_SFTRST);
@@ -368,7 +365,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +	clrbits_le32(&lradc_regs->hw_lradc_ctrl0, LRADC_CTRL0_CLKGATE);
 +
 +	/* Set on-chip ground ref */
-+	if(bEnableOnChipGroundRef) {
++	if (bEnableOnChipGroundRef) {
 +		/* Enable the onchip ground ref of LRADC conversions */
 +		setbits_le32(&lradc_regs->hw_lradc_ctrl0,
 +			LRADC_CTRL0_ONCHIP_GROUNDREF);
@@ -400,7 +397,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +	lradcInitialized = 1;
 +}
 +
-+void mx28_lradc_configure_channel( int eChannel,
++void mx28_lradc_configure_channel(int eChannel,
 +				int bEnableDivideByTwo,
 +				int bEnableAccum,
 +				uint8_t u8NumSamples)
@@ -409,7 +406,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +		(struct mx28_lradc_regs *)MXS_LRADC_BASE;
 +
 +	/* Set the analog divide-by two function */
-+	if(bEnableDivideByTwo) {
++	if (bEnableDivideByTwo) {
 +		/* Enable the divide-by-two of a LRADC channel */
 +		setbits_le32(&lradc_regs->hw_lradc_ctrl2,
 +			LRADC_CTRL2_DIVIDE_BY_TWO(1 << eChannel));
@@ -429,7 +426,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +			LRADC_CHn_NUM_SAMPLES(u8NumSamples));
 +
 +	/* Set ACCUMULATE bit of HW_LRADC_CHn register */
-+	if(bEnableAccum) {
++	if (bEnableAccum) {
 +		/* Enable the accumulation of a LRADC channel */
 +		setbits_le32(&lradc_regs->hw_lradc_ch0 + (eChannel * 4),
 +			LRADC_CHn_ACCUMULATE);
@@ -468,7 +465,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +			LRADC_DELAYn_DELAY(u32DelayCount));
 +}
 +
-+int mx28_lradc_enable_battery_measurement( int eTrigger,
++int mx28_lradc_enable_battery_measurement(int eTrigger,
 +					uint16_t u16SamplingInterval)
 +{
 +	struct mx28_lradc_regs *lradc_regs =
@@ -478,8 +475,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +	 * Check if the lradc battery voltage channel
 +	 * is present in this product
 +	 */
-+	if ( (readl(&lradc_regs->hw_lradc_status)
-+		& LRADC_STATUS_CHANNEL7_PRESENT) == 0 ) return 0;
++	if ((readl(&lradc_regs->hw_lradc_status)
++		& LRADC_STATUS_CHANNEL7_PRESENT) == 0)
++		return 0;
 +
 +	/* Disable the channel interrupt */
 +	clrbits_le32(&lradc_regs->hw_lradc_ctrl1, LRADC_CTRL1_LRADC7_IRQ_EN);
@@ -499,7 +497,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +	setbits_le32(&lradc_regs->hw_lradc_conversion,
 +		LRADC_CONVERSION_AUTOMATIC);
 +
-+	mx28_lradc_configure_channel( 7, /* Lradc battery voltage channel */
++	mx28_lradc_configure_channel(7, /* Lradc battery voltage channel */
 +				0, /* DIVIDE_BY_TWO */
 +				0, /* ACCUMULATE */
 +				0); /* NUM_SAMPLES */
@@ -509,7 +507,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +	setbits_le32(&lradc_regs->hw_lradc_ctrl0, LRADC_CTRL0_SCHEDULE(1<<7));
 +
 +	/* Setup the trigger loop forever, */
-+	mx28_lradc_set_delay_trigger( eTrigger, /* Trigger Index */
++	mx28_lradc_set_delay_trigger(eTrigger, /* Trigger Index */
 +				(1 << 7), /* Lradc channels */
 +				(1 << eTrigger), /* Restart the triggers */
 +				0, /* No loop count */
@@ -523,9 +521,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +			LRADC_DELAYn_KICK);
 +
 +
-+	/* Wait for first measurement of battery.  Should occur in 13 LRADC clock
-+	 * cycles from the time of channel kickoff.  Also add some wait time for
-+	 * copy to the power supply BATT_VAL field to occur.
++	/* Wait for first measurement of battery.  Should occur in 13 LRADC
++	 * clock cycles from the time of channel kickoff.  Also add some wait
++	 * time for copy to the power supply BATT_VAL field to occur.
 +	 */
 +	early_delay(10);
 +
@@ -545,7 +543,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +}
 +
 +void mx28_power_setup_batt_boot(void)
- {
++{
 +	struct mx28_power_regs *power_regs =
 +		(struct mx28_power_regs *)MXS_POWER_BASE;
 +
@@ -648,7 +646,6 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +
 +	/* bit 11 of PERSISTENT1 */
 +	writel(0x800, &rtc_regs->hw_rtc_persistent1_set);
-+	
 +
 +	battery_ready = 0;
 +
@@ -729,8 +726,8 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +		 * power source to use during bootup.
 +		 */
 +		int battery_good = mx28_is_batt_good();
-+		if(!battery_ready) {
-+			if(!battery_good) {
++		if (!battery_ready) {
++			if (!battery_good) {
 +				struct mx28_lradc_regs *lradc_regs =
 +				(struct mx28_lradc_regs *)MXS_LRADC_BASE;
 +
@@ -765,7 +762,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  }
  
  void mx28_enable_output_rail_protection(void)
-@@ -640,7 +1010,7 @@ int mx28_get_vddio_power_source_off(void
+@@ -640,7 +1007,7 @@ int mx28_get_vddio_power_source_off(void
  		tmp = readl(&power_regs->hw_power_vddioctrl);
  		if (tmp & POWER_VDDIOCTRL_DISABLE_FET) {
  			if ((tmp & POWER_VDDIOCTRL_LINREG_OFFSET_MASK) ==
@@ -774,7 +771,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  				return 1;
  			}
  		}
-@@ -648,7 +1018,7 @@ int mx28_get_vddio_power_source_off(void
+@@ -648,7 +1015,7 @@ int mx28_get_vddio_power_source_off(void
  		if (!(readl(&power_regs->hw_power_5vctrl) &
  			POWER_5VCTRL_ENABLE_DCDC)) {
  			if ((tmp & POWER_VDDIOCTRL_LINREG_OFFSET_MASK) ==
@@ -783,7 +780,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  				return 1;
  			}
  		}
-@@ -887,12 +1257,14 @@ void mx28_power_init(void)
+@@ -887,12 +1254,14 @@ void mx28_power_init(void)
  {
  	struct mx28_power_regs *power_regs =
  		(struct mx28_power_regs *)MXS_POWER_BASE;
@@ -799,7 +796,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  	mx28_enable_output_rail_protection();
  
  	mx28_power_set_vddio(3300, 3150);
-@@ -904,8 +1276,23 @@ void mx28_power_init(void)
+@@ -904,8 +1273,23 @@ void mx28_power_init(void)
  		POWER_CTRL_VBUS_VALID_IRQ | POWER_CTRL_BATT_BO_IRQ |
  		POWER_CTRL_DCDC4P2_BO_IRQ, &power_regs->hw_power_ctrl_clr);
  
@@ -817,7 +814,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +	 * now as the latest release kernel versions aren't aware of  it
 +	 * and thus don't handle the proper setting/clearing of this bit.
 +	 */
-+		writel( 1<<7, &power_regs->hw_power_refctrl_set);
++		writel(1<<7, &power_regs->hw_power_refctrl_set);
 +#endif /* CONFIG_SYS_NO_DCDC_BATT_SOURCE */
  
 +	}


hooks/post-receive
-- 
armadeus