[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-104-gf8a7324

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  f8a7324ed11844bbe03d47ba4bcee329bb9a88e1 (commit)
       via  cc04bae83391e4f008e7f2317e55200fc55f0d58 (commit)
       via  3276f0dbd800e9b1c3e9306d3ff35d5e2dab8705 (commit)
       via  88f83da56b20fc061384abaa7ee8e65df5c3fc0f (commit)
       via  833f8547f5c987222733668e01ef1580b7e4d7e0 (commit)
       via  4478efb8b018cf3b2888426d36bcbe5cdbcbbded (commit)
       via  7d3770f2b13fbdbe4ce526b15c7f58135080dba4 (commit)
      from  c1b487f95a5902340a7240f251731c4c5bd2de1d (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 f8a7324ed11844bbe03d47ba4bcee329bb9a88e1
Author: Victor Hiairrassary <vic...@gm...>
Date:   Wed Jan 2 19:04:13 2013 +0100

    [LINUX] cleanup custom Armadeus drivers config and make fpgaloader compiles again on > 3.7

commit cc04bae83391e4f008e7f2317e55200fc55f0d58
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 2 18:59:59 2013 +0100

    [LINUX] 3.7: add some FPGA drivers to default config and fixes build

commit 3276f0dbd800e9b1c3e9306d3ff35d5e2dab8705
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 2 18:57:15 2013 +0100

    [LINUX] 3.7: fixes build of recent commits and rename some patches

commit 88f83da56b20fc061384abaa7ee8e65df5c3fc0f
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 2 15:12:59 2013 +0100

    [LINUX] APF27/28/9328: bump Linux 3.7 support to 3.7.1

commit 833f8547f5c987222733668e01ef1580b7e4d7e0
Author: Victor Hiairrassary <vic...@gm...>
Date:   Fri Dec 28 22:30:19 2012 +0100

    Linux 3.7 is out, so remove symlinks related to linux 3.7-rc*

commit 4478efb8b018cf3b2888426d36bcbe5cdbcbbded
Author: Victor Hiairrassary <vic...@gm...>
Date:   Fri Dec 28 18:02:41 2012 +0100

    Add support for armadeus drivers on current linux release

commit 7d3770f2b13fbdbe4ce526b15c7f58135080dba4
Author: Victor Hiairrassary <vic...@gm...>
Date:   Fri Dec 28 18:02:40 2012 +0100

    Copy and paste this patch for the actual linux release

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

Summary of changes:
 .../armadeus/apf27/apf27-linux-3.7-rc6.config      |    1 -
 .../armadeus/apf27/apf27-linux-3.7-rc7.config      |    1 -
 .../armadeus/apf27/apf27-linux-3.7-rc8.config      |    1 -
 ...nux-3.7-rc4.config => apf27-linux-3.7.1.config} |    0
 .../device/armadeus/apf27/apf27-linux-3.7.config   |    6 +++
 ...nux-3.7-rc3.config => apf28-linux-3.7.1.config} |    0
 ...x-3.7-rc6.config => apf9328-linux-3.7.1.config} |    0
 patches/linux/3.7-rc4                              |    1 -
 patches/linux/3.7-rc6                              |    1 -
 patches/linux/3.7-rc7                              |    1 -
 patches/linux/3.7-rc8                              |    1 -
 patches/linux/{3.7-rc3 => 3.7.1}                   |    0
 ...50-armadeus-add_custom_drivers_to_kconfig.patch |   25 +++++++++++
 .../3.7/0201-armadeus-add_apf27dev_baseboard.patch |   45 ++++++++++----------
 .../0322-armadeus-add_mach_fpga_h.patch}           |   10 ++--
 ...star_completion_for_source_in_menuconfig.patch} |   29 +++++++------
 target/linux/modules/Kconfig                       |   30 +++----------
 target/linux/modules/fpga/Kconfig                  |   20 +++------
 target/linux/modules/fpga/board_designs/Kconfig    |    5 +-
 .../fpga/dev_tools/loader/apf27-fpga-loader.c      |    7 +++
 .../fpga/virtual_components/button/gbutton.c       |    7 +++-
 .../fpga/virtual_components/irq_mngr/main.c        |    9 +++-
 22 files changed, 108 insertions(+), 92 deletions(-)
 delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc6.config
 delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc7.config
 delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc8.config
 rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.7-rc4.config => apf27-linux-3.7.1.config} (100%)
 rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.7-rc3.config => apf28-linux-3.7.1.config} (100%)
 rename buildroot/target/device/armadeus/apf9328/{apf9328-linux-3.7-rc6.config => apf9328-linux-3.7.1.config} (100%)
 delete mode 120000 patches/linux/3.7-rc4
 delete mode 120000 patches/linux/3.7-rc6
 delete mode 120000 patches/linux/3.7-rc7
 delete mode 120000 patches/linux/3.7-rc8
 rename patches/linux/{3.7-rc3 => 3.7.1} (100%)
 create mode 100644 patches/linux/3.7/0050-armadeus-add_custom_drivers_to_kconfig.patch
 copy patches/linux/{3.0/322-apf27-armadeus-add_mach_fpga_h.patch => 3.7/0322-armadeus-add_mach_fpga_h.patch} (88%)
 copy patches/linux/{3.0/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch => 3.7/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch} (75%)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc6.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc6.config
deleted file mode 120000
index 2a64a30..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc6.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.7.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc7.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc7.config
deleted file mode 120000
index 2a64a30..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc7.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.7.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc8.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc8.config
deleted file mode 120000
index 2a64a30..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc8.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.7.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.1.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.7-rc4.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.7.1.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
index afe1dc0..fca5c1e 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
@@ -203,6 +203,12 @@ CONFIG_IMX_SDMA=y
 CONFIG_IMX_DMA=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_IIO=m
+CONFIG_ARMADEUS_DRIVERS=y
+CONFIG_ARMADEUS_FPGA_DRIVERS=y
+CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_IRQ_MNGR=m
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON=m
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED=m
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_POSIX_ACL=y
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.7-rc3.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.7.1.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.7-rc3.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.7.1.config
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.7-rc6.config b/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.7.1.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf9328/apf9328-linux-3.7-rc6.config
rename to buildroot/target/device/armadeus/apf9328/apf9328-linux-3.7.1.config
diff --git a/patches/linux/3.7-rc4 b/patches/linux/3.7-rc4
deleted file mode 120000
index 548d713..0000000
--- a/patches/linux/3.7-rc4
+++ /dev/null
@@ -1 +0,0 @@
-3.7
\ No newline at end of file
diff --git a/patches/linux/3.7-rc6 b/patches/linux/3.7-rc6
deleted file mode 120000
index 548d713..0000000
--- a/patches/linux/3.7-rc6
+++ /dev/null
@@ -1 +0,0 @@
-3.7
\ No newline at end of file
diff --git a/patches/linux/3.7-rc7 b/patches/linux/3.7-rc7
deleted file mode 120000
index 548d713..0000000
--- a/patches/linux/3.7-rc7
+++ /dev/null
@@ -1 +0,0 @@
-3.7
\ No newline at end of file
diff --git a/patches/linux/3.7-rc8 b/patches/linux/3.7-rc8
deleted file mode 120000
index 548d713..0000000
--- a/patches/linux/3.7-rc8
+++ /dev/null
@@ -1 +0,0 @@
-3.7
\ No newline at end of file
diff --git a/patches/linux/3.7-rc3 b/patches/linux/3.7.1
similarity index 100%
rename from patches/linux/3.7-rc3
rename to patches/linux/3.7.1
diff --git a/patches/linux/3.7/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/3.7/0050-armadeus-add_custom_drivers_to_kconfig.patch
new file mode 100644
index 0000000..0a689a5
--- /dev/null
+++ b/patches/linux/3.7/0050-armadeus-add_custom_drivers_to_kconfig.patch
@@ -0,0 +1,25 @@
+This patch adds the possibility to have custom Armadeus drivers built in kernel or compiled as modules.
+
+Index: linux-3.7.1/drivers/Kconfig
+===================================================================
+--- linux-3.7.1.orig/drivers/Kconfig	2012-12-17 20:14:54.000000000 +0100
++++ linux-3.7.1/drivers/Kconfig	2013-01-02 16:49:43.000000000 +0100
+@@ -156,4 +156,6 @@
+ 
+ source "drivers/irqchip/Kconfig"
+ 
++source "drivers/armadeus/Kconfig"
++
+ endmenu
+Index: linux-3.7.1/drivers/Makefile
+===================================================================
+--- linux-3.7.1.orig/drivers/Makefile	2012-12-17 20:14:54.000000000 +0100
++++ linux-3.7.1/drivers/Makefile	2013-01-02 17:19:48.000000000 +0100
+@@ -121,6 +121,7 @@
+ obj-$(CONFIG_HID)		+= hid/
+ obj-$(CONFIG_PPC_PS3)		+= ps3/
+ obj-$(CONFIG_OF)		+= of/
++obj-$(CONFIG_ARMADEUS_DRIVERS)	+= armadeus/
+ obj-$(CONFIG_SSB)		+= ssb/
+ obj-$(CONFIG_BCMA)		+= bcma/
+ obj-$(CONFIG_VHOST_NET)		+= vhost/
diff --git a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch b/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
index ff9ac9d..fbec6e4 100644
--- a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
+++ b/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
@@ -8,11 +8,11 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 Signed-off-by: Jeremie Scheer <jer...@ar...>
 Signed-off-by: Kevin Joly <jol...@gm...>
 
-Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+Index: linux-3.7.1/arch/arm/mach-imx/apf27-dev.c
 ===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/apf27-dev.c
-@@ -0,0 +1,1026 @@
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1/arch/arm/mach-imx/apf27-dev.c	2013-01-02 17:57:45.000000000 +0100
+@@ -0,0 +1,1025 @@
 + /*
 + * apf27-dev.c
 + * Support for AFP27 module's development baseboard
@@ -526,7 +526,6 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +
 +static int max1027_exit(struct spi_device *spi)
 +{
-+	mxc_gpio_release_multiple_pins(max1027_pins, ARRAY_SIZE(max1027_pins));
 +	return 0;
 +}
 +
@@ -1039,10 +1038,10 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
 +#endif
 +}
 +
-Index: linux-3.7/arch/arm/mach-imx/apf27-lcd.c
+Index: linux-3.7.1/arch/arm/mach-imx/apf27-lcd.c
 ===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/apf27-lcd.c
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1/arch/arm/mach-imx/apf27-lcd.c	2013-01-02 17:21:07.000000000 +0100
 @@ -0,0 +1,157 @@
 +/*
 + * apf27-lcd.c
@@ -1201,10 +1200,10 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-lcd.c
 +}
 +
 +#endif
-Index: linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
+Index: linux-3.7.1/arch/arm/mach-imx/apf27-dev-ext-apw.c
 ===================================================================
---- /dev/null
-+++ linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1/arch/arm/mach-imx/apf27-dev-ext-apw.c	2013-01-02 17:21:07.000000000 +0100
 @@ -0,0 +1,175 @@
 + /*
 + * apf27-dev-ext-apw.c
@@ -1381,10 +1380,10 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev-ext-apw.c
 +	printk("done\n");
 +}
 +
-Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
+Index: linux-3.7.1/arch/arm/mach-imx/mach-apf27.c
 ===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/mach-apf27.c
-+++ linux-3.7/arch/arm/mach-imx/mach-apf27.c
+--- linux-3.7.1.orig/arch/arm/mach-imx/mach-apf27.c	2013-01-02 17:21:07.000000000 +0100
++++ linux-3.7.1/arch/arm/mach-imx/mach-apf27.c	2013-01-02 17:21:07.000000000 +0100
 @@ -43,6 +43,7 @@
  
  #include "devices-imx27.h"
@@ -1393,7 +1392,7 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
  
  static const int apf27_pins[] __initconst = {
  	/* UART1 */
-@@ -270,6 +271,10 @@ static void __init apf27_init(void)
+@@ -270,6 +271,10 @@
  	i2c_register_board_info(1, apf27_i2c_devices_bus1,
  				ARRAY_SIZE(apf27_i2c_devices_bus1));
  	imx27_add_imx_i2c(1, &apf27_i2c_1_data);
@@ -1404,11 +1403,11 @@ Index: linux-3.7/arch/arm/mach-imx/mach-apf27.c
  }
  
  static void __init apf27_timer_init(void)
-Index: linux-3.7/arch/arm/mach-imx/Kconfig
+Index: linux-3.7.1/arch/arm/mach-imx/Kconfig
 ===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/Kconfig
-+++ linux-3.7/arch/arm/mach-imx/Kconfig
-@@ -430,6 +430,103 @@ config MACH_APF27
+--- linux-3.7.1.orig/arch/arm/mach-imx/Kconfig	2013-01-02 17:21:07.000000000 +0100
++++ linux-3.7.1/arch/arm/mach-imx/Kconfig	2013-01-02 17:21:07.000000000 +0100
+@@ -430,6 +430,103 @@
  	  Include support for APF27 platform. This includes specific
  	  configurations for the module and its peripherals.
  
@@ -1512,11 +1511,11 @@ Index: linux-3.7/arch/arm/mach-imx/Kconfig
  endif
  
  if ARCH_IMX_V6_V7
-Index: linux-3.7/arch/arm/mach-imx/Makefile
+Index: linux-3.7.1/arch/arm/mach-imx/Makefile
 ===================================================================
---- linux-3.7.orig/arch/arm/mach-imx/Makefile
-+++ linux-3.7/arch/arm/mach-imx/Makefile
-@@ -46,6 +46,9 @@ obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_
+--- linux-3.7.1.orig/arch/arm/mach-imx/Makefile	2013-01-02 17:21:07.000000000 +0100
++++ linux-3.7.1/arch/arm/mach-imx/Makefile	2013-01-02 17:21:07.000000000 +0100
+@@ -46,6 +46,9 @@
  obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
  obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
  obj-$(CONFIG_MACH_APF27) += mach-apf27.o
diff --git a/patches/linux/3.0/322-apf27-armadeus-add_mach_fpga_h.patch b/patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch
similarity index 88%
copy from patches/linux/3.0/322-apf27-armadeus-add_mach_fpga_h.patch
copy to patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch
index 603e5a3..34b4777 100644
--- a/patches/linux/3.0/322-apf27-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch
@@ -1,10 +1,10 @@
-Index: linux-3.0.10/arch/arm/plat-mxc/include/mach/fpga.h
+Index: linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.10/arch/arm/plat-mxc/include/mach/fpga.h	2011-12-02 08:38:34.000000000 +0100
++++ linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h	2013-01-02 18:45:18.000000000 +0100
 @@ -0,0 +1,50 @@
 +/*
-+ * Copyright (C) 2009-2011 ARMadeus Systems
++ * Copyright (C) 2009-2013 Armadeus Systems
 + *
 + * This program is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU General Public License
@@ -26,7 +26,7 @@ Index: linux-3.0.10/arch/arm/plat-mxc/include/mach/fpga.h
 +
 +#ifndef CONFIG_MACH_APF9328
 +# include <mach/irqs.h>
-+# include <mach/gpio.h>
++# include <linux/gpio.h>
 +#endif
 +
 +#if defined(CONFIG_MACH_APF51) /* */
@@ -43,7 +43,7 @@ Index: linux-3.0.10/arch/arm/plat-mxc/include/mach/fpga.h
 +# define APF27_FPGA_INT_PIN		(GPIO_PORTF | 12)
 +# define APF27_FPGA_IRQ			(IRQ_GPIOF(12))
 +# define ARMADEUS_FPGA_IRQ		APF27_FPGA_IRQ
-+# define IRQ_FPGA_START			MXC_BOARD_IRQ_START
++# define IRQ_FPGA_START			96
 +#elif defined(CONFIG_MACH_APF9328) /* */
 +# define APF9328_FPGA_BASE_ADDR		0x12000000
 +# define ARMADEUS_FPGA_BASE_ADDR	APF9328_FPGA_BASE_ADDR
diff --git a/patches/linux/3.0/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/3.7/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
similarity index 75%
copy from patches/linux/3.0/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
copy to patches/linux/3.7/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
index 804d83e..9f6b4d5 100644
--- a/patches/linux/3.0/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
+++ b/patches/linux/3.7/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
@@ -1,17 +1,17 @@
-Index: linux-3.0.10/scripts/kconfig/zconf.tab.c_shipped
+Index: linux-3.7.1/scripts/kconfig/zconf.tab.c_shipped
 ===================================================================
---- linux-3.0.10.orig/scripts/kconfig/zconf.tab.c_shipped	2011-11-21 23:37:44.000000000 +0100
-+++ linux-3.0.10/scripts/kconfig/zconf.tab.c_shipped	2011-11-30 18:40:10.000000000 +0100
-@@ -87,6 +87,8 @@
+--- linux-3.7.1.orig/scripts/kconfig/zconf.tab.c_shipped	2013-01-02 17:19:25.000000000 +0100
++++ linux-3.7.1/scripts/kconfig/zconf.tab.c_shipped	2013-01-02 17:24:41.000000000 +0100
+@@ -86,6 +86,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 @@
+ 
+@@ -93,6 +95,7 @@
  
  #define PRINTD		0x0001
  #define DEBUG_PARSE	0x0002
@@ -19,11 +19,13 @@ Index: linux-3.0.10/scripts/kconfig/zconf.tab.c_shipped
  
  int cdebug = PRINTD;
  
-@@ -108,6 +111,26 @@
+@@ -109,6 +112,27 @@
+ 
  
- static struct menu *current_menu, *current_entry;
  
 +
++static int isDir(const char *, const char *);
++
 +int isDir(const char *fullpath, const char *dname) {
 +  struct stat sbuf;
 +
@@ -39,14 +41,13 @@ Index: linux-3.0.10/scripts/kconfig/zconf.tab.c_shipped
 +    return 1;
 +  }
 +
-+return 0;
++  return 0;
 +}
 +
-+
- #define YYDEBUG 0
- #if YYDEBUG
- #define YYERROR_VERBOSE
-@@ -1897,8 +1920,30 @@
+ /* Enabling traces.  */
+ #ifndef YYDEBUG
+ # define YYDEBUG 1
+@@ -1900,8 +1924,30 @@
    case 83:
  
      {
diff --git a/target/linux/modules/Kconfig b/target/linux/modules/Kconfig
index 298ea6a..e4fe452 100644
--- a/target/linux/modules/Kconfig
+++ b/target/linux/modules/Kconfig
@@ -2,49 +2,31 @@
 # Armadeus custom drivers configuration
 #
 
-menu "Armadeus specific drivers"
-
-#
-config ARMADEUS_DRIVERS
-	boolean "Support for specific Armadeus drivers"
-	default n
+menuconfig ARMADEUS_DRIVERS
+	bool "Support for specific Armadeus drivers"
 	---help---
+	  This menu will give you access on some Armadeus drivers and tool.
+
+if ARMADEUS_DRIVERS
 
 comment "Misc."
-	depends on ARMADEUS_DRIVERS
-	  
 source "drivers/armadeus/generic/Kconfig"
-
 source "drivers/armadeus/as1531_platform/Kconfig"
-
 source "drivers/armadeus/mxs_lradc/Kconfig"
-
 source "drivers/armadeus/gpio/Kconfig"
-
 source "drivers/armadeus/imxlkeypad/Kconfig"
-
 source "drivers/armadeus/max1027/Kconfig"
-
 source "drivers/armadeus/max9768/Kconfig"
 
 comment "FPGA related"
-	depends on ARMADEUS_DRIVERS
-
 source "drivers/armadeus/fpga/Kconfig"
 
 comment "Handheld related"
-	depends on ARMADEUS_DRIVERS
-
 source "drivers/armadeus/pwm/Kconfig"
-
 source "drivers/armadeus/backlight/Kconfig"
-
 source "drivers/armadeus/display/Kconfig"
 
 comment "Communication bus related"
-	depends on ARMADEUS_DRIVERS
-
 source "drivers/armadeus/isp1761/Kconfig"
 
-endmenu
-
+endif # ARMADEUS_DRIVERS
diff --git a/target/linux/modules/fpga/Kconfig b/target/linux/modules/fpga/Kconfig
index dcb8ecc..65ca9db 100644
--- a/target/linux/modules/fpga/Kconfig
+++ b/target/linux/modules/fpga/Kconfig
@@ -1,26 +1,20 @@
 #
-# Armadeus custom drivers configuration
+# Armadeus FPGA drivers configuration
 #
 
-menu "FPGA Drivers "
-
-#
-config ARMADEUS_FPGA_DRIVERS
-	boolean "Support FPGA specific drivers"
-	default n
+menuconfig ARMADEUS_FPGA_DRIVERS
+	bool "FPGA specific drivers and tools"
 	---help---
-	  All drivers for FPGA components
+	  All drivers and tools related to FPGA.
 
-source "drivers/armadeus/fpga/dev_tools/Kconfig"
+if ARMADEUS_FPGA_DRIVERS
 
+source "drivers/armadeus/fpga/dev_tools/Kconfig"
 source "drivers/armadeus/fpga/others/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
-
+endif # ARMADEUS_FPGA_DRIVERS
diff --git a/target/linux/modules/fpga/board_designs/Kconfig b/target/linux/modules/fpga/board_designs/Kconfig
index bf7fa8b..7e47434 100644
--- a/target/linux/modules/fpga/board_designs/Kconfig
+++ b/target/linux/modules/fpga/board_designs/Kconfig
@@ -1,13 +1,12 @@
 #
-# Armadeus custom drivers configuration
+# Armadeus FPGA platform drivers configuration
 #
 
 config ARMADEUS_FPGA_BOARD_DESIGNS
 	boolean "Board designs"
-	default n
 	depends on ARMADEUS_FPGA_DRIVERS
 	---help---
-	  Board support for fpga designs
+	  Board support for FPGA designs
 
 source "drivers/armadeus/fpga/board_designs/*/Kconfig"
 
diff --git a/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c b/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
index 6c77b2e..473e344 100644
--- a/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
+++ b/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
@@ -28,7 +28,11 @@
 #else
 #include <mach/iomux-mx27.h>
 #endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
 #include <mach/gpio.h>
+#else
+#include <linux/gpio.h>
+#endif
 #include <mach/fpga.h>
 
 #include "xilinx-fpga-loader.h"
@@ -175,8 +179,11 @@ int apf27_fpga_busy(void)
 int apf27_fpga_post(void)
 {
 	iounmap(fpga_membase);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
 	mxc_gpio_release_multiple_pins(fpga_shared_pins,
 				       ARRAY_SIZE(fpga_shared_pins));
+	/* see https://github.com/torvalds/linux/commit/581f84e24b45ab871ae5f15f9290261c7226ffa9 */
+#endif
 	/* reconfigure bus ctrl signals */
 	mxc_gpio_mode(CFG_FPGA_RW | GPIO_PF | GPIO_PUEN);
 	mxc_gpio_mode(CFG_FPGA_CS | GPIO_PF | GPIO_PUEN);
diff --git a/target/linux/modules/fpga/virtual_components/button/gbutton.c b/target/linux/modules/fpga/virtual_components/button/gbutton.c
index 78a74fd..9b78ae4 100644
--- a/target/linux/modules/fpga/virtual_components/button/gbutton.c
+++ b/target/linux/modules/fpga/virtual_components/button/gbutton.c
@@ -230,7 +230,12 @@ static int button_probe(struct platform_device *pdev)
 	/* irq registering */
 	ret = request_irq(sdev->irq_res->start,
 			  button_interrupt,
-			  IRQF_SAMPLE_RANDOM, sdev->name, sdev);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+			  IRQF_SAMPLE_RANDOM,
+#else
+			  0,
+#endif
+			  sdev->name, sdev);
 	if (ret < 0) {
 		printk(KERN_ERR "Can't register irq %d\n",
 		       sdev->irq_res->start);
diff --git a/target/linux/modules/fpga/virtual_components/irq_mngr/main.c b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
index ff9d6d5..f587c60 100644
--- a/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
+++ b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
@@ -1,7 +1,7 @@
 /*
  * Driver for the IRQ manager (OpenCore/Wishbone based) IP
  *
- * (C) Copyright 2008-2011 ARMadeus Systems
+ * (C) Copyright 2008-2013 Armadeus Systems
  * Author: Julien Boibessot <jul...@ar...>
  *
  * Inspired of linux/arch/arm/mach-imx/irq.c
@@ -281,7 +281,12 @@ static int __devinit ocore_irq_mng_probe(struct platform_device *pdev)
 	writew(0xffff, mng->membase + FPGA_ISR);
 
 	ret = request_irq(mng->irq_res->start, ocore_irq_mng_interrupt,
-				IRQF_SAMPLE_RANDOM, "ocore_irq_mng", mng);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+				IRQF_SAMPLE_RANDOM,
+#else
+				0,
+#endif
+				"ocore_irq_mng", mng);
 
 	if (ret < 0) {
 		printk(KERN_ERR "Can't register irq %d\n",


hooks/post-receive
-- 
armadeus


