[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-135-g99e581b

[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  99e581b3a12fe5dd45b9a3e953148b49ef11908f (commit)
       via  259637465143ead1b3787a33d5a961a40ea76251 (commit)
      from  c6958ce294c144df9013b117c5596cd09bbd973f (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 99e581b3a12fe5dd45b9a3e953148b49ef11908f
Merge: 259637465143ead1b3787a33d5a961a40ea76251 c6958ce294c144df9013b117c5596cd09bbd973f
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Nov 25 16:09:02 2010 +0100

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

commit 259637465143ead1b3787a33d5a961a40ea76251
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Nov 25 16:08:44 2010 +0100

    [LINUX] 2.6.36: makes I2C usable on APF27 (module & baseboards)

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

Summary of changes:
 .../armadeus/apf27/apf27-linux-2.6.36.config       |    5 +++--
 ...-apf27-armadeus-add_apf27_to_build_system.patch |   13 ++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
index c448d08..9832c7b 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.36
-# Sat Nov  6 21:12:40 2010
+# Thu Nov 25 15:52:57 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -259,6 +259,7 @@ CONFIG_MACH_MX27=y
 # CONFIG_MACH_MXT_TD60 is not set
 CONFIG_MACH_APF27=y
 # CONFIG_MACH_APF27_FPGA is not set
+CONFIG_MACH_APF27_HAS_BASEBOARD=y
 CONFIG_MACH_APF27_DEV=y
 CONFIG_MACH_APF27_DEV_EXT_NONE=y
 # CONFIG_MACH_APF27_DEV_EXT_WIRELESS is not set
@@ -989,7 +990,7 @@ CONFIG_I2C_HELPER_AUTO=y
 #
 # CONFIG_I2C_DESIGNWARE is not set
 # CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_IMX is not set
+CONFIG_I2C_IMX=y
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_SIMTEC is not set
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/282-apf27-armadeus-add_apf27_to_build_system.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/282-apf27-armadeus-add_apf27_to_build_system.patch
index 1448737..82ef489 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/282-apf27-armadeus-add_apf27_to_build_system.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/282-apf27-armadeus-add_apf27_to_build_system.patch
@@ -1,8 +1,8 @@
 Index: linux-2.6.36/arch/arm/mach-imx/Kconfig
 ===================================================================
---- linux-2.6.36.orig/arch/arm/mach-imx/Kconfig	2010-11-08 16:43:19.000000000 +0100
-+++ linux-2.6.36/arch/arm/mach-imx/Kconfig	2010-11-08 16:44:46.000000000 +0100
-@@ -191,4 +191,112 @@
+--- linux-2.6.36.orig/arch/arm/mach-imx/Kconfig	2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/arm/mach-imx/Kconfig	2010-11-25 15:52:28.000000000 +0100
+@@ -191,4 +191,115 @@
  	  Include support for i-MXT (aka td60) platform. This
  	  includes specific configurations for the module and its peripherals.
  
@@ -25,6 +25,9 @@ Index: linux-2.6.36/arch/arm/mach-imx/Kconfig
 +	help
 +	  Select this if your APF27 has an onboard FPGA.
 +
++config MACH_APF27_HAS_BASEBOARD
++        bool
++
 +choice
 +	prompt "Baseboard"
 +	depends on MACH_APF27
@@ -117,8 +120,8 @@ Index: linux-2.6.36/arch/arm/mach-imx/Kconfig
  endif
 Index: linux-2.6.36/arch/arm/mach-imx/Makefile
 ===================================================================
---- linux-2.6.36.orig/arch/arm/mach-imx/Makefile	2010-11-08 16:43:19.000000000 +0100
-+++ linux-2.6.36/arch/arm/mach-imx/Makefile	2010-11-08 16:43:26.000000000 +0100
+--- linux-2.6.36.orig/arch/arm/mach-imx/Makefile	2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/arm/mach-imx/Makefile	2010-11-25 15:29:44.000000000 +0100
 @@ -31,3 +31,7 @@
  obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o
  obj-$(CONFIG_MACH_PCA100) += mach-pca100.o


hooks/post-receive
-- 
armadeus