[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-293-g013cc3e

[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  013cc3e204fb97667dc9ef0c563599743e537dd0 (commit)
       via  9eafdf7dfa61fd96fcbb2ce6eb5fb194ec2bcb78 (commit)
      from  532662d1142719b90f7ccd1c381e4b7015d8e6a4 (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 013cc3e204fb97667dc9ef0c563599743e537dd0
Merge: 9eafdf7dfa61fd96fcbb2ce6eb5fb194ec2bcb78 532662d1142719b90f7ccd1c381e4b7015d8e6a4
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Feb 9 10:48:50 2011 +0100

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

commit 9eafdf7dfa61fd96fcbb2ce6eb5fb194ec2bcb78
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Feb 9 10:48:19 2011 +0100

    [buildroot][kernel] Update config files for buildroot 2010.11 and kernel 2.6.38-rc3

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

Summary of changes:
 buildroot/configs/apf51_defconfig                  |   12 +++++-------
 .../armadeus/apf51/apf51-linux-2.6.38.config       |   16 +++++++++++++++-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 1a1bdce..f45af9e 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -1,9 +1,9 @@
 #
 # Automatically generated make config: don't edit
-# Thu Feb  3 14:38:43 2011
+# Buildroot version: 2010.11-00288-g974fb11-dirty
+# Tue Feb  8 18:54:12 2011
 #
 BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="2010.11-git"
 BR2_arm=y
 # BR2_armeb is not set
 # BR2_avr32 is not set
@@ -134,11 +134,6 @@ BR2_OPTIMIZE_S=y
 # BR2_HAVE_DEVFILES is not set
 
 #
-# Advanced
-#
-BR2_CONFIG_CACHE=y
-
-#
 # Toolchain
 #
 BR2_TOOLCHAIN_BUILDROOT=y
@@ -592,6 +587,7 @@ BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_FREETYPE is not set
 # BR2_PACKAGE_JPEG is not set
 # BR2_PACKAGE_LIBART is not set
+# BR2_PACKAGE_GDK_PIXBUF is not set
 # BR2_PACKAGE_LIBPNG is not set
 # BR2_PACKAGE_LIBSVGTINY is not set
 # BR2_PACKAGE_LIBUNGIF is not set
@@ -786,6 +782,8 @@ BR2_PACKAGE_NANO=y
 #
 BR2_ROOTFS_POST_BUILD_SCRIPT=""
 BR2_ROOTFS_DEVICE_TABLE="target/device/armadeus/rootfs/device_table.txt"
+BR2_ROOTFS_SKELETON_DEFAULT=y
+# BR2_ROOTFS_SKELETON_CUSTOM is not set
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 # BR2_TARGET_ROOTFS_EXT2 is not set
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
index 61b5e1f..769dc4f 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/arm 2.6.38-rc3 Kernel Configuration
-# Thu Feb  3 22:16:23 2011
+# Wed Feb  9 10:02:33 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -984,6 +984,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_QT602240 is not set
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_TSC2102 is not set
 CONFIG_TOUCHSCREEN_WM831X=m
 # CONFIG_TOUCHSCREEN_WM97XX is not set
 # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
@@ -1115,6 +1116,7 @@ CONFIG_SPI_IMX=y
 #
 CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_TSC2102 is not set
 
 #
 # PPS support
@@ -1187,6 +1189,7 @@ CONFIG_HWMON=m
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_AS1531 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -1400,6 +1403,7 @@ CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_LOGO_ARMADEUS_CLUT224=y
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -1641,6 +1645,16 @@ CONFIG_USB_OTG_UTILS=y
 # CONFIG_USB_GPIO_VBUS is not set
 CONFIG_USB_ULPI=y
 # CONFIG_NOP_USB_XCEIV is not set
+
+#
+# Armadeus specific drivers
+#
+# CONFIG_ARMADEUS_DRIVERS is not set
+
+#
+# FPGA Drivers 
+#
+# CONFIG_ARMADEUS_FPGA_DRIVERS is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set


hooks/post-receive
-- 
armadeus