[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-188-g8aca5c6

[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  8aca5c6b247f7e19a8f5132ab899c8f062385d46 (commit)
       via  128b112302ea1627277c4dbd22a1b13ac88573d4 (commit)
       via  f43994a51b0d7825b95a5f5faa6e3810dcf70057 (commit)
      from  5d99d2eb7e4aec301a868c7cc40942913b2d0a14 (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 8aca5c6b247f7e19a8f5132ab899c8f062385d46
Merge: 128b112302ea1627277c4dbd22a1b13ac88573d4 5d99d2eb7e4aec301a868c7cc40942913b2d0a14
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Jun 15 18:43:33 2011 +0200

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

commit 128b112302ea1627277c4dbd22a1b13ac88573d4
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Jun 15 18:42:54 2011 +0200

    [linux][configuration] adding twin uart module by default

commit f43994a51b0d7825b95a5f5faa6e3810dcf70057
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Jun 15 18:40:50 2011 +0200

    [linux][fpga][wishbone_twin_uart] kconfig avoided

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

Summary of changes:
 .../armadeus/apf51/apf51-linux-2.6.38.config       |    3 ++-
 .../linux/modules/fpga/wishbone_twin_uart/Kconfig  |    8 ++++++++
 2 files changed, 10 insertions(+), 1 deletions(-)
 create mode 100644 target/linux/modules/fpga/wishbone_twin_uart/Kconfig

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 44a29d5..5e352d2 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.1 Kernel Configuration
-# Wed Jun  1 00:30:41 2011
+# Wed Jun 15 13:59:05 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1731,6 +1731,7 @@ CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS=y
 CONFIG_ARMADEUS_WISHBONE_EXAMPLE_BUTTON_DRIVER=m
 CONFIG_ARMADEUS_WISHBONE_EXAMPLE_LED_DRIVER=m
 CONFIG_ARMADEUS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER=m
+CONFIG_ARMADEUS_WISHBONE_TWIN_UART=m
 # CONFIG_POD_DRIVERS is not set
 
 #
diff --git a/target/linux/modules/fpga/wishbone_twin_uart/Kconfig b/target/linux/modules/fpga/wishbone_twin_uart/Kconfig
new file mode 100644
index 0000000..7d58463
--- /dev/null
+++ b/target/linux/modules/fpga/wishbone_twin_uart/Kconfig
@@ -0,0 +1,8 @@
+config ARMADEUS_WISHBONE_TWIN_UART
+	tristate "2 uart for apf51dev gsm/gps specific"
+	default m
+	depends on ARMADEUS_FPGA_DRIVERS
+	---help---
+	  Driver used as module for gsm and gps uarts on apf51dev
+
+	  http://www.armadeus.com/wiki/index.php?title=GSM/GPRS


hooks/post-receive
-- 
armadeus