[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2439-g6657191
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2439-g6657191
|
From: Fabien M <fa...@us...> - 2011-08-04 13:23:37
|
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 66571915d40dce235e02367e8f84bcdb7783d1d4 (commit)
via d107d99916568bb157771f7861408b8160f792d4 (commit)
via d0dfa56faff7be676a18022fe971e1943557bbdf (commit)
from 333981e0726e7951c79a9e54bdb91bc039546e7d (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 66571915d40dce235e02367e8f84bcdb7783d1d4
Merge: d107d99916568bb157771f7861408b8160f792d4 333981e0726e7951c79a9e54bdb91bc039546e7d
Author: Fabien Marteau <fab...@ar...>
Date: Thu Aug 4 15:19:44 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit d107d99916568bb157771f7861408b8160f792d4
Author: Fabien Marteau <fab...@ar...>
Date: Thu Aug 4 15:11:53 2011 +0200
[linux][fpga] change structure of fpga drivers directory, work for twin_uarts
commit d0dfa56faff7be676a18022fe971e1943557bbdf
Author: Fabien Marteau <fab...@ar...>
Date: Thu Aug 4 08:34:57 2011 +0200
[linux][kconfig] Adding star completion capability
-----------------------------------------------------------------------
Summary of changes:
..._star_completion_for_source_in_menuconfig.patch | 80 ++++++++++++++++++++
target/linux/modules/fpga/Kconfig | 11 ++-
target/linux/modules/fpga/Makefile | 2 +-
target/linux/modules/fpga/POD/Kconfig | 13 ++--
target/linux/modules/fpga/POD/void/Kconfig | 7 ++
target/linux/modules/fpga/board_designs/Kconfig | 13 +++
target/linux/modules/fpga/board_designs/Makefile | 3 +
.../modules/fpga/board_designs/twin_uart/Kconfig | 12 +++
.../modules/fpga/board_designs/twin_uart/Makefile | 3 +
.../fpga/board_designs/twin_uart/irq_mngr/Kconfig | 8 ++
.../fpga/board_designs/twin_uart/irq_mngr/Makefile | 2 +
.../twin_uart/irq_mngr/twin_uarts_irq_mng.c} | 2 +-
.../twin_uart/uarts}/16750.c | 0
.../fpga/board_designs/twin_uart/uarts/Kconfig | 11 +++
.../fpga/board_designs/twin_uart/uarts/Makefile | 4 +
.../fpga/board_designs/wishbone_example/Kconfig | 18 +++++
.../{ => board_designs}/wishbone_example/Makefile | 2 +-
.../wishbone_example/push-led.c | 0
.../wishbone_example/wb_button/.gitignore | 0
.../wishbone_example/wb_button/Kconfig | 9 ++
.../wishbone_example/wb_button/Makefile | 0
.../wishbone_example/wb_button/board_buttons.c | 0
.../wishbone_example/wb_irq_mngr/Kconfig | 14 ++++
.../wishbone_example/wb_irq_mngr/Makefile | 3 +-
.../wishbone_example/wb_irq_mngr/board_irq_mng.c | 0
.../board_designs/wishbone_example/wb_led/Kconfig | 8 ++
.../wishbone_example/wb_led/Makefile | 0
.../wishbone_example/wb_led/board_leds.c | 0
.../linux/modules/fpga/virtual_components/Kconfig | 11 +++
.../linux/modules/fpga/virtual_components/Makefile | 3 +
.../modules/fpga/virtual_components/button/Kconfig | 8 ++
.../fpga/virtual_components/button/Makefile | 4 +
.../button}/button.h | 0
.../button}/gbutton.c | 0
.../button}/testbutton.c | 0
.../fpga/virtual_components/irq_mngr/Kconfig | 8 ++
.../fpga/virtual_components/irq_mngr/Makefile | 4 +
.../irq_mngr}/irq_mng.h | 0
.../irq_mngr}/main.c | 0
.../irq_mngr}/test.c | 0
.../modules/fpga/virtual_components/led/Kconfig | 7 ++
.../modules/fpga/virtual_components/led/Makefile | 3 +
.../wb_led => virtual_components/led}/g_led.c | 0
.../wb_led => virtual_components/led}/led.h | 0
.../wb_led => virtual_components/led}/s_led.c | 0
.../wb_led => virtual_components/led}/testled.c | 0
target/linux/modules/fpga/wishbone_example/Kconfig | 18 -----
.../fpga/wishbone_example/wb_button/Kconfig | 8 --
.../fpga/wishbone_example/wb_irq_mngr/Kconfig | 14 ----
.../fpga/wishbone_example/wb_irq_mngr/README | 8 --
.../modules/fpga/wishbone_example/wb_led/Kconfig | 9 --
.../linux/modules/fpga/wishbone_twin_uart/Kconfig | 8 --
.../linux/modules/fpga/wishbone_twin_uart/Makefile | 24 ------
.../linux/modules/fpga/wishbone_twin_uart/README | 8 --
54 files changed, 257 insertions(+), 113 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
create mode 100644 target/linux/modules/fpga/POD/void/Kconfig
create mode 100644 target/linux/modules/fpga/board_designs/Kconfig
create mode 100644 target/linux/modules/fpga/board_designs/Makefile
create mode 100644 target/linux/modules/fpga/board_designs/twin_uart/Kconfig
create mode 100644 target/linux/modules/fpga/board_designs/twin_uart/Makefile
create mode 100644 target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/Kconfig
create mode 100644 target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/Makefile
copy target/linux/modules/fpga/{wishbone_example/wb_irq_mngr/board_irq_mng.c => board_designs/twin_uart/irq_mngr/twin_uarts_irq_mng.c} (97%)
rename target/linux/modules/fpga/{wishbone_twin_uart => board_designs/twin_uart/uarts}/16750.c (100%)
create mode 100644 target/linux/modules/fpga/board_designs/twin_uart/uarts/Kconfig
create mode 100644 target/linux/modules/fpga/board_designs/twin_uart/uarts/Makefile
create mode 100644 target/linux/modules/fpga/board_designs/wishbone_example/Kconfig
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/Makefile (99%)
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/push-led.c (100%)
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/wb_button/.gitignore (100%)
create mode 100644 target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Kconfig
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/wb_button/Makefile (100%)
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/wb_button/board_buttons.c (100%)
create mode 100644 target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Kconfig
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/wb_irq_mngr/Makefile (76%)
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/wb_irq_mngr/board_irq_mng.c (100%)
create mode 100644 target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Kconfig
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/wb_led/Makefile (100%)
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/wb_led/board_leds.c (100%)
create mode 100644 target/linux/modules/fpga/virtual_components/Kconfig
create mode 100644 target/linux/modules/fpga/virtual_components/Makefile
create mode 100644 target/linux/modules/fpga/virtual_components/button/Kconfig
create mode 100755 target/linux/modules/fpga/virtual_components/button/Makefile
rename target/linux/modules/fpga/{wishbone_example/wb_button => virtual_components/button}/button.h (100%)
rename target/linux/modules/fpga/{wishbone_example/wb_button => virtual_components/button}/gbutton.c (100%)
rename target/linux/modules/fpga/{wishbone_example/wb_button => virtual_components/button}/testbutton.c (100%)
create mode 100644 target/linux/modules/fpga/virtual_components/irq_mngr/Kconfig
create mode 100644 target/linux/modules/fpga/virtual_components/irq_mngr/Makefile
rename target/linux/modules/fpga/{wishbone_example/wb_irq_mngr => virtual_components/irq_mngr}/irq_mng.h (100%)
rename target/linux/modules/fpga/{wishbone_example/wb_irq_mngr => virtual_components/irq_mngr}/main.c (100%)
rename target/linux/modules/fpga/{wishbone_example/wb_irq_mngr => virtual_components/irq_mngr}/test.c (100%)
create mode 100644 target/linux/modules/fpga/virtual_components/led/Kconfig
create mode 100644 target/linux/modules/fpga/virtual_components/led/Makefile
rename target/linux/modules/fpga/{wishbone_example/wb_led => virtual_components/led}/g_led.c (100%)
rename target/linux/modules/fpga/{wishbone_example/wb_led => virtual_components/led}/led.h (100%)
rename target/linux/modules/fpga/{wishbone_example/wb_led => virtual_components/led}/s_led.c (100%)
rename target/linux/modules/fpga/{wishbone_example/wb_led => virtual_components/led}/testled.c (100%)
delete mode 100644 target/linux/modules/fpga/wishbone_example/Kconfig
delete mode 100644 target/linux/modules/fpga/wishbone_example/wb_button/Kconfig
delete mode 100644 target/linux/modules/fpga/wishbone_example/wb_irq_mngr/Kconfig
delete mode 100644 target/linux/modules/fpga/wishbone_example/wb_irq_mngr/README
delete mode 100644 target/linux/modules/fpga/wishbone_example/wb_led/Kconfig
delete mode 100644 target/linux/modules/fpga/wishbone_twin_uart/Kconfig
delete mode 100644 target/linux/modules/fpga/wishbone_twin_uart/Makefile
delete mode 100644 target/linux/modules/fpga/wishbone_twin_uart/README
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
new file mode 100644
index 0000000..3bb971c
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
@@ -0,0 +1,80 @@
+Index: linux-2.6.38.1/scripts/kconfig/zconf.tab.c_shipped
+===================================================================
+--- linux-2.6.38.1.orig/scripts/kconfig/zconf.tab.c_shipped 2011-03-23 21:04:47.000000000 +0100
++++ linux-2.6.38.1/scripts/kconfig/zconf.tab.c_shipped 2011-08-04 09:13:16.000000000 +0200
+@@ -87,6 +87,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdbool.h>
++#include <dirent.h>
++#include <sys/stat.h>
+
+ #define LKC_DIRECT_LINK
+ #include "lkc.h"
+@@ -95,6 +97,7 @@
+
+ #define PRINTD 0x0001
+ #define DEBUG_PARSE 0x0002
++#define BUFF_SIZE 300
+
+ int cdebug = PRINTD;
+
+@@ -108,6 +111,26 @@
+
+ static struct menu *current_menu, *current_entry;
+
++
++int isDir(const char *fullpath, const char *dname) {
++ struct stat sbuf;
++
++ if (*dname == '.')
++ return 0;
++
++ if (lstat(fullpath, &sbuf) == -1) {
++ fprintf(stderr, "lstat() Failed.\n");
++ return 0;
++ }
++
++ if(S_ISDIR(sbuf.st_mode)) {
++ return 1;
++ }
++
++return 0;
++}
++
++
+ #define YYDEBUG 0
+ #if YYDEBUG
+ #define YYERROR_VERBOSE
+@@ -1897,8 +1920,30 @@
+ case 83:
+
+ {
++ char *name;
++ char *ptr;
++ char dirname[BUFF_SIZE];
++ char filename[BUFF_SIZE];
++ struct dirent *lecture;
++ DIR *rep;
++
+ printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
+- zconf_nextfile((yyvsp[(2) - (3)].string));
++ name = (yyvsp[(2) -(3)].string);
++ ptr = strchr(name, '*');
++ if(ptr != NULL) {
++ *ptr = '\0';
++ snprintf(dirname, BUFF_SIZE, "%s/%s", getenv(SRCTREE), name);
++ rep = opendir(dirname);
++ while ((lecture = readdir(rep))) {
++ snprintf(filename, BUFF_SIZE, "%s/%s/%s", getenv(SRCTREE), name, lecture->d_name);
++ if(isDir(filename, lecture->d_name)){
++ snprintf(filename, BUFF_SIZE, "%s/%s/%s/%s", getenv(SRCTREE), name, lecture->d_name, ptr+1);
++ zconf_nextfile(filename);
++ }
++ }
++ } else {
++ zconf_nextfile((yyvsp[(2) - (3)].string));
++ }
+ ;}
+ break;
+
diff --git a/target/linux/modules/fpga/Kconfig b/target/linux/modules/fpga/Kconfig
index fa1dca1..dcb8ecc 100644
--- a/target/linux/modules/fpga/Kconfig
+++ b/target/linux/modules/fpga/Kconfig
@@ -9,17 +9,18 @@ config ARMADEUS_FPGA_DRIVERS
boolean "Support FPGA specific drivers"
default n
---help---
- All drivers for FPGA components
-
+ All drivers for FPGA components
+
source "drivers/armadeus/fpga/dev_tools/Kconfig"
source "drivers/armadeus/fpga/others/Kconfig"
-source "drivers/armadeus/fpga/wishbone_example/Kconfig"
-
-source "drivers/armadeus/fpga/wishbone_twin_uart/Kconfig"
+comment "Specific designs"
+ depends on ARMADEUS_FPGA_DRIVERS
+source "drivers/armadeus/fpga/virtual_components/Kconfig"
source "drivers/armadeus/fpga/POD/Kconfig"
+source "drivers/armadeus/fpga/board_designs/Kconfig"
endmenu
diff --git a/target/linux/modules/fpga/Makefile b/target/linux/modules/fpga/Makefile
index 5a71fb7..6352c4e 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/ wishbone_twin_uart/
+obj-$(CONFIG_ARMADEUS_FPGA_DRIVERS) += dev_tools/ others/ POD/ board_designs/ virtual_components/
else
diff --git a/target/linux/modules/fpga/POD/Kconfig b/target/linux/modules/fpga/POD/Kconfig
index cf2bfef..d06d0c5 100644
--- a/target/linux/modules/fpga/POD/Kconfig
+++ b/target/linux/modules/fpga/POD/Kconfig
@@ -3,12 +3,13 @@
# Armadeus custom drivers configuration
#
#
-
+
#
config POD_DRIVERS
- tristate "Drivers generated by POD"
- default n
- depends on ARMADEUS_FPGA_DRIVERS
- ---help---
- All drivers for FPGA components
+ boolean "Board driver generated by POD"
+ default n
+ depends on ARMADEUS_FPGA_DRIVERS
+ ---help---
+ All POD drivers
+source "drivers/armadeus/fpga/POD/*/Kconfig"
diff --git a/target/linux/modules/fpga/POD/void/Kconfig b/target/linux/modules/fpga/POD/void/Kconfig
new file mode 100644
index 0000000..c6dc402
--- /dev/null
+++ b/target/linux/modules/fpga/POD/void/Kconfig
@@ -0,0 +1,7 @@
+config ARMADEUS_FPGA_VOID_DRIVER
+ boolean "useless"
+ default n
+ depends on POD_DRIVERS
+ ---help---
+ useless
+
diff --git a/target/linux/modules/fpga/board_designs/Kconfig b/target/linux/modules/fpga/board_designs/Kconfig
new file mode 100644
index 0000000..bf7fa8b
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/Kconfig
@@ -0,0 +1,13 @@
+#
+# Armadeus custom drivers configuration
+#
+
+config ARMADEUS_FPGA_BOARD_DESIGNS
+ boolean "Board designs"
+ default n
+ depends on ARMADEUS_FPGA_DRIVERS
+ ---help---
+ Board support for fpga designs
+
+source "drivers/armadeus/fpga/board_designs/*/Kconfig"
+
diff --git a/target/linux/modules/fpga/board_designs/Makefile b/target/linux/modules/fpga/board_designs/Makefile
new file mode 100644
index 0000000..575dc2e
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/Makefile
@@ -0,0 +1,3 @@
+
+obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS) += twin_uart/ wishbone_example/
+
diff --git a/target/linux/modules/fpga/board_designs/twin_uart/Kconfig b/target/linux/modules/fpga/board_designs/twin_uart/Kconfig
new file mode 100644
index 0000000..dbf5ed3
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/twin_uart/Kconfig
@@ -0,0 +1,12 @@
+
+config ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS
+ boolean "board drivers for twin uarts design"
+ default n
+ depends on ARMADEUS_FPGA_BOARD_DESIGNS && MACH_APF51
+ select ARMADEUS_FPGA_VIRTUAL_COMPONENTS
+ ---help---
+ Board support for fpga designs twin uarts used
+ for gsm/gps on apf51Dev board.
+
+source "drivers/armadeus/fpga/board_designs/twin_uart/uarts/Kconfig"
+source "drivers/armadeus/fpga/board_designs/twin_uart/irq_mngr/Kconfig"
diff --git a/target/linux/modules/fpga/board_designs/twin_uart/Makefile b/target/linux/modules/fpga/board_designs/twin_uart/Makefile
new file mode 100644
index 0000000..dc6ce5d
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/twin_uart/Makefile
@@ -0,0 +1,3 @@
+
+obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS) += irq_mngr/ uarts/
+
diff --git a/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/Kconfig b/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/Kconfig
new file mode 100644
index 0000000..2bddbd1
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/Kconfig
@@ -0,0 +1,8 @@
+
+config ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS_IRQ_MNGR
+ tristate "board irq manager"
+ default n
+ depends on ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS
+ select ARMADEUS_FPGA_VIRTUAL_COMPONENTS_IRQ_MNGR
+ ---help---
+ irq manager board
diff --git a/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/Makefile b/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/Makefile
new file mode 100644
index 0000000..2de4e83
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/Makefile
@@ -0,0 +1,2 @@
+
+obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS_IRQ_MNGR) += twin_uarts_irq_mng.o
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/board_irq_mng.c b/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/twin_uarts_irq_mng.c
similarity index 97%
copy from target/linux/modules/fpga/wishbone_example/wb_irq_mngr/board_irq_mng.c
copy to target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/twin_uarts_irq_mng.c
index 039f190..0727225 100644
--- a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/board_irq_mng.c
+++ b/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/twin_uarts_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/wishbone_twin_uart/16750.c b/target/linux/modules/fpga/board_designs/twin_uart/uarts/16750.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_twin_uart/16750.c
rename to target/linux/modules/fpga/board_designs/twin_uart/uarts/16750.c
diff --git a/target/linux/modules/fpga/board_designs/twin_uart/uarts/Kconfig b/target/linux/modules/fpga/board_designs/twin_uart/uarts/Kconfig
new file mode 100644
index 0000000..bf66376
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/twin_uart/uarts/Kconfig
@@ -0,0 +1,11 @@
+
+config ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS_UARTS
+ tristate "board twin uarts"
+ default n
+ depends on ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS
+ select SERIAL_8250
+ ---help---
+ Board support for fpga designs twin uarts used
+ for gsm/gps on apf51Dev board.
+ If selected as module, it will be named :
+ twin_uarts_16750
diff --git a/target/linux/modules/fpga/board_designs/twin_uart/uarts/Makefile b/target/linux/modules/fpga/board_designs/twin_uart/uarts/Makefile
new file mode 100644
index 0000000..8854d2e
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/twin_uart/uarts/Makefile
@@ -0,0 +1,4 @@
+
+obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS_UARTS) += twin_uarts_16750.o
+twin_uarts_16750-objs := 16750.o
+
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/Kconfig b/target/linux/modules/fpga/board_designs/wishbone_example/Kconfig
new file mode 100644
index 0000000..515e136
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/Kconfig
@@ -0,0 +1,18 @@
+
+#
+# Armadeus custom drivers configuration
+
+#
+config ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE
+ boolean "board drivers for wishbone example"
+ default n
+ depends on ARMADEUS_FPGA_BOARD_DESIGNS
+ select ARMADEUS_FPGA_VIRTUAL_COMPONENTS
+ ---help---
+ Drivers used for wishbone example design that can be
+ found in firmware/wishbone_example/
+
+source "drivers/armadeus/fpga/board_designs/wishbone_example/wb_button/Kconfig"
+source "drivers/armadeus/fpga/board_designs/wishbone_example/wb_led/Kconfig"
+source "drivers/armadeus/fpga/board_designs/wishbone_example/wb_irq_mngr/Kconfig"
+
diff --git a/target/linux/modules/fpga/wishbone_example/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
similarity index 99%
rename from target/linux/modules/fpga/wishbone_example/Makefile
rename to target/linux/modules/fpga/board_designs/wishbone_example/Makefile
index e127302..7ecb740 100644
--- a/target/linux/modules/fpga/wishbone_example/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
@@ -9,7 +9,7 @@ ifneq ($(KERNELRELEASE),)
# Part executed when called from kernel build system:
obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS) += wb_button/ wb_irq_mngr/ wb_led/
-
+
else
# Armadeus custom drivers common targets (default, clean, etc...)
diff --git a/target/linux/modules/fpga/wishbone_example/push-led.c b/target/linux/modules/fpga/board_designs/wishbone_example/push-led.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/push-led.c
rename to target/linux/modules/fpga/board_designs/wishbone_example/push-led.c
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/.gitignore b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/.gitignore
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_button/.gitignore
rename to target/linux/modules/fpga/board_designs/wishbone_example/wb_button/.gitignore
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Kconfig b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Kconfig
new file mode 100644
index 0000000..435a6cb
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Kconfig
@@ -0,0 +1,9 @@
+#
+#
+
+config ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_BUTTON_DRIVER
+ tristate "board Button"
+ default n
+ depends on ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE
+ select ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON
+ ---help---
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_button/Makefile
rename to target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/board_buttons.c b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/board_buttons.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_button/board_buttons.c
rename to target/linux/modules/fpga/board_designs/wishbone_example/wb_button/board_buttons.c
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Kconfig b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Kconfig
new file mode 100644
index 0000000..71c0509
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Kconfig
@@ -0,0 +1,14 @@
+
+#
+# Armadeus custom drivers configuration
+#
+#
+
+#
+config ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER
+ tristate "board irq"
+ default n
+ depends on ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE
+ select ARMADEUS_FPGA_VIRTUAL_COMPONENTS_IRQ_MNGR
+ ---help---
+
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile
similarity index 76%
rename from target/linux/modules/fpga/wishbone_example/wb_irq_mngr/Makefile
rename to target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile
index db8e79c..e7313e2 100755
--- a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile
@@ -6,8 +6,7 @@ ifneq ($(KERNELRELEASE),)
# Part executed when called from kernel build system:
-obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER) += irq_ocore.o board_irq_mng.o test.o
-irq_ocore-objs := main.o
+obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER) += board_irq_mng.o test.o
else
diff --git a/target/linux/modules/fpga/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
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_irq_mngr/board_irq_mng.c
rename to target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/board_irq_mng.c
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Kconfig b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Kconfig
new file mode 100644
index 0000000..328cd64
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Kconfig
@@ -0,0 +1,8 @@
+
+config ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_LED_DRIVER
+ tristate "board Led"
+ default n
+ depends on ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE
+ select ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED
+ ---help---
+ blink a led
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_led/Makefile
rename to target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/board_leds.c b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/board_leds.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_led/board_leds.c
rename to target/linux/modules/fpga/board_designs/wishbone_example/wb_led/board_leds.c
diff --git a/target/linux/modules/fpga/virtual_components/Kconfig b/target/linux/modules/fpga/virtual_components/Kconfig
new file mode 100644
index 0000000..d83ee25
--- /dev/null
+++ b/target/linux/modules/fpga/virtual_components/Kconfig
@@ -0,0 +1,11 @@
+config ARMADEUS_FPGA_VIRTUAL_COMPONENTS
+ boolean "virtual components"
+ default y
+ depends on ARMADEUS_FPGA_DRIVERS
+ ---help---
+ Armadeus driver specific for virtual components
+ under FPGA.
+
+source "drivers/armadeus/fpga/virtual_components/irq_mngr/Kconfig"
+source "drivers/armadeus/fpga/virtual_components/button/Kconfig"
+source "drivers/armadeus/fpga/virtual_components/led/Kconfig"
diff --git a/target/linux/modules/fpga/virtual_components/Makefile b/target/linux/modules/fpga/virtual_components/Makefile
new file mode 100644
index 0000000..481ea2a
--- /dev/null
+++ b/target/linux/modules/fpga/virtual_components/Makefile
@@ -0,0 +1,3 @@
+
+obj-$(CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS) += button/ irq_mngr/ led/
+
diff --git a/target/linux/modules/fpga/virtual_components/button/Kconfig b/target/linux/modules/fpga/virtual_components/button/Kconfig
new file mode 100644
index 0000000..e1728b8
--- /dev/null
+++ b/target/linux/modules/fpga/virtual_components/button/Kconfig
@@ -0,0 +1,8 @@
+
+config ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON
+ tristate "button"
+ default n
+ depends on ARMADEUS_FPGA_VIRTUAL_COMPONENTS
+ ---help---
+ Armadeus driver for virtual button component.
+
diff --git a/target/linux/modules/fpga/virtual_components/button/Makefile b/target/linux/modules/fpga/virtual_components/button/Makefile
new file mode 100755
index 0000000..a36fde2
--- /dev/null
+++ b/target/linux/modules/fpga/virtual_components/button/Makefile
@@ -0,0 +1,4 @@
+
+obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_BUTTON_DRIVER) += button_ocore.o
+button_ocore-objs := gbutton.c
+
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/button.h b/target/linux/modules/fpga/virtual_components/button/button.h
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_button/button.h
rename to target/linux/modules/fpga/virtual_components/button/button.h
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/gbutton.c b/target/linux/modules/fpga/virtual_components/button/gbutton.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_button/gbutton.c
rename to target/linux/modules/fpga/virtual_components/button/gbutton.c
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/testbutton.c b/target/linux/modules/fpga/virtual_components/button/testbutton.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_button/testbutton.c
rename to target/linux/modules/fpga/virtual_components/button/testbutton.c
diff --git a/target/linux/modules/fpga/virtual_components/irq_mngr/Kconfig b/target/linux/modules/fpga/virtual_components/irq_mngr/Kconfig
new file mode 100644
index 0000000..fea81f1
--- /dev/null
+++ b/target/linux/modules/fpga/virtual_components/irq_mngr/Kconfig
@@ -0,0 +1,8 @@
+
+config ARMADEUS_FPGA_VIRTUAL_COMPONENTS_IRQ_MNGR
+ tristate "irq manager"
+ default n
+ depends on ARMADEUS_FPGA_VIRTUAL_COMPONENTS
+ ---help---
+ Armadeus driver for virtual irq_mngr component
+
diff --git a/target/linux/modules/fpga/virtual_components/irq_mngr/Makefile b/target/linux/modules/fpga/virtual_components/irq_mngr/Makefile
new file mode 100644
index 0000000..95b5889
--- /dev/null
+++ b/target/linux/modules/fpga/virtual_components/irq_mngr/Makefile
@@ -0,0 +1,4 @@
+
+obj-$(CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_IRQ_MNGR) += irq_ocore.o
+irq_ocore-objs := main.o
+
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/irq_mng.h b/target/linux/modules/fpga/virtual_components/irq_mngr/irq_mng.h
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_irq_mngr/irq_mng.h
rename to target/linux/modules/fpga/virtual_components/irq_mngr/irq_mng.h
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/main.c b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_irq_mngr/main.c
rename to target/linux/modules/fpga/virtual_components/irq_mngr/main.c
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/test.c b/target/linux/modules/fpga/virtual_components/irq_mngr/test.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_irq_mngr/test.c
rename to target/linux/modules/fpga/virtual_components/irq_mngr/test.c
diff --git a/target/linux/modules/fpga/virtual_components/led/Kconfig b/target/linux/modules/fpga/virtual_components/led/Kconfig
new file mode 100644
index 0000000..da4b498
--- /dev/null
+++ b/target/linux/modules/fpga/virtual_components/led/Kconfig
@@ -0,0 +1,7 @@
+
+config ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED
+ tristate "led"
+ default n
+ depends on ARMADEUS_FPGA_VIRTUAL_COMPONENTS
+ ---help---
+ Armadeus driver for virtual led component.
diff --git a/target/linux/modules/fpga/virtual_components/led/Makefile b/target/linux/modules/fpga/virtual_components/led/Makefile
new file mode 100644
index 0000000..be6e091
--- /dev/null
+++ b/target/linux/modules/fpga/virtual_components/led/Makefile
@@ -0,0 +1,3 @@
+
+obj-$(CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED) := led_ocore.o
+led_ocore-objs := g_led.o
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/g_led.c b/target/linux/modules/fpga/virtual_components/led/g_led.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_led/g_led.c
rename to target/linux/modules/fpga/virtual_components/led/g_led.c
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/led.h b/target/linux/modules/fpga/virtual_components/led/led.h
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_led/led.h
rename to target/linux/modules/fpga/virtual_components/led/led.h
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/s_led.c b/target/linux/modules/fpga/virtual_components/led/s_led.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_led/s_led.c
rename to target/linux/modules/fpga/virtual_components/led/s_led.c
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/testled.c b/target/linux/modules/fpga/virtual_components/led/testled.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_led/testled.c
rename to target/linux/modules/fpga/virtual_components/led/testled.c
diff --git a/target/linux/modules/fpga/wishbone_example/Kconfig b/target/linux/modules/fpga/wishbone_example/Kconfig
deleted file mode 100644
index 7751bbe..0000000
--- a/target/linux/modules/fpga/wishbone_example/Kconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#
-# Armadeus custom drivers configuration
-#
-#
-
-#
-config ARMADEUS_WISHBONE_EXAMPLE_DRIVERS
- boolean "Drivers for wishbone example"
- default n
- depends on ARMADEUS_FPGA_DRIVERS
- ---help---
- Drivers used for wishbone example design that can be
- found in firmware/wishbone_example/
-
-source "drivers/armadeus/fpga/wishbone_example/wb_button/Kconfig"
-source "drivers/armadeus/fpga/wishbone_example/wb_led/Kconfig"
-source "drivers/armadeus/fpga/wishbone_example/wb_irq_mngr/Kconfig"
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/Kconfig b/target/linux/modules/fpga/wishbone_example/wb_button/Kconfig
deleted file mode 100644
index 092db23..0000000
--- a/target/linux/modules/fpga/wishbone_example/wb_button/Kconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#
-
-config ARMADEUS_WISHBONE_EXAMPLE_BUTTON_DRIVER
- tristate "Wishbone Button driver"
- default m
- depends on ARMADEUS_WISHBONE_EXAMPLE_DRIVERS
- ---help---
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/Kconfig b/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/Kconfig
deleted file mode 100644
index 5455114..0000000
--- a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/Kconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#
-# Armadeus custom drivers configuration
-#
-#
-
-#
-config ARMADEUS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER
- tristate "IRQ manager with wishbone interface"
- default m
- depends on ARMADEUS_WISHBONE_EXAMPLE_DRIVERS
- ---help---
-
-
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/README b/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/README
deleted file mode 100644
index 5fe96a6..0000000
--- a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/README
+++ /dev/null
@@ -1,8 +0,0 @@
-To compile this driver from here:
----------------------------------
- make ARCH=arm CROSS_COMPILE=$PWD/../../../../../buildroot/build_arm/staging_dir/bin/arm-linux-
-
-To install this driver:
------------------------
-Copy resulting *.ko files on your target rootfs
-
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/Kconfig b/target/linux/modules/fpga/wishbone_example/wb_led/Kconfig
deleted file mode 100644
index 1233d7f..0000000
--- a/target/linux/modules/fpga/wishbone_example/wb_led/Kconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#
-
-config ARMADEUS_WISHBONE_EXAMPLE_LED_DRIVER
- tristate "Wishbone Led driver"
- default m
- depends on ARMADEUS_WISHBONE_EXAMPLE_DRIVERS
- ---help---
- blink a led
diff --git a/target/linux/modules/fpga/wishbone_twin_uart/Kconfig b/target/linux/modules/fpga/wishbone_twin_uart/Kconfig
deleted file mode 100644
index c727a34..0000000
--- a/target/linux/modules/fpga/wishbone_twin_uart/Kconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-config ARMADEUS_WISHBONE_TWIN_UART
- tristate "2x UARTS for APF51Dev (GSM/GPS specific)"
- default m
- depends on ARMADEUS_FPGA_DRIVERS && MACH_APF51
- ---help---
- Driver used as module to register GSM and GPS UARTs on APF51Dev.
-
- http://www.armadeus.com/wiki/index.php?title=GSM/GPRS
diff --git a/target/linux/modules/fpga/wishbone_twin_uart/Makefile b/target/linux/modules/fpga/wishbone_twin_uart/Makefile
deleted file mode 100644
index 5d319b9..0000000
--- a/target/linux/modules/fpga/wishbone_twin_uart/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Makefile for the Armadeus FPGA serial "driver" (compatible with 16750/8250 OpenCore IP)
-#
-
-ifneq ($(KERNELRELEASE),)
-
-# Part executed when called from kernel build system:
-
-obj-$(CONFIG_ARMADEUS_WISHBONE_TWIN_UART) += 16750_ocore.o
-16750_ocore-objs := 16750.o
-
-else
-
-ARMADEUS_BASE_DIR=../../../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-
-KDIR := $(ARMADEUS_LINUX_DIR)
-PWD := $(shell pwd)
-
-# Armadeus custom drivers common targets (default, clean, etc...)
-include ../../Makefile.in
-
-endif
-
diff --git a/target/linux/modules/fpga/wishbone_twin_uart/README b/target/linux/modules/fpga/wishbone_twin_uart/README
deleted file mode 100644
index 464187b..0000000
--- a/target/linux/modules/fpga/wishbone_twin_uart/README
+++ /dev/null
@@ -1,8 +0,0 @@
-To compile this driver from here:
----------------------------------
-$ make
-
-To install this driver:
------------------------
-Copy resulting *.ko files on your target rootfs
-
hooks/post-receive
--
armadeus
|
