[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2449-g6d44a50
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2449-g6d44a50
|
From: Fabien M <fa...@us...> - 2011-08-05 09:59:39
|
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 6d44a5042a2864677164d1f1cf7e4ea05d77deec (commit)
via 3e9022f46383bc17ceac0227950b986ba5c2f2f4 (commit)
via 30eaa1570d3c5f1440381ba8ca2ce965c01cd38d (commit)
from 2d4dde646bd4b5b19c808b025242da5d558ff0d9 (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 6d44a5042a2864677164d1f1cf7e4ea05d77deec
Merge: 3e9022f46383bc17ceac0227950b986ba5c2f2f4 2d4dde646bd4b5b19c808b025242da5d558ff0d9
Author: Fabien Marteau <fab...@ar...>
Date: Fri Aug 5 11:59:03 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 3e9022f46383bc17ceac0227950b986ba5c2f2f4
Author: Fabien Marteau <fab...@ar...>
Date: Fri Aug 5 11:58:42 2011 +0200
[linux][fpga] fix somes bugs in virtual components
commit 30eaa1570d3c5f1440381ba8ca2ce965c01cd38d
Author: Fabien Marteau <fab...@ar...>
Date: Fri Aug 5 11:58:10 2011 +0200
[linux][fpga] Make wishbone example working
-----------------------------------------------------------------------
Summary of changes:
.../fpga/board_designs/wishbone_example/Makefile | 2 +-
.../wishbone_example/wb_button/Makefile | 4 ++--
.../wishbone_example/wb_button/board_buttons.c | 2 +-
.../wishbone_example/wb_irq_mngr/Makefile | 4 +++-
.../wishbone_example/wb_irq_mngr/board_irq_mng.c | 2 +-
.../board_designs/wishbone_example/wb_led/Makefile | 3 ++-
.../wishbone_example/wb_led/board_leds.c | 2 +-
.../fpga/virtual_components/button/Makefile | 18 ++++++++++++++++--
.../fpga/virtual_components/button/testbutton.c | 4 ++--
.../modules/fpga/virtual_components/led/Makefile | 15 +++++++++++++++
10 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
index 7ecb740..7300da2 100644
--- a/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
@@ -8,7 +8,7 @@
ifneq ($(KERNELRELEASE),)
# Part executed when called from kernel build system:
-obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS) += wb_button/ wb_irq_mngr/ wb_led/
+obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE) += wb_button/ wb_irq_mngr/ wb_led/
else
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
index cd2f2e0..3dae375 100755
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
@@ -4,8 +4,8 @@
ifneq ($(KERNELRELEASE),)
-obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_BUTTON_DRIVER) += board_buttons.o gbutton.o
-
+obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_BUTTON_DRIVER) += wb_example_buttons.o
+wb_example_buttons-objs := board_buttons.o
else
ARMADEUS_BASE_DIR=../../../../../..
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/board_buttons.c b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/board_buttons.c
index 0b70a8b..4223932 100644
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/board_buttons.c
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/board_buttons.c
@@ -32,7 +32,7 @@
# include <mach/fpga.h>
#endif
-#include "button.h"
+#include "../../../virtual_components/button/button.h"
#define BUTTON0_IRQ IRQ_FPGA(0)
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile
index e7313e2..35693be 100755
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile
@@ -6,7 +6,9 @@ ifneq ($(KERNELRELEASE),)
# Part executed when called from kernel build system:
-obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER) += board_irq_mng.o test.o
+obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER) += wb_example_irq_mngr.o
+wb_example_irq_mngr-objs := board_irq_mng.o
+
else
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/board_irq_mng.c b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/board_irq_mng.c
index 039f190..0727225 100644
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/board_irq_mng.c
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/board_irq_mng.c
@@ -34,7 +34,7 @@
# include <mach/fpga.h>
#endif
-#include "irq_mng.h"
+#include "../../../virtual_components/irq_mngr/irq_mng.h"
static struct resource irq_mng0_resources[] = {
[0] = {
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
index 9653ff8..eae0571 100755
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
@@ -4,7 +4,8 @@
ifneq ($(KERNELRELEASE),)
-obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_LED_DRIVER) += board_leds.o g_led.o
+obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_LED_DRIVER) += wb_example_led.o
+wb_example_led-objs := board_leds.o
else
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/board_leds.c b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/board_leds.c
index 1b106b9..c4c4384 100644
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/board_leds.c
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/board_leds.c
@@ -31,7 +31,7 @@
# include <mach/fpga.h>
#endif
-#include "led.h"
+#include "../../../virtual_components/led/led.h"
static struct resource led0_resources[] = {
[0] = {
diff --git a/target/linux/modules/fpga/virtual_components/button/Makefile b/target/linux/modules/fpga/virtual_components/button/Makefile
index a36fde2..d4bde09 100755
--- a/target/linux/modules/fpga/virtual_components/button/Makefile
+++ b/target/linux/modules/fpga/virtual_components/button/Makefile
@@ -1,4 +1,18 @@
+#
+# Makefile for the Armadeus FPGA button driver
+#
+
+obj-$(CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON) += button_ocore.o
+button_ocore-objs := gbutton.o
+
+ARMADEUS_BASE_DIR=../../../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+KDIR := $(ARMADEUS_LINUX_DIR)
+PWD := $(shell pwd)
+
+test:
+ $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc -Wall testbutton.c -o testbutton
+ chmod 755 testbutton
-obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_BUTTON_DRIVER) += button_ocore.o
-button_ocore-objs := gbutton.c
diff --git a/target/linux/modules/fpga/virtual_components/button/testbutton.c b/target/linux/modules/fpga/virtual_components/button/testbutton.c
index c7d8960..2a4ca7a 100644
--- a/target/linux/modules/fpga/virtual_components/button/testbutton.c
+++ b/target/linux/modules/fpga/virtual_components/button/testbutton.c
@@ -22,11 +22,11 @@
#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <signal.h>
-
int fd_button;
void quit(int signal)
@@ -45,7 +45,7 @@ void usage(char *prog_name)
int main(int argc, char *argv[])
{
- unsigned short i, value=0;
+ unsigned short value=0;
int count=0, max_count=0;
/* quit when Ctrl-C is pressed */
diff --git a/target/linux/modules/fpga/virtual_components/led/Makefile b/target/linux/modules/fpga/virtual_components/led/Makefile
index be6e091..06eb19b 100644
--- a/target/linux/modules/fpga/virtual_components/led/Makefile
+++ b/target/linux/modules/fpga/virtual_components/led/Makefile
@@ -1,3 +1,18 @@
+#
+# Makefile for the Armadeus FPGA led driver
+#
obj-$(CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED) := led_ocore.o
led_ocore-objs := g_led.o
+
+ARMADEUS_BASE_DIR=../../../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+KDIR := $(ARMADEUS_LINUX_DIR)
+PWD := $(shell pwd)
+
+test:
+ $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc -Wall testled.c -o testled
+ chmod 755 testled
+
+
hooks/post-receive
--
armadeus
|
