[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-124-g46803ac
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-124-g46803ac
|
From: jscheer <js...@us...> - 2011-05-10 12:49:28
|
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 46803acfafbb3148d4f942940611f6b666f80fb1 (commit)
from a37bbee0f20ee304c24ad2c7c3a61e43313a99f3 (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 46803acfafbb3148d4f942940611f6b666f80fb1
Author: Jeremie Scheer <jer...@ar...>
Date: Tue May 10 14:48:45 2011 +0200
[LINUX] [2.6.38.1] Fix flag CS5_BASE_ADDR in apf27.c (patch 281) to adapt it to Linux 2.6.38.1.
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/281-apf27-armadeus-add_apf27.c.patch | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
index fe25fe2..8126a2d 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
@@ -12,7 +12,7 @@ Signed-off-by: Kevin Joly <jol...@gm...>
Index: linux-2.6.38.1/arch/arm/mach-imx/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/arch/arm/mach-imx/apf27.c 2011-04-11 18:32:16.857382999 +0200
++++ linux-2.6.38.1/arch/arm/mach-imx/apf27.c 2011-05-10 14:19:07.000000000 +0200
@@ -0,0 +1,728 @@
+ /*
+ * apf27.c
@@ -649,7 +649,7 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/apf27.c
+static struct map_desc apf27_fpga_io_desc[] __initdata = {
+ {
+ .virtual = CS5_BASE_ADDR_VIRT,
-+ .pfn = __phys_to_pfn(CS5_BASE_ADDR),
++ .pfn = __phys_to_pfn(MX27_CS5_BASE_ADDR),
+ .length = CS5_SIZE,
+ .type = MT_DEVICE,
+ },
@@ -745,7 +745,7 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/apf27.c
Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c 2011-04-11 18:32:16.857382999 +0200
++++ linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c 2011-05-10 14:05:29.000000000 +0200
@@ -0,0 +1,938 @@
+ /*
+ * apf27-dev.c
@@ -1688,7 +1688,7 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-dev.c
Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/arch/arm/mach-imx/apf27-lcd.c 2011-04-11 18:32:16.861382996 +0200
++++ linux-2.6.38.1/arch/arm/mach-imx/apf27-lcd.c 2011-05-10 14:05:29.000000000 +0200
@@ -0,0 +1,168 @@
+/*
+ * apf27-lcd.c
@@ -1861,7 +1861,7 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-lcd.c
Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/arch/arm/mach-imx/apf27-dev-ext-apw.c 2011-04-11 18:32:16.861382996 +0200
++++ linux-2.6.38.1/arch/arm/mach-imx/apf27-dev-ext-apw.c 2011-05-10 14:05:29.000000000 +0200
@@ -0,0 +1,175 @@
+ /*
+ * apf27-dev-ext-apw.c
@@ -2041,7 +2041,7 @@ Index: linux-2.6.38.1/arch/arm/mach-imx/apf27-dev-ext-apw.c
Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-03-23 21:04:47.000000000 +0100
-+++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h 2011-04-11 18:35:22.017382998 +0200
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h 2011-05-10 14:18:07.000000000 +0200
@@ -83,6 +83,7 @@
case MACH_TYPE_MX21ADS:
case MACH_TYPE_PCA100:
hooks/post-receive
--
armadeus
|
