[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2466-g0293ac6

[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  0293ac6c7838fce49f1271adabea5278045ae4f6 (commit)
       via  e1b54db7c16cbdf9748cf0b66c1ec4a56f04ed7d (commit)
      from  9cd033758d1ab7b107626963a391e1ddd189d1c0 (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 0293ac6c7838fce49f1271adabea5278045ae4f6
Merge: e1b54db 9cd0337
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Aug 9 09:30:52 2011 +0200

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

commit e1b54db7c16cbdf9748cf0b66c1ec4a56f04ed7d
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Aug 9 09:30:11 2011 +0200

    [linux] update pps and apf9328 config for new fpga drivers

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

Summary of changes:
 .../armadeus/apf9328/apf9328-linux-2.6.29.config   |   11 ++++++++---
 .../device/armadeus/pps/pps-linux-2.6.29.config    |   12 ++++++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

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 e368f95..819da46 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
-# Wed Jun 15 14:11:19 2011
+# Tue Aug  9 09:23:34 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1215,9 +1215,14 @@ CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
 # Others drivers for the FPGA
 #
 # CONFIG_ARMADEUS_I2C_OCORE_IRQMNG is not set
-CONFIG_ARMADEUS_PS2KBD_DRIVER=m
-# CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS is not set
+# CONFIG_ARMADEUS_PS2KBD_DRIVER is not set
+
+#
+# Specific designs
+#
+# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
 # CONFIG_POD_DRIVERS is not set
+# CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS is not set
 
 #
 # Handheld related
diff --git a/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config b/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
index 92bbaef..52ce477 100644
--- a/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29.6
-# Tue Jun 21 18:13:55 2011
+# Tue Aug  9 09:09:19 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1447,8 +1447,16 @@ CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
 #
 # CONFIG_ARMADEUS_I2C_OCORE_IRQMNG is not set
 # CONFIG_ARMADEUS_PS2KBD_DRIVER is not set
-# CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS is not set
+
+#
+# Specific designs
+#
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS=y
+# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_IRQ_MNGR is not set
+# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON is not set
+# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED is not set
 # CONFIG_POD_DRIVERS is not set
+# CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS is not set
 
 #
 # Handheld related


hooks/post-receive
-- 
armadeus