[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-182-g6f5a758

[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  6f5a7585f94b50c20feb0a6059de8955a8f3d32d (commit)
       via  7e301f9bb0db6fb6f395d4d80270b9dc7ecf3721 (commit)
       via  3f96b42c3ee96fb96f2d6150936d158591e2f023 (commit)
       via  c35a784eadf36412854cd5ca0248ed0159185f1e (commit)
       via  c4b371031a9334365ee7b498c63453d05347cdd5 (commit)
      from  3fc9be66df5bc01ab162b2a2ab9b16e75524c196 (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 6f5a7585f94b50c20feb0a6059de8955a8f3d32d
Merge: 7e301f9bb0db6fb6f395d4d80270b9dc7ecf3721 3fc9be66df5bc01ab162b2a2ab9b16e75524c196
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Jun 15 14:09:25 2011 +0200

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

commit 7e301f9bb0db6fb6f395d4d80270b9dc7ecf3721
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Jun 15 14:08:51 2011 +0200

    [buildroot][package][straton] adding board_name value

commit 3f96b42c3ee96fb96f2d6150936d158591e2f023
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Jun 15 14:08:06 2011 +0200

    [linux][apf51][apf51dev] Adding menu for twin uart used in fpga for gsm and gps

commit c35a784eadf36412854cd5ca0248ed0159185f1e
Merge: c4b371031a9334365ee7b498c63453d05347cdd5 63748f87b60a24b4453bcba8c859c5485fc2643a
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Jun 15 11:48:30 2011 +0200

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

commit c4b371031a9334365ee7b498c63453d05347cdd5
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Jun 10 17:04:50 2011 +0200

    change binary name

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

Summary of changes:
 buildroot/package/armadeus/straton/straton.mk      |    6 ++++--
 target/linux/modules/fpga/Kconfig                  |    2 ++
 target/linux/modules/fpga/Makefile                 |    4 ++--
 .../linux/modules/fpga/wishbone_twin_uart/Makefile |    2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/buildroot/package/armadeus/straton/straton.mk b/buildroot/package/armadeus/straton/straton.mk
index 4f2d0dd..da921d2 100644
--- a/buildroot/package/armadeus/straton/straton.mk
+++ b/buildroot/package/armadeus/straton/straton.mk
@@ -5,6 +5,7 @@
 #############################################################
 STRATON_VERSION = 0.1
 STRATON_DEPENDENCIES = as_devices
+STRATON_BIN_NAME = straton
 
 ifeq ($(BR2_PACKAGE_STRATON_DEV),y)
 STRATON_SITE=$(BR2_PACKAGE_STRATON_DEV_DIR)
@@ -20,11 +21,12 @@ STRATON_SITE_METHOD=wget
 endif
 
 define STRATON_BUILD_CMDS
-	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" STAGING_DIR="$(STAGING_DIR)" -C $(@D) all
+	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" STAGING_DIR="$(STAGING_DIR)" \
+		BOARD_NAME=$(BOARD_NAME) -C $(@D) all
 endef
 
 define STRATON_INSTALL_TARGET_CMDS
-	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/foo.d
+	$(INSTALL) -m 0755 $(STRATON_DIR)/bin/t5hmi $(TARGET_DIR)/usr/bin/$(STRATON_BIN_NAME)
 endef
 
 $(eval $(call GENTARGETS,package,straton))
diff --git a/target/linux/modules/fpga/Kconfig b/target/linux/modules/fpga/Kconfig
index 86c9939..fa1dca1 100644
--- a/target/linux/modules/fpga/Kconfig
+++ b/target/linux/modules/fpga/Kconfig
@@ -17,6 +17,8 @@ source "drivers/armadeus/fpga/others/Kconfig"
 
 source "drivers/armadeus/fpga/wishbone_example/Kconfig"
 
+source "drivers/armadeus/fpga/wishbone_twin_uart/Kconfig"
+
 source "drivers/armadeus/fpga/POD/Kconfig"
 
 endmenu
diff --git a/target/linux/modules/fpga/Makefile b/target/linux/modules/fpga/Makefile
index 905acf8..5a71fb7 100755
--- a/target/linux/modules/fpga/Makefile
+++ b/target/linux/modules/fpga/Makefile
@@ -8,7 +8,7 @@ ifneq ($(KERNELRELEASE),)
 
 # Part executed when called from kernel build system:
 
-obj-$(CONFIG_ARMADEUS_FPGA_DRIVERS)	+= dev_tools/ others/ POD/ wishbone_example/
+obj-$(CONFIG_ARMADEUS_FPGA_DRIVERS)	+= dev_tools/ others/ POD/ wishbone_example/ wishbone_twin_uart/
 
 else
 
@@ -20,7 +20,7 @@ include $(ARMADEUS_BASE_DIR)/Makefile.in
 ifeq ($(LINUX_DIR),)
 LINUX_DIR:=$(ARMADEUS_LINUX_DIR)
 endif
-KDIR	:= $(LINUX_DIR) 
+KDIR	:= $(LINUX_DIR)
 PWD	:= $(shell pwd)
 
 # Armadeus custom drivers common targets (default, clean, etc...)
diff --git a/target/linux/modules/fpga/wishbone_twin_uart/Makefile b/target/linux/modules/fpga/wishbone_twin_uart/Makefile
index 205a3f5..5d319b9 100644
--- a/target/linux/modules/fpga/wishbone_twin_uart/Makefile
+++ b/target/linux/modules/fpga/wishbone_twin_uart/Makefile
@@ -6,7 +6,7 @@ ifneq ($(KERNELRELEASE),)
 
 # Part executed when called from kernel build system:
 
-obj-$(CONFIG_SERIAL_8250)	+= 16750_ocore.o
+obj-$(CONFIG_ARMADEUS_WISHBONE_TWIN_UART)	+= 16750_ocore.o
 16750_ocore-objs	:= 16750.o
 
 else


hooks/post-receive
-- 
armadeus