[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-105-g07e6d05
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-105-g07e6d05
|
From: Julien B a. A. <ar...@us...> - 2013-01-02 21:35:09
|
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 07e6d05e1dafc7a28701596dd74b166aa279210e (commit)
from f8a7324ed11844bbe03d47ba4bcee329bb9a88e1 (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 07e6d05e1dafc7a28701596dd74b166aa279210e
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 2 22:32:17 2013 +0100
[LINUX] 3.8: APF27: improve FPGA related drivers support
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-linux-3.8.config | 6 ++++++
...50-armadeus-add_custom_drivers_to_kconfig.patch | 16 ++++++++--------
.../0322-armadeus-add_mach_fpga_h.patch | 14 +++++---------
..._star_completion_for_source_in_menuconfig.patch | 6 +++---
.../fpga/dev_tools/loader/apf27-fpga-loader.c | 8 ++++++++
.../fpga/virtual_components/irq_mngr/main.c | 10 ++++++++--
.../modules/fpga/virtual_components/led/g_led.c | 2 ++
7 files changed, 40 insertions(+), 22 deletions(-)
copy patches/linux/{3.7 => 3.8}/0050-armadeus-add_custom_drivers_to_kconfig.patch (56%)
copy patches/linux/{3.7 => 3.8}/0322-armadeus-add_mach_fpga_h.patch (87%)
copy patches/linux/{3.7 => 3.8}/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch (87%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.8.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.8.config
index dcd0fec..bc08620 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.8.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.8.config
@@ -201,6 +201,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/patches/linux/3.7/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/3.8/0050-armadeus-add_custom_drivers_to_kconfig.patch
similarity index 56%
copy from patches/linux/3.7/0050-armadeus-add_custom_drivers_to_kconfig.patch
copy to patches/linux/3.8/0050-armadeus-add_custom_drivers_to_kconfig.patch
index 0a689a5..9a18198 100644
--- a/patches/linux/3.7/0050-armadeus-add_custom_drivers_to_kconfig.patch
+++ b/patches/linux/3.8/0050-armadeus-add_custom_drivers_to_kconfig.patch
@@ -1,20 +1,20 @@
This patch adds the possibility to have custom Armadeus drivers built in kernel or compiled as modules.
-Index: linux-3.7.1/drivers/Kconfig
+Index: linux-3.8-rc1/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 @@
+--- linux-3.8-rc1.orig/drivers/Kconfig 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/Kconfig 2013-01-02 20:28:02.000000000 +0100
+@@ -158,4 +158,6 @@
- source "drivers/irqchip/Kconfig"
+ source "drivers/ipack/Kconfig"
+source "drivers/armadeus/Kconfig"
+
endmenu
-Index: linux-3.7.1/drivers/Makefile
+Index: linux-3.8-rc1/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
+--- linux-3.8-rc1.orig/drivers/Makefile 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/drivers/Makefile 2013-01-02 20:28:02.000000000 +0100
@@ -121,6 +121,7 @@
obj-$(CONFIG_HID) += hid/
obj-$(CONFIG_PPC_PS3) += ps3/
diff --git a/patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.8/0322-armadeus-add_mach_fpga_h.patch
similarity index 87%
copy from patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch
copy to patches/linux/3.8/0322-armadeus-add_mach_fpga_h.patch
index 34b4777..4fc87d2 100644
--- a/patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.8/0322-armadeus-add_mach_fpga_h.patch
@@ -1,8 +1,8 @@
-Index: linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h
+Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h 2013-01-02 18:45:18.000000000 +0100
-@@ -0,0 +1,50 @@
++++ linux-3.8-rc1/arch/arm/mach-imx/fpga.h 2013-01-02 22:16:56.000000000 +0100
+@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2009-2013 Armadeus Systems
+ *
@@ -24,11 +24,6 @@ Index: linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h
+#ifndef __ASM_ARCH_ARMADEUS_FPGA_H__
+#define __ASM_ARCH_ARMADEUS_FPGA_H__
+
-+#ifndef CONFIG_MACH_APF9328
-+# include <mach/irqs.h>
-+# include <linux/gpio.h>
-+#endif
-+
+#if defined(CONFIG_MACH_APF51) /* */
+# define APF51_FPGA_BASE_ADDR 0xb8000000
+# define ARMADEUS_FPGA_BASE_ADDR APF51_FPGA_BASE_ADDR
@@ -37,7 +32,7 @@ Index: linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h
+# define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
+# define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
+#elif defined(CONFIG_MACH_APF27) /* */
-+#include <mach/iomux-v1.h>
++#include "iomux-v1.h"
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
@@ -52,4 +47,5 @@ Index: linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h
+#endif
+
+#define IRQ_FPGA(x) (IRQ_FPGA_START + x)
++
+#endif /* __ASM_ARCH_ARMADEUS_FPGA_H__ */
diff --git a/patches/linux/3.7/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/3.8/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
similarity index 87%
copy from patches/linux/3.7/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
copy to patches/linux/3.8/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
index 9f6b4d5..18e5b98 100644
--- a/patches/linux/3.7/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
+++ b/patches/linux/3.8/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
@@ -1,7 +1,7 @@
-Index: linux-3.7.1/scripts/kconfig/zconf.tab.c_shipped
+Index: linux-3.8-rc1/scripts/kconfig/zconf.tab.c_shipped
===================================================================
---- 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
+--- linux-3.8-rc1.orig/scripts/kconfig/zconf.tab.c_shipped 2012-12-22 02:19:00.000000000 +0100
++++ linux-3.8-rc1/scripts/kconfig/zconf.tab.c_shipped 2013-01-02 20:28:03.000000000 +0100
@@ -86,6 +86,8 @@
#include <stdlib.h>
#include <string.h>
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 473e344..000a6fc 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
@@ -26,14 +26,22 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
#include <mach/iomux-mx1-mx2.h>
#else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
#include <mach/iomux-mx27.h>
+#else
+#include <linux/../../arch/arm/mach-imx/iomux-mx27.h>
+#endif
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
#include <mach/gpio.h>
#else
#include <linux/gpio.h>
#endif
+#if LINUX_VERSION_CODE > KERNEL_VERSION(3,7,0)
+#include <linux/../../arch/arm/mach-imx/fpga.h>
+#else
#include <mach/fpga.h>
+#endif
#include "xilinx-fpga-loader.h"
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 f587c60..8d5cba2 100644
--- a/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
+++ b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
@@ -36,8 +36,10 @@
#endif
#include <linux/irq.h>
-#include <mach/hardware.h>
-#include <mach/irqs.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,9)
+# include <mach/hardware.h>
+# include <mach/irqs.h>
+#endif
#include <asm/irq.h>
#include <asm/io.h> /* readb() & Co */
#include <asm/mach/irq.h>
@@ -45,7 +47,11 @@
#include "irq_mng.h"
#ifndef CONFIG_MACH_APF9328
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,9)
# include <mach/fpga.h> /* To remove when MX1 platform is merged */
+#else
+# include <linux/../../arch/arm/mach-imx/fpga.h>
+#endif
#endif
#define ID_OFFSET (0x02 *(16/8))
diff --git a/target/linux/modules/fpga/virtual_components/led/g_led.c b/target/linux/modules/fpga/virtual_components/led/g_led.c
index ad81871..3011a2d 100644
--- a/target/linux/modules/fpga/virtual_components/led/g_led.c
+++ b/target/linux/modules/fpga/virtual_components/led/g_led.c
@@ -32,7 +32,9 @@
#include <asm/uaccess.h> /* copy_to_user function */
#include <asm/io.h> /* readw() writew() */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,9)
#include <mach/hardware.h>
+#endif
#include "led.h"
hooks/post-receive
--
armadeus
|
