[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2562-g51fee50
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2562-g51fee50
|
From: Fabien M <fa...@us...> - 2011-10-21 10:28:53
|
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 51fee5020d0bb2ec08eec58e4fab91dcffef2e5e (commit)
via b7fe04f13e9f0dd43214a60aedd8dfe7ef15118e (commit)
from a064df49eb89f623b1be6de855f6fe741d12645a (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 51fee5020d0bb2ec08eec58e4fab91dcffef2e5e
Merge: b7fe04f a064df4
Author: Fabien Marteau <fab...@ar...>
Date: Fri Oct 21 12:27:56 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit b7fe04f13e9f0dd43214a60aedd8dfe7ef15118e
Author: Fabien Marteau <fab...@ar...>
Date: Fri Oct 21 12:26:56 2011 +0200
[linux] do not initialize fpga pin if fpga drivers not selected
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/400-armadeus-add_apf51_module.patch | 32 ++++++++++---------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/patches/linux/2.6.38/400-armadeus-add_apf51_module.patch b/patches/linux/2.6.38/400-armadeus-add_apf51_module.patch
index e3c2c71..8c7f377 100644
--- a/patches/linux/2.6.38/400-armadeus-add_apf51_module.patch
+++ b/patches/linux/2.6.38/400-armadeus-add_apf51_module.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
+Index: linux-2.6.38.8/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig 2011-07-18 15:25:44.569814001 +0200
-+++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig 2011-07-18 15:29:36.529814001 +0200
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/Kconfig 2011-10-21 11:26:54.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/Kconfig 2011-10-21 12:13:39.000000000 +0200
@@ -162,4 +162,16 @@
Include support for MX50 reference design platform (RDP) board. This
includes specific configurations for the board and its peripherals.
@@ -19,10 +19,10 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
+ includes specific configurations for the board and its peripherals.
+
endif
-Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
+Index: linux-2.6.38.8/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-mx5/Makefile 2011-07-18 15:25:44.553814000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-mx5/Makefile 2011-07-18 15:29:36.517814001 +0200
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/Makefile 2011-06-03 03:35:11.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/Makefile 2011-10-21 12:13:39.000000000 +0200
@@ -7,6 +7,7 @@
obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
@@ -31,11 +31,11 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
obj-$(CONFIG_MACH_MX53_EVK) += board-mx53_evk.o
-Index: linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c
+Index: linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c 2011-07-18 15:26:44.681814002 +0200
-@@ -0,0 +1,500 @@
++++ linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c 2011-10-21 12:14:53.000000000 +0200
+@@ -0,0 +1,502 @@
+/*
+ * Support for APF51 System On Module
+ * Copyright (C) 2010-2011 Armadeus Systems <su...@ar...>
@@ -509,7 +509,9 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c
+ mxc_register_device(&mxc_usbdr_udc_device, &apf51_usbdr_device_pdata);
+ }
+
++#ifdef CONFIG_ARMADEUS_FPGA_DRIVERS
+ apf51_fpga_init();
++#endif
+
+ imx51_add_imx2_wdt(0, NULL);
+
@@ -536,10 +538,10 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c
+ .timer = &apf51_timer,
+MACHINE_END
+
-Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h
+Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-07-18 15:25:44.517814000 +0200
-+++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h 2011-07-18 15:26:44.681814002 +0200
+--- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-10-21 11:26:55.000000000 +0200
++++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/uncompress.h 2011-10-21 11:26:56.000000000 +0200
@@ -63,6 +63,7 @@
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
@@ -558,10 +560,10 @@ Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h
default:
break;
}
-Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h
+Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/irqs.h
===================================================================
---- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-07-18 15:25:44.533814001 +0200
-+++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h 2011-07-18 15:29:50.097814001 +0200
+--- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-10-21 11:26:56.000000000 +0200
++++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/irqs.h 2011-10-21 11:26:56.000000000 +0200
@@ -53,6 +53,8 @@
#define MXC_BOARD_IRQS 80
#elif defined CONFIG_MACH_APF27
hooks/post-receive
--
armadeus
|
