[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-414-gc1ce665
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-414-gc1ce665
|
From: Julien B a. A. <ar...@us...> - 2013-08-28 16:22:42
|
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 c1ce665aef02f7d125874222d5035c3558b9fb1a (commit)
from a129f97527881c7930b5ee05795118c30c4b75d8 (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 c1ce665aef02f7d125874222d5035c3558b9fb1a
Author: Julien Boibessot <jul...@ar...>
Date: Wed Aug 28 18:21:50 2013 +0200
[LINUX] 3.7 : apf27 : Makes FPGA and armadeus custom drivers compiles better with 3.7+ kernels
-----------------------------------------------------------------------
Summary of changes:
.../linux/3.7/0322-armadeus-add_mach_fpga_h.patch | 11 ++++++++---
target/linux/modules/Makefile | 2 +-
target/linux/modules/as1531_platform/Makefile | 2 +-
target/linux/modules/backlight/Makefile | 2 +-
target/linux/modules/display/Makefile | 2 +-
target/linux/modules/dma_test/Makefile | 2 +-
target/linux/modules/fpga/Makefile | 2 +-
target/linux/modules/fpga/POD/Makefile | 2 +-
.../fpga/board_designs/wishbone_example/Makefile | 5 +----
.../wishbone_example/wb_button/Makefile | 2 +-
.../wishbone_example/wb_irq_mngr/Makefile | 3 +--
.../wishbone_example/wb_irq_mngr/board_irq_mng.c | 14 ++++++++++++--
.../board_designs/wishbone_example/wb_led/Makefile | 2 +-
target/linux/modules/fpga/dev_tools/Makefile | 2 +-
.../linux/modules/fpga/dev_tools/loader/Makefile | 2 +-
target/linux/modules/fpga/others/i2ctest/Makefile | 2 +-
.../linux/modules/fpga/others/ps2keyboard/Makefile | 2 +-
.../fpga/virtual_components/button/Makefile | 2 +-
target/linux/modules/generic/Makefile | 2 +-
target/linux/modules/gpio/Makefile | 2 +-
target/linux/modules/imx_counter/Makefile | 2 +-
target/linux/modules/imxlkeypad/Makefile | 2 +-
target/linux/modules/isp1761/Makefile | 2 +-
target/linux/modules/max1027/Makefile | 2 +-
target/linux/modules/max9768/Makefile | 2 +-
target/linux/modules/mxs_lradc/Makefile | 2 +-
target/linux/modules/pwm/Makefile | 2 +-
27 files changed, 45 insertions(+), 34 deletions(-)
diff --git a/patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch
index 34b4777..3846b13 100644
--- a/patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.7/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.7.9/arch/arm/plat-mxc/include/mach/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.7.9/arch/arm/plat-mxc/include/mach/fpga.h 2013-08-28 16:14:57.901315036 +0200
+@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2009-2013 Armadeus Systems
+ *
@@ -40,8 +40,13 @@ Index: linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h
+#include <mach/iomux-v1.h>
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
+# define APF27_FPGA_IRQ (IRQ_GPIOF(12))
++#else
++# define APF27_FPGA_INT_PIN (IMX_GPIO_NR(6, 12)) /* PF12 */
++# define APF27_FPGA_IRQ (gpio_to_irq(APF27_FPGA_INT_PIN))
++#endif
+# define ARMADEUS_FPGA_IRQ APF27_FPGA_IRQ
+# define IRQ_FPGA_START 96
+#elif defined(CONFIG_MACH_APF9328) /* */
diff --git a/target/linux/modules/Makefile b/target/linux/modules/Makefile
index f83dc54..07265eb 100755
--- a/target/linux/modules/Makefile
+++ b/target/linux/modules/Makefile
@@ -4,7 +4,7 @@
# Add your subdirectories to obj- target
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
# Part executed when called from kernel build system:
obj-$(CONFIG_ARMADEUS_DRIVERS) += gpio/ pwm/ backlight/ isp1761/ \
diff --git a/target/linux/modules/as1531_platform/Makefile b/target/linux/modules/as1531_platform/Makefile
index 34154bf..cf0ce91 100755
--- a/target/linux/modules/as1531_platform/Makefile
+++ b/target/linux/modules/as1531_platform/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_AS1531_PLAT) += as1531_plat.o
diff --git a/target/linux/modules/backlight/Makefile b/target/linux/modules/backlight/Makefile
index a579fbf..9d2e6f3 100644
--- a/target/linux/modules/backlight/Makefile
+++ b/target/linux/modules/backlight/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_IMX_BACKLIGHT) += imx_bl.o
imx_bl-objs := imx_bl_2.6.23.o
diff --git a/target/linux/modules/display/Makefile b/target/linux/modules/display/Makefile
index 06d7ba2..c52be76 100644
--- a/target/linux/modules/display/Makefile
+++ b/target/linux/modules/display/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_HX5116_DISPLAY) += hx5116_display.o
diff --git a/target/linux/modules/dma_test/Makefile b/target/linux/modules/dma_test/Makefile
index f216193..3a36838 100755
--- a/target/linux/modules/dma_test/Makefile
+++ b/target/linux/modules/dma_test/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-m += dma.o
diff --git a/target/linux/modules/fpga/Makefile b/target/linux/modules/fpga/Makefile
index d13b61f..2eff197 100755
--- a/target/linux/modules/fpga/Makefile
+++ b/target/linux/modules/fpga/Makefile
@@ -4,7 +4,7 @@
# Add your subdirectories to obj- target
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
# Part executed when called from kernel build system:
obj-$(CONFIG_ARMADEUS_FPGA_DRIVERS) += dev_tools/ board_designs/ virtual_components/
diff --git a/target/linux/modules/fpga/POD/Makefile b/target/linux/modules/fpga/POD/Makefile
index 8c309cc..aa26121 100644
--- a/target/linux/modules/fpga/POD/Makefile
+++ b/target/linux/modules/fpga/POD/Makefile
@@ -4,7 +4,7 @@
# Sub-directories are automatically added to obj- target
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
# Part executed when called from kernel build system:
obj-$(CONFIG_POD_DRIVERS) += $(shell ls -F drivers/armadeus/fpga/POD/ | grep \/$)
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
index f463ee8..fc0d58e 100644
--- a/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
@@ -1,11 +1,10 @@
-
#
# Main Makefile for the Armadeus FPGA related drivers
#
# Add your subdirectories to obj- target
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
# Part executed when called from kernel build system:
obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE) += wb_button/ wb_irq_mngr/ wb_led/
@@ -23,6 +22,4 @@ install:
test:
$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc push-led.c -o push-led
-
endif
-
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 cef6f50..99f158c 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
@@ -2,7 +2,7 @@
# Makefile for the Armadeus Wb_button drivers
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_BUTTON_DRIVER) += wb_example_buttons.o
wb_example_buttons-objs := board_buttons.o
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 35693be..f14b22c 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
@@ -2,14 +2,13 @@
# Makefile for the Armadeus FPGA OpenCore IRQ manager IP
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
# Part executed when called from kernel build system:
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
ARMADEUS_BASE_DIR=../../../../../..
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 0727225..aad5be4 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
@@ -43,8 +43,8 @@ static struct resource irq_mng0_resources[] = {
.flags = IORESOURCE_MEM,
},
[1] = {
- .start = ARMADEUS_FPGA_IRQ,
- .end = ARMADEUS_FPGA_IRQ,
+ .start = 0, /* Filled later in */
+ .end = 0, /* Filled later in */
.flags = IORESOURCE_IRQ,
}
};
@@ -86,7 +86,14 @@ static int __init board_irq_mng_init(void)
if (ret)
return -EINVAL;
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
set_irq_type(ARMADEUS_FPGA_IRQ, IRQ_TYPE_EDGE_RISING);
+#else
+ irq_set_irq_type(ARMADEUS_FPGA_IRQ, IRQ_TYPE_EDGE_RISING);
+#endif
+ irq_mng0_device.resource[1].start = ARMADEUS_FPGA_IRQ;
+ irq_mng0_device.resource[1].end = ARMADEUS_FPGA_IRQ;
+
return platform_device_register(&irq_mng0_device);
}
@@ -94,7 +101,10 @@ static void __exit board_irq_mng_exit(void)
{
platform_device_unregister(&irq_mng0_device);
#ifdef CONFIG_MACH_APF27
+# if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
mxc_gpio_release_multiple_pins(fpga_pins, ARRAY_SIZE(fpga_pins));
+ /* see https://github.com/torvalds/linux/commit/581f84e24b45ab871ae5f15f9290261c7226ffa9 */
+# endif
#endif
}
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 7bf86a5..103956b 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
@@ -2,7 +2,7 @@
# Makefile for the Armadeus FPGA led driver
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_LED_DRIVER) += wb_example_led.o
wb_example_led-objs := board_leds.o
diff --git a/target/linux/modules/fpga/dev_tools/Makefile b/target/linux/modules/fpga/dev_tools/Makefile
index 3db20fa..ca7f657 100644
--- a/target/linux/modules/fpga/dev_tools/Makefile
+++ b/target/linux/modules/fpga/dev_tools/Makefile
@@ -4,7 +4,7 @@
# Add your subdirectories to obj- target
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
# Part executed when called from kernel build system:
diff --git a/target/linux/modules/fpga/dev_tools/loader/Makefile b/target/linux/modules/fpga/dev_tools/loader/Makefile
index 24d3790..3872580 100644
--- a/target/linux/modules/fpga/dev_tools/loader/Makefile
+++ b/target/linux/modules/fpga/dev_tools/loader/Makefile
@@ -2,7 +2,7 @@
# Makefile for the Armadeus FPGA loader driver
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_FPGA_LOADER_DRIVER) += fpgaloader.o
fpgaloader-objs := xilinx-fpga-loader.o fpga-loader.o
diff --git a/target/linux/modules/fpga/others/i2ctest/Makefile b/target/linux/modules/fpga/others/i2ctest/Makefile
index 5d971e2..a4e7343 100755
--- a/target/linux/modules/fpga/others/i2ctest/Makefile
+++ b/target/linux/modules/fpga/others/i2ctest/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when cali2ctest from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-m += i2ctest.o
diff --git a/target/linux/modules/fpga/others/ps2keyboard/Makefile b/target/linux/modules/fpga/others/ps2keyboard/Makefile
index 7ba4fe4..d754447 100755
--- a/target/linux/modules/fpga/others/ps2keyboard/Makefile
+++ b/target/linux/modules/fpga/others/ps2keyboard/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_PS2KBD_DRIVER) += apf9328ps2.o
apf9328ps2-objs := core.o
diff --git a/target/linux/modules/fpga/virtual_components/button/Makefile b/target/linux/modules/fpga/virtual_components/button/Makefile
index bb42489..a01141b 100755
--- a/target/linux/modules/fpga/virtual_components/button/Makefile
+++ b/target/linux/modules/fpga/virtual_components/button/Makefile
@@ -2,7 +2,7 @@
# Makefile for the Armadeus FPGA button driver
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
# Part executed when called from kernel build system:
obj-$(CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON) += button_ocore.o
diff --git a/target/linux/modules/generic/Makefile b/target/linux/modules/generic/Makefile
index 1e87d59..11b4c1e 100755
--- a/target/linux/modules/generic/Makefile
+++ b/target/linux/modules/generic/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_GENERIC_DRIVER) += genmod.o
generic-objs := generic.o
diff --git a/target/linux/modules/gpio/Makefile b/target/linux/modules/gpio/Makefile
index d536614..f4fc5e4 100755
--- a/target/linux/modules/gpio/Makefile
+++ b/target/linux/modules/gpio/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_GPIO_DRIVER) += gpio.o
obj-$(CONFIG_ARMADEUS_PPDEV_DRIVER) += ppdev.o
diff --git a/target/linux/modules/imx_counter/Makefile b/target/linux/modules/imx_counter/Makefile
index a9c0ef6..e098eb7 100755
--- a/target/linux/modules/imx_counter/Makefile
+++ b/target/linux/modules/imx_counter/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_APF27_GPT2) += gpt2_plat.o
diff --git a/target/linux/modules/imxlkeypad/Makefile b/target/linux/modules/imxlkeypad/Makefile
index a51267b..4618199 100755
--- a/target/linux/modules/imxlkeypad/Makefile
+++ b/target/linux/modules/imxlkeypad/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_KEYPAD_DRIVER) += imxkeypad.o
diff --git a/target/linux/modules/isp1761/Makefile b/target/linux/modules/isp1761/Makefile
index 63f4599..31f039c 100644
--- a/target/linux/modules/isp1761/Makefile
+++ b/target/linux/modules/isp1761/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_ISP1761) += hal/ host/ apf9328-isp1761.o
diff --git a/target/linux/modules/max1027/Makefile b/target/linux/modules/max1027/Makefile
index aef647a..0b9e6c8 100755
--- a/target/linux/modules/max1027/Makefile
+++ b/target/linux/modules/max1027/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_MAX1027) += max1027.o
diff --git a/target/linux/modules/max9768/Makefile b/target/linux/modules/max9768/Makefile
index d60e4f4..a3d6506 100644
--- a/target/linux/modules/max9768/Makefile
+++ b/target/linux/modules/max9768/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_MAX9768) += max9768.o
diff --git a/target/linux/modules/mxs_lradc/Makefile b/target/linux/modules/mxs_lradc/Makefile
index 24fd8aa..ea0c8f4 100755
--- a/target/linux/modules/mxs_lradc/Makefile
+++ b/target/linux/modules/mxs_lradc/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_SENSOR_MXS_LRADC) += mxs_lradc.o
diff --git a/target/linux/modules/pwm/Makefile b/target/linux/modules/pwm/Makefile
index 266e39f..706ebdd 100755
--- a/target/linux/modules/pwm/Makefile
+++ b/target/linux/modules/pwm/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_PWM_DRIVER) += imx-pwm.o
imx-pwm-objs := pwm.o
hooks/post-receive
--
armadeus
|
