[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-95-g86f773a

[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  86f773af1e95b541d8ee266d306ff7236c4a4e6d (commit)
       via  8f2c338ecb6857350f2d87c927219cf789d2a5b2 (commit)
       via  14f3cf261ce103667c0c61f6cd34b450a0a8d33b (commit)
      from  3168e2c50d82f184f9ed226160171a0fba792274 (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 86f773af1e95b541d8ee266d306ff7236c4a4e6d
Merge: 8f2c338ecb6857350f2d87c927219cf789d2a5b2 3168e2c50d82f184f9ed226160171a0fba792274
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Apr 29 14:50:26 2011 +0200

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

commit 8f2c338ecb6857350f2d87c927219cf789d2a5b2
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Apr 29 14:48:57 2011 +0200

    [linux][apf27] Adding bittiming calculation for can

commit 14f3cf261ce103667c0c61f6cd34b450a0a8d33b
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Apr 29 14:47:25 2011 +0200

    [buildroot][apf27] adding can utils package by default

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

Summary of changes:
 buildroot/configs/apf27_defconfig                  |    7 ++++---
 .../armadeus/apf27/apf27-linux-2.6.38.config       |    4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index a9be4e6..82d7f7b 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot version: 2010.11-00056-g54a6154
-# Mon Apr 18 09:30:00 2011
+# Buildroot version: 2010.11-00086-gfb98766-dirty
+# Fri Apr 29 14:06:28 2011
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_arm=y
@@ -659,6 +659,7 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
 #
 # BR2_PACKAGE_BMON is not set
 # BR2_PACKAGE_BRIDGE is not set
+BR2_PACKAGE_CAN_UTILS=y
 # BR2_PACKAGE_CTORRENT is not set
 # BR2_PACKAGE_CUPS is not set
 # BR2_PACKAGE_DNSMASQ is not set
@@ -684,6 +685,7 @@ BR2_PACKAGE_IPROUTE2=y
 # BR2_PACKAGE_NETSNMP is not set
 # BR2_PACKAGE_NETSTAT_NAT is not set
 # BR2_PACKAGE_NFS_UTILS is not set
+# BR2_PACKAGE_NGIRCD is not set
 BR2_PACKAGE_NTP=y
 # BR2_PACKAGE_NTP_NTPD is not set
 # BR2_PACKAGE_NTP_SNTP is not set
@@ -707,7 +709,6 @@ BR2_PACKAGE_PORTMAP=y
 # BR2_PACKAGE_SAMBA is not set
 # BR2_PACKAGE_SER2NET is not set
 # BR2_PACKAGE_SOCAT is not set
-# BR2_PACKAGE_SOCKETCAN is not set
 # BR2_PACKAGE_SPAWN_FCGI is not set
 # BR2_PACKAGE_SQUID is not set
 # BR2_PACKAGE_TCPDUMP is not set
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
index 23c1431..20146f3 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/arm 2.6.38.1 Kernel Configuration
-# Fri Apr  1 16:25:18 2011
+# Fri Apr 29 14:10:32 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -532,7 +532,7 @@ CONFIG_CAN_BCM=m
 CONFIG_CAN_VCAN=m
 # CONFIG_CAN_SLCAN is not set
 CONFIG_CAN_DEV=m
-# CONFIG_CAN_CALC_BITTIMING is not set
+CONFIG_CAN_CALC_BITTIMING=y
 CONFIG_CAN_MCP251X=m
 # CONFIG_CAN_SJA1000 is not set
 


hooks/post-receive
-- 
armadeus