[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-185-g5d99d2e
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-185-g5d99d2e
|
From: Julien B a. A. <ar...@us...> - 2011-06-15 16:40:23
|
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 5d99d2eb7e4aec301a868c7cc40942913b2d0a14 (commit)
via e683508e67e329254d9e0060a8157a9fa59224a4 (commit)
via 188acee5c6a90061716bd1274c2a28af6f9aa4cf (commit)
from 6f5a7585f94b50c20feb0a6059de8955a8f3d32d (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 5d99d2eb7e4aec301a868c7cc40942913b2d0a14
Merge: e683508e67e329254d9e0060a8157a9fa59224a4 6f5a7585f94b50c20feb0a6059de8955a8f3d32d
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 15 18:34:39 2011 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit e683508e67e329254d9e0060a8157a9fa59224a4
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 15 18:33:44 2011 +0200
[LINUX] FPGA: register correct ressources size for wishbone drivers
commit 188acee5c6a90061716bd1274c2a28af6f9aa4cf
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 15 18:25:32 2011 +0200
[LINUX] APF9328: Cleanup FPGA registration like in recent APF27 & APF51 changes
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf9328/apf9328-linux-2.6.29.config | 3 +-
.../2.6.29/021-armadeus-apf9328.patch | 73 +++-----------------
...s-apf9328-add_board_to_linux_build_system.patch | 32 ++++-----
.../322-apf27-armadeus-add_mach_fpga_h.patch | 8 ++-
.../wishbone_example/wb_button/board_buttons.c | 9 ++-
.../fpga/wishbone_example/wb_button/gbutton.c | 2 -
.../wishbone_example/wb_irq_mngr/board_irq_mng.c | 9 ++-
.../fpga/wishbone_example/wb_led/board_leds.c | 9 ++-
8 files changed, 48 insertions(+), 97 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config b/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config
index cd842d9..e368f95 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Thu Sep 30 19:09:01 2010
+# Wed Jun 15 14:11:19 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -166,7 +166,6 @@ CONFIG_ARCH_IMX=y
#
# CONFIG_ARCH_MX1ADS is not set
CONFIG_MACH_APF9328=y
-CONFIG_MACH_APF9328_FPGA=y
# CONFIG_IMX_APF9328_FLASH_8MB is not set
CONFIG_IMX_APF9328_FLASH_16MB=y
CONFIG_MACH_APF9328_DEV=y
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
index d558383..e5b2ab3 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
@@ -3,9 +3,9 @@ DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
===================================================================
---- /dev/null
-+++ linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
-@@ -0,0 +1,627 @@
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.6/arch/arm/mach-imx/apf9328.c 2011-06-15 12:16:40.000000000 +0200
+@@ -0,0 +1,585 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328.c
+ *
@@ -54,10 +54,8 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
+#include <mach/dma.h>
+#include "../../../drivers/armadeus/pwm/pwm.h"
+#include <linux/dm9000.h>
-+#ifdef CONFIG_MACH_APF9328_FPGA
-+#include "../plat-mxc/include/mach/fpga.h" /* To be removed when MX1 arch is fully integrated */
-+#endif
+#include <mach/imxfb.h>
++
+#include "generic.h"
+
+#ifdef CONFIG_ARMADEUS_MAX1027_MODULE
@@ -503,39 +501,6 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
+ .num_resources = 1,
+};
+
-+/*
-+ * The APF9328 can have an optionnal Xilinx's Spartan3 FPGA
-+ * directly connected to its address/data busses
-+ */
-+#ifdef CONFIG_MACH_APF9328_FPGA
-+static int apf9328_fpga_irq_init(struct platform_device *pdev)
-+{
-+ int res = 0;
-+
-+ /* TODO */
-+ set_irq_type(APF9328_FPGA_IRQ, IRQF_TRIGGER_RISING);
-+
-+ return res;
-+}
-+
-+static void apf9328_fpga_irq_exit(struct platform_device *pdev)
-+{
-+ /* TODO */
-+}
-+
-+struct fpga_irq_mng_platform_data apf9328_fpga_irq = {
-+ .init = apf9328_fpga_irq_init,
-+ .exit = apf9328_fpga_irq_exit,
-+};
-+
-+struct platform_device apf9328_ocore_irq_mng_device = {
-+ .name = "ocore_irq_mng",
-+ .id = 0,
-+ .dev = { .platform_data = &apf9328_fpga_irq, },
-+};
-+#endif /* CONFIG_MACH_APF9328_FPGA */
-+
-+
+static struct platform_device *devices[] __initdata = {
+ &imx_uart1_device,
+ &imx_uart2_device,
@@ -554,9 +519,6 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
+ &apf9328_ssi_device,
+#endif
+ &apf9328_flash_device,
-+#ifdef CONFIG_MACH_APF9328_FPGA
-+ &apf9328_ocore_irq_mng_device,
-+#endif
+};
+
+static void __init apf9328_init(void)
@@ -601,10 +563,6 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
+ .type = MT_DEVICE
+ },
+#endif
-+#ifdef CONFIG_MACH_APF9328_FPGA
-+ /* FPGA Memory mapping */
-+ {.virtual = IMX_CS1_VIRT, .pfn = __phys_to_pfn(IMX_CS1_PHYS), .length = IMX_CS1_SIZE, .type = MT_DEVICE},
-+#endif
+};
+
+void __init apf9328_map_io(void)
@@ -635,8 +593,8 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
+MACHINE_END
Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328_lcd_config.h
===================================================================
---- /dev/null
-+++ linux-2.6.29.6/arch/arm/mach-imx/apf9328_lcd_config.h
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.6/arch/arm/mach-imx/apf9328_lcd_config.h 2011-06-15 11:57:47.000000000 +0200
@@ -0,0 +1,301 @@
+/*
+ *
@@ -941,9 +899,9 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328_lcd_config.h
+#endif /* APF_LCD_CONFIG_H */
Index: linux-2.6.29.6/arch/arm/mach-imx/include/mach/apf9328.h
===================================================================
---- /dev/null
-+++ linux-2.6.29.6/arch/arm/mach-imx/include/mach/apf9328.h
-@@ -0,0 +1,68 @@
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.6/arch/arm/mach-imx/include/mach/apf9328.h 2011-06-15 14:09:58.000000000 +0200
+@@ -0,0 +1,59 @@
+/*
+ * linux/include/asm-arm/arch-imx/apf9328.h
+ *
@@ -987,15 +945,6 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/include/mach/apf9328.h
+#endif
+#define APF9328_FLASH_BASE IMX_CS0_VIRT
+
-+/* FPGA */
-+#define ARMADEUS_FPGA_BASE_ADDR_VIRT ( APF9328_FPGA_VIRT )
-+#define ARMADEUS_FPGA_BASE_ADDR_PHYS ( APF9328_FPGA_PHYS )
-+#define ARMADEUS_FPGA_IRQ ( APF9328_FPGA_IRQ )
-+
-+#define APF9328_FPGA_VIRT ( IMX_CS1_VIRT )
-+#define APF9328_FPGA_PHYS ( IMX_CS1_PHYS )
-+#define APF9328_FPGA_IRQ ( IRQ_GPIOA(1) )
-+
+#define CLK32 32768
+
+#ifndef __ASSEMBLY__
@@ -1014,8 +963,8 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/include/mach/apf9328.h
+#endif /* __ASM_ARCH_APF9328_H */
Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c
===================================================================
---- /dev/null
-+++ linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c 2011-06-15 11:57:47.000000000 +0200
@@ -0,0 +1,338 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328-dev.c
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch
index 9423226..81c471c 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/hardware.h
+Index: linux-2.6.29.6/arch/arm/mach-imx/include/mach/hardware.h
===================================================================
---- linux-2.6.29.4.orig/arch/arm/mach-imx/include/mach/hardware.h 2009-08-17 11:42:37.000000000 +0200
-+++ linux-2.6.29.4/arch/arm/mach-imx/include/mach/hardware.h 2009-08-17 18:12:58.000000000 +0200
+--- linux-2.6.29.6.orig/arch/arm/mach-imx/include/mach/hardware.h 2009-07-03 01:41:20.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-imx/include/mach/hardware.h 2011-06-15 14:19:53.000000000 +0200
@@ -88,4 +88,8 @@
#include "mx1ads.h"
#endif
@@ -11,10 +11,10 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/hardware.h
+#endif
+
#endif
-Index: linux-2.6.29.4/arch/arm/mach-imx/Kconfig
+Index: linux-2.6.29.6/arch/arm/mach-imx/Kconfig
===================================================================
---- linux-2.6.29.4.orig/arch/arm/mach-imx/Kconfig 2009-08-17 11:42:37.000000000 +0200
-+++ linux-2.6.29.4/arch/arm/mach-imx/Kconfig 2009-08-17 18:04:06.000000000 +0200
+--- linux-2.6.29.6.orig/arch/arm/mach-imx/Kconfig 2009-07-03 01:41:20.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-imx/Kconfig 2011-06-15 12:28:37.000000000 +0200
@@ -1,6 +1,10 @@
menu "IMX Implementations"
depends on ARCH_IMX
@@ -26,7 +26,7 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/Kconfig
config ARCH_MX1ADS
bool "mx1ads"
depends on ARCH_IMX
-@@ -8,4 +12,46 @@
+@@ -8,4 +12,40 @@
help
Say Y here if you are using the Motorola MX1ADS board
@@ -38,12 +38,6 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/Kconfig
+
+endchoice
+
-+config MACH_APF9328_FPGA
-+ bool "Board has a FPGA"
-+ depends on MACH_APF9328
-+ help
-+ Select this if your APF9328 has an onboard FPGA
-+
+choice
+ prompt "Flash available on board"
+ depends on MACH_APF9328
@@ -73,10 +67,10 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/Kconfig
+endchoice
+
endmenu
-Index: linux-2.6.29.4/arch/arm/mach-imx/Makefile
+Index: linux-2.6.29.6/arch/arm/mach-imx/Makefile
===================================================================
---- linux-2.6.29.4.orig/arch/arm/mach-imx/Makefile 2009-08-17 11:42:37.000000000 +0200
-+++ linux-2.6.29.4/arch/arm/mach-imx/Makefile 2009-08-17 17:48:11.000000000 +0200
+--- linux-2.6.29.6.orig/arch/arm/mach-imx/Makefile 2009-07-03 01:41:20.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-imx/Makefile 2011-06-15 11:57:47.000000000 +0200
@@ -10,6 +10,8 @@
# Specific board support
@@ -86,10 +80,10 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/Makefile
# Support for blinky lights
led-y := leds.o
-Index: linux-2.6.29.4/arch/arm/mach-imx/Makefile.boot
+Index: linux-2.6.29.6/arch/arm/mach-imx/Makefile.boot
===================================================================
---- linux-2.6.29.4.orig/arch/arm/mach-imx/Makefile.boot 2009-08-17 11:42:37.000000000 +0200
-+++ linux-2.6.29.4/arch/arm/mach-imx/Makefile.boot 2009-08-17 15:02:39.000000000 +0200
+--- linux-2.6.29.6.orig/arch/arm/mach-imx/Makefile.boot 2009-07-03 01:41:20.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-imx/Makefile.boot 2011-06-15 11:57:47.000000000 +0200
@@ -1,2 +1,3 @@
zreladdr-$(CONFIG_ARCH_MX1ADS) := 0x08008000
+ zreladdr-$(CONFIG_MACH_APF9328) := 0x08008000
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/322-apf27-armadeus-add_mach_fpga_h.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/322-apf27-armadeus-add_mach_fpga_h.patch
index 1e1e8fc..8038337 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/322-apf27-armadeus-add_mach_fpga_h.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/322-apf27-armadeus-add_mach_fpga_h.patch
@@ -1,8 +1,8 @@
Index: linux-2.6.29.6/arch/arm/plat-mxc/include/mach/fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/plat-mxc/include/mach/fpga.h 2011-05-18 10:01:49.000000000 +0200
-@@ -0,0 +1,43 @@
++++ linux-2.6.29.6/arch/arm/plat-mxc/include/mach/fpga.h 2011-06-15 17:57:00.000000000 +0200
+@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2009-2011 ARMadeus Systems
+ *
@@ -27,8 +27,8 @@ Index: linux-2.6.29.6/arch/arm/plat-mxc/include/mach/fpga.h
+#ifndef CONFIG_MACH_APF9328
+# include <mach/irqs.h>
+# include <mach/gpio.h>
++# include <mach/iomux-mx1-mx2.h>
+#endif
-+#include <mach/iomux-mx1-mx2.h>
+
+#if defined(CONFIG_MACH_APF27) /* */
+# define APF27_FPGA_BASE_ADDR 0xd6000000
@@ -40,6 +40,8 @@ Index: linux-2.6.29.6/arch/arm/plat-mxc/include/mach/fpga.h
+#elif defined(CONFIG_MACH_APF9328) /* */
+# define APF9328_FPGA_BASE_ADDR 0x12000000
+# define ARMADEUS_FPGA_BASE_ADDR APF9328_FPGA_BASE_ADDR
++# define APF9328_FPGA_IRQ (IRQ_GPIOA(1))
++# define ARMADEUS_FPGA_IRQ APF9328_FPGA_IRQ
+#else
+# error "Unsupported platform"
+#endif
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/board_buttons.c b/target/linux/modules/fpga/wishbone_example/wb_button/board_buttons.c
index f662cf1..0b70a8b 100644
--- a/target/linux/modules/fpga/wishbone_example/wb_button/board_buttons.c
+++ b/target/linux/modules/fpga/wishbone_example/wb_button/board_buttons.c
@@ -25,8 +25,11 @@
#include <linux/platform_device.h>
#include <mach/hardware.h>
-#ifndef CONFIG_MACH_APF9328 /* To remove when MX1 platform is merged */
-#include <mach/fpga.h>
+#ifdef CONFIG_MACH_APF9328 /* To remove when MX1 platform is merged */
+# include "../arch/arm/plat-mxc/include/mach/fpga.h"
+# include <mach/irqs.h>
+#else
+# include <mach/fpga.h>
#endif
#include "button.h"
@@ -36,7 +39,7 @@
static struct resource button0_resources[] = {
[0] = {
.start = ARMADEUS_FPGA_BASE_ADDR + 0xc,
- .end = ARMADEUS_FPGA_BASE_ADDR + 0xc + 0x4,
+ .end = ARMADEUS_FPGA_BASE_ADDR + 0xc + (4 -1),
.flags = IORESOURCE_MEM,
},
[1] = {
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/gbutton.c b/target/linux/modules/fpga/wishbone_example/wb_button/gbutton.c
index 2eb84d0..78a74fd 100644
--- a/target/linux/modules/fpga/wishbone_example/wb_button/gbutton.c
+++ b/target/linux/modules/fpga/wishbone_example/wb_button/gbutton.c
@@ -33,8 +33,6 @@
#include <asm/uaccess.h> /* copy_to_user function */
#include <asm/io.h> /* readw() writew() */
-#include <mach/hardware.h>
-#include <mach/fpga.h>
#include "button.h"
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/board_irq_mng.c b/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/board_irq_mng.c
index 9c4e44c..9a679ba 100644
--- a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/board_irq_mng.c
+++ b/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/board_irq_mng.c
@@ -27,8 +27,11 @@
#include <linux/irq.h>
#include <mach/hardware.h>
-#ifndef CONFIG_MACH_APF9328 /* To remove when MX1 platform is merged */
-#include <mach/fpga.h>
+#ifdef CONFIG_MACH_APF9328 /* To remove when MX1 platform is merged */
+# include "../arch/arm/plat-mxc/include/mach/fpga.h"
+# include <mach/irqs.h>
+#else
+# include <mach/fpga.h>
#endif
#include "irq_mng.h"
@@ -36,7 +39,7 @@
static struct resource irq_mng0_resources[] = {
[0] = {
.start = ARMADEUS_FPGA_BASE_ADDR + 0x0,
- .end = ARMADEUS_FPGA_BASE_ADDR + 0x0 + 0x8,
+ .end = ARMADEUS_FPGA_BASE_ADDR + 0x0 + (8 - 1),
.flags = IORESOURCE_MEM,
},
[1] = {
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/board_leds.c b/target/linux/modules/fpga/wishbone_example/wb_led/board_leds.c
index 6485fd4..1b106b9 100644
--- a/target/linux/modules/fpga/wishbone_example/wb_led/board_leds.c
+++ b/target/linux/modules/fpga/wishbone_example/wb_led/board_leds.c
@@ -24,8 +24,11 @@
#include <linux/module.h>
#include <linux/platform_device.h>
-#ifndef CONFIG_MACH_APF9328 /* to be removed when MX1 platform is merged */
-#include <mach/fpga.h>
+#ifdef CONFIG_MACH_APF9328 /* To remove when MX1 platform is merged */
+# include "../arch/arm/plat-mxc/include/mach/fpga.h"
+# include <mach/irqs.h>
+#else
+# include <mach/fpga.h>
#endif
#include "led.h"
@@ -33,7 +36,7 @@
static struct resource led0_resources[] = {
[0] = {
.start = ARMADEUS_FPGA_BASE_ADDR + 0x8,
- .end = ARMADEUS_FPGA_BASE_ADDR + 0x8 + 0x4,
+ .end = ARMADEUS_FPGA_BASE_ADDR + 0x8 + (4 - 1),
.flags = IORESOURCE_MEM,
},
};
hooks/post-receive
--
armadeus
|
