[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-211-gd2c2c2d
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-211-gd2c2c2d
|
From: Julien B a. A. <ar...@us...> - 2012-03-28 08:25:11
|
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 d2c2c2df065b785ff6c24af66d8ee33de860e590 (commit)
via 09a2ab1eeea6ce783b414680a6c77ec67bafb296 (commit)
via d22abc02b402a642366e3b9a96c9e8e13e09f534 (commit)
from c8e23408299d3142feead3145dee4933ffc7a949 (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 d2c2c2df065b785ff6c24af66d8ee33de860e590
Merge: 09a2ab1 c8e2340
Author: Julien Boibessot <jul...@ar...>
Date: Wed Mar 28 10:22:56 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 09a2ab1eeea6ce783b414680a6c77ec67bafb296
Author: Julien Boibessot <jul...@ar...>
Date: Wed Mar 28 10:21:22 2012 +0200
[LINUX] APF51: Add VPU device declaration
commit d22abc02b402a642366e3b9a96c9e8e13e09f534
Author: Julien Boibessot <jul...@ar...>
Date: Wed Mar 28 10:15:49 2012 +0200
[TOOLS] quiltify.sh: fixes user choice description (there is no default)
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/400-armadeus-add_apf51_module.patch | 22 ++--
...ale-0034-ENGR00126692-3-add_hw-vpu_driver.patch | 92 +++++++++++++--
...0-add_scc2_and_sahara_drivers_without_rng.patch | 124 ++++++++++----------
scripts/quiltify.sh | 4 +-
4 files changed, 155 insertions(+), 87 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 23bda11..be43fda 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.8/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/Kconfig 2011-08-26 10:45:02.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/mach-mx5/Kconfig 2011-10-20 16:47:37.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/Kconfig 2012-03-26 16:38:15.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/Kconfig 2012-03-28 09:59:58.000000000 +0200
@@ -162,4 +162,17 @@
Include support for MX50 reference design platform (RDP) board. This
includes specific configurations for the board and its peripherals.
@@ -22,8 +22,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/Kconfig
endif
Index: linux-2.6.38.8/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/Makefile 2011-10-21 12:19:07.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/mach-mx5/Makefile 2011-10-21 14:30:28.000000000 +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 2012-03-28 09:59:58.000000000 +0200
@@ -7,6 +7,7 @@
obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
@@ -35,8 +35,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/Makefile
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.8/arch/arm/mach-mx5/board-apf51.c 2011-10-21 14:32:58.000000000 +0200
-@@ -0,0 +1,508 @@
++++ linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c 2012-03-26 20:28:00.000000000 +0200
+@@ -0,0 +1,510 @@
+/*
+ * Support for APF51 System On Module
+ * Copyright (C) 2010-2011 Armadeus systems <su...@ar...>
@@ -522,6 +522,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c
+
+ mxc_register_device(&mxc_scc_device, NULL);
+
++ mxc_register_device(&mxc_vpu_device, NULL);
++
+#ifdef CONFIG_MACH_APF51_HAS_BASEBOARD
+ apf51_baseboard_init();
+#endif
@@ -547,8 +549,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c
+
Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-10-21 12:19:07.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/uncompress.h 2011-10-21 12:21:14.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2012-03-26 16:38:16.000000000 +0200
++++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/uncompress.h 2012-03-26 16:38:17.000000000 +0200
@@ -63,6 +63,7 @@
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
@@ -569,8 +571,8 @@ Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/uncompress.h
}
Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/irqs.h
===================================================================
---- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-10-21 12:21:14.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/irqs.h 2011-10-21 12:21:14.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/irqs.h 2012-03-26 16:38:16.000000000 +0200
++++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/irqs.h 2012-03-26 16:38:17.000000000 +0200
@@ -53,6 +53,8 @@
#define MXC_BOARD_IRQS 80
#elif defined CONFIG_MACH_APF27
diff --git a/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_hw-vpu_driver.patch b/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_hw-vpu_driver.patch
index e7855fe..6c40182 100644
--- a/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_hw-vpu_driver.patch
+++ b/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_hw-vpu_driver.patch
@@ -25,7 +25,7 @@ Signed-off-by: Dinh Nguyen <Din...@fr...>
Index: linux-2.6.38.8/drivers/mxc/vpu/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/vpu/Kconfig 2012-03-15 15:50:48.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/vpu/Kconfig 2012-03-26 16:38:20.000000000 +0200
@@ -0,0 +1,22 @@
+#
+# Codec configuration
@@ -52,7 +52,7 @@ Index: linux-2.6.38.8/drivers/mxc/vpu/Kconfig
Index: linux-2.6.38.8/drivers/mxc/vpu/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/vpu/Makefile 2012-03-14 22:37:24.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/vpu/Makefile 2012-03-26 16:38:20.000000000 +0200
@@ -0,0 +1,9 @@
+#
+# Makefile for the VPU drivers.
@@ -66,7 +66,7 @@ Index: linux-2.6.38.8/drivers/mxc/vpu/Makefile
Index: linux-2.6.38.8/drivers/mxc/vpu/mxc_vpu.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/vpu/mxc_vpu.c 2012-03-15 16:03:13.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/vpu/mxc_vpu.c 2012-03-26 16:38:20.000000000 +0200
@@ -0,0 +1,868 @@
+/*
+ * Copyright 2006-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -938,8 +938,8 @@ Index: linux-2.6.38.8/drivers/mxc/vpu/mxc_vpu.c
+module_exit(vpu_exit);
Index: linux-2.6.38.8/drivers/mxc/Kconfig
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/Kconfig 2012-03-14 09:38:52.000000000 +0100
-+++ linux-2.6.38.8/drivers/mxc/Kconfig 2012-03-15 16:30:23.000000000 +0100
+--- linux-2.6.38.8.orig/drivers/mxc/Kconfig 2012-03-26 16:38:20.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Kconfig 2012-03-28 08:55:26.000000000 +0200
@@ -5,6 +5,7 @@
menu "MXC support drivers"
@@ -950,15 +950,15 @@ Index: linux-2.6.38.8/drivers/mxc/Kconfig
Index: linux-2.6.38.8/drivers/mxc/Makefile
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/Makefile 2012-03-14 09:38:52.000000000 +0100
-+++ linux-2.6.38.8/drivers/mxc/Makefile 2012-03-15 16:30:23.000000000 +0100
+--- linux-2.6.38.8.orig/drivers/mxc/Makefile 2012-03-26 16:38:20.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Makefile 2012-03-28 08:55:26.000000000 +0200
@@ -1 +1,2 @@
+obj-$(CONFIG_MXC_VPU) += vpu/
obj-$(CONFIG_MXC_HWEVENT) += hw_event/
Index: linux-2.6.38.8/include/linux/fsl_devices.h
===================================================================
--- linux-2.6.38.8.orig/include/linux/fsl_devices.h 2011-06-03 03:35:11.000000000 +0200
-+++ linux-2.6.38.8/include/linux/fsl_devices.h 2012-03-15 16:30:22.000000000 +0100
++++ linux-2.6.38.8/include/linux/fsl_devices.h 2012-03-28 08:55:24.000000000 +0200
@@ -109,6 +109,12 @@
int(*voltage_set)(int slot, int vcc, int vpp);
};
@@ -974,8 +974,8 @@ Index: linux-2.6.38.8/include/linux/fsl_devices.h
* instead of just the clock).
Index: linux-2.6.38.8/arch/arm/mach-mx5/system.c
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/system.c 2012-03-14 09:38:52.000000000 +0100
-+++ linux-2.6.38.8/arch/arm/mach-mx5/system.c 2012-03-15 16:30:22.000000000 +0100
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/system.c 2012-03-26 16:38:19.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/system.c 2012-03-28 08:55:24.000000000 +0200
@@ -82,3 +82,31 @@
__raw_writel(empgc1, MXC_SRPG_EMPGC1_SRPGCR);
}
@@ -1010,8 +1010,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/system.c
+EXPORT_SYMBOL(mxc_pg_disable);
Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/mxc.h
===================================================================
---- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/mxc.h 2012-03-14 09:38:52.000000000 +0100
-+++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/mxc.h 2012-03-14 09:38:52.000000000 +0100
+--- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/mxc.h 2012-03-26 16:38:19.000000000 +0200
++++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/mxc.h 2012-03-26 16:38:20.000000000 +0200
@@ -176,6 +176,9 @@
#endif
@@ -1025,7 +1025,7 @@ Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/mxc.h
Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/mxc_vpu.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/mxc_vpu.h 2012-03-14 18:58:08.000000000 +0100
++++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/mxc_vpu.h 2012-03-26 16:38:20.000000000 +0200
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -1115,3 +1115,69 @@ Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/mxc_vpu.h
+#define VPU_WAKE_REG_VALUE 11
+
+#endif
+Index: linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c
+===================================================================
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/clock-mx51-mx53.c 2012-03-26 17:10:53.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c 2012-03-28 08:56:35.000000000 +0200
+@@ -1214,11 +1214,15 @@
+ /* FEC */
+ DEFINE_CLOCK(fec_clk, 0, MXC_CCM_CCGR2, MXC_CCM_CCGRx_CG12_OFFSET,
+ NULL, NULL, &ipg_clk, NULL);
+-
++
+ /* NFC */
+ DEFINE_CLOCK_CCGR(nfc_clk, 0, MXC_CCM_CCGR5, MXC_CCM_CCGRx_CG10_OFFSET,
+ clk_nfc, &emi_slow_clk, NULL);
+
++/* VPU */
++DEFINE_CLOCK(vpu_clk, 0, MXC_CCM_CCGR5, MXC_CCM_CCGRx_CG4_OFFSET,
++ NULL, NULL, &ahb_clk, NULL);
++
+ /* SSI */
+ DEFINE_CLOCK(ssi1_ipg_clk, 0, MXC_CCM_CCGR3, MXC_CCM_CCGRx_CG8_OFFSET,
+ NULL, NULL, &ipg_clk, NULL);
+@@ -1315,6 +1319,7 @@
+ _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
+ _REGISTER_CLOCK("imx-ssi.2", NULL, ssi3_clk)
+ _REGISTER_CLOCK("imx-sdma", NULL, sdma_clk)
++ _REGISTER_CLOCK("mxc_vpu.0", NULL, vpu_clk)
+ _REGISTER_CLOCK(NULL, "ckih", ckih_clk)
+ _REGISTER_CLOCK(NULL, "ckih2", ckih2_clk)
+ _REGISTER_CLOCK(NULL, "gpt_32k", gpt_32k_clk)
+Index: linux-2.6.38.8/arch/arm/mach-mx5/devices.c
+===================================================================
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/devices.c 2012-03-26 16:53:58.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/devices.c 2012-03-28 08:55:27.000000000 +0200
+@@ -182,3 +182,23 @@
+ return mxc_gpio_init(mxc_gpio_ports, ARRAY_SIZE(mxc_gpio_ports));
+ }
+
++static struct resource vpu_resources[] = {
++ {
++ .start = MX51_VPU_BASE_ADDR,
++ .end = MX51_VPU_BASE_ADDR + SZ_4K - 1,
++ .flags = IORESOURCE_MEM,
++ },
++ {
++ .start = MX51_MXC_INT_VPU,
++ .end = MX51_MXC_INT_VPU,
++ .flags = IORESOURCE_IRQ,
++ },
++};
++
++struct platform_device mxc_vpu_device = {
++ .name = "mxc_vpu",
++ .id = 0,
++ .num_resources = ARRAY_SIZE(vpu_resources),
++ .resource = vpu_resources,
++};
++
+Index: linux-2.6.38.8/arch/arm/mach-mx5/devices.h
+===================================================================
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/devices.h 2012-03-26 16:58:18.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/devices.h 2012-03-28 08:55:27.000000000 +0200
+@@ -3,3 +3,4 @@
+ extern struct platform_device mxc_usbh2_device;
+ extern struct platform_device mxc_usbdr_udc_device;
+ extern struct platform_device mxc_hsi2c_device;
++extern struct platform_device mxc_vpu_device;
diff --git a/patches/linux/2.6.38/442-freescale-0197-ENGR00131650-add_scc2_and_sahara_drivers_without_rng.patch b/patches/linux/2.6.38/442-freescale-0197-ENGR00131650-add_scc2_and_sahara_drivers_without_rng.patch
index 1558f2a..b741baf 100644
--- a/patches/linux/2.6.38/442-freescale-0197-ENGR00131650-add_scc2_and_sahara_drivers_without_rng.patch
+++ b/patches/linux/2.6.38/442-freescale-0197-ENGR00131650-add_scc2_and_sahara_drivers_without_rng.patch
@@ -60,8 +60,8 @@ Signed-off-by: Anish Trivedi <an...@fr...>
Index: linux-2.6.38.8/drivers/mxc/security/Kconfig
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/security/Kconfig 2011-10-20 19:20:21.000000000 +0200
-+++ linux-2.6.38.8/drivers/mxc/security/Kconfig 2011-10-20 19:22:51.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/mxc/security/Kconfig 2012-03-28 10:01:28.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/Kconfig 2012-03-28 10:01:36.000000000 +0200
@@ -8,4 +8,57 @@
This module contains the core API's for accessing the DryIce module.
If you are unsure about this, say N here.
@@ -122,8 +122,8 @@ Index: linux-2.6.38.8/drivers/mxc/security/Kconfig
endmenu
Index: linux-2.6.38.8/drivers/mxc/security/Makefile
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/security/Makefile 2011-10-20 19:20:21.000000000 +0200
-+++ linux-2.6.38.8/drivers/mxc/security/Makefile 2011-10-20 19:22:51.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/mxc/security/Makefile 2012-03-28 10:01:28.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/Makefile 2012-03-28 10:01:36.000000000 +0200
@@ -1 +1,11 @@
obj-$(CONFIG_MXC_DRYICE) += dryice.o
+# Makefile for the Linux MXC Security API
@@ -139,7 +139,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/Makefile
Index: linux-2.6.38.8/drivers/mxc/security/mxc_scc.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/mxc_scc.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/mxc_scc.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,2386 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -2530,7 +2530,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/mxc_scc.c
Index: linux-2.6.38.8/drivers/mxc/security/mxc_scc_internals.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/mxc_scc_internals.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/mxc_scc_internals.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,498 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -3033,7 +3033,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/mxc_scc_internals.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/Kconfig 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/Kconfig 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,35 @@
+menu "SAHARA2 Security Hardware Support"
+
@@ -3073,7 +3073,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/Kconfig
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/Makefile 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/Makefile 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,47 @@
+# Makefile for the Linux Sahara2 driver
+#
@@ -3125,7 +3125,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/Makefile
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,706 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -3836,7 +3836,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -4027,7 +4027,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,266 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -4298,7 +4298,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_keystore.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_keystore.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_keystore.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,837 @@
+/*
+ * Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -5140,7 +5140,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_keystore.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -5241,7 +5241,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,281 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -5527,7 +5527,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -5669,7 +5669,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,967 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -6641,7 +6641,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -6759,7 +6759,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/diagnostic.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/diagnostic.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/diagnostic.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -6880,7 +6880,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/diagnostic.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_platform.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_platform.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_platform.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -7046,7 +7046,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_platform.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,2515 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -9566,7 +9566,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw_keystore.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw_keystore.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw_keystore.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,475 @@
+/*
+ * Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -10046,7 +10046,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw_keystore.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,1829 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -11880,7 +11880,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/platform_abstractions.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/platform_abstractions.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/platform_abstractions.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2005-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -11900,7 +11900,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/platform_abstractions
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/portable_os.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/portable_os.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/portable_os.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,1453 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13358,7 +13358,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/portable_os.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13465,7 +13465,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_hardware_interface.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_hardware_interface.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_hardware_interface.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13569,7 +13569,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_hardware_interfac
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_interrupt_handler.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_interrupt_handler.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_interrupt_handler.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13616,7 +13616,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_interrupt_handler
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_kernel.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_kernel.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_kernel.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13734,7 +13734,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_kernel.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_memory_mapper.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_memory_mapper.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_memory_mapper.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13818,7 +13818,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_memory_mapper.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_queue_manager.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_queue_manager.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_queue_manager.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13886,7 +13886,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_queue_manager.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -14119,7 +14119,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,2265 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -16389,7 +16389,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara2_kernel.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara2_kernel.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara2_kernel.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -16443,7 +16443,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara2_kernel.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,466 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -16914,7 +16914,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/km_adaptor.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/km_adaptor.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/km_adaptor.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,849 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -17768,7 +17768,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/km_adaptor.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,2185 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -19958,7 +19958,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_hardware_interface.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_hardware_interface.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_hardware_interface.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,808 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -20771,7 +20771,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_hardware_interface.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_interrupt_handler.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_interrupt_handler.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_interrupt_handler.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,216 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -20992,7 +20992,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_interrupt_handler.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,2356 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -23353,7 +23353,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,249 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -23607,7 +23607,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,1050 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -24662,7 +24662,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,734 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -25401,7 +25401,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sf_util.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sf_util.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sf_util.c 2012-03-28 10:01:36.000000000 +0200
@@ -0,0 +1,1390 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -26796,7 +26796,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sf_util.c
Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/scc2_driver.c 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/scc2_driver.c 2012-03-28 10:01:37.000000000 +0200
@@ -0,0 +1,2395 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -29196,7 +29196,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
Index: linux-2.6.38.8/drivers/mxc/security/scc2_internals.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/scc2_internals.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/scc2_internals.h 2012-03-28 10:01:37.000000000 +0200
@@ -0,0 +1,519 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -29719,8 +29719,8 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_internals.h
+#endif /* SCC_INTERNALS_H */
Index: linux-2.6.38.8/drivers/mxc/Kconfig
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/Kconfig 2011-10-20 19:18:47.000000000 +0200
-+++ linux-2.6.38.8/drivers/mxc/Kconfig 2011-10-20 19:22:51.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/mxc/Kconfig 2012-03-28 10:01:12.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Kconfig 2012-03-28 10:01:37.000000000 +0200
@@ -6,6 +6,7 @@
source "drivers/mxc/hw_event/Kconfig"
@@ -29731,8 +29731,8 @@ Index: linux-2.6.38.8/drivers/mxc/Kconfig
Index: linux-2.6.38.8/drivers/mxc/Makefile
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/Makefile 2011-10-20 19:19:59.000000000 +0200
-+++ linux-2.6.38.8/drivers/mxc/Makefile 2011-10-20 19:22:51.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/mxc/Makefile 2012-03-28 10:01:12.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Makefile 2012-03-28 10:01:37.000000000 +0200
@@ -1,2 +1,3 @@
obj-$(CONFIG_MXC_VPU) += vpu/
obj-$(CONFIG_MXC_HWEVENT) += hw_event/
@@ -29740,7 +29740,7 @@ Index: linux-2.6.38.8/drivers/mxc/Makefile
Index: linux-2.6.38.8/include/linux/mxc_scc2_driver.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/include/linux/mxc_scc2_driver.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/include/linux/mxc_scc2_driver.h 2012-03-28 10:01:37.000000000 +0200
@@ -0,0 +1,975 @@
+
+/*
@@ -30720,7 +30720,7 @@ Index: linux-2.6.38.8/include/linux/mxc_scc2_driver.h
Index: linux-2.6.38.8/include/linux/mxc_scc_driver.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/include/linux/mxc_scc_driver.h 2011-10-20 19:22:51.000000000 +0200
++++ linux-2.6.38.8/include/linux/mxc_scc_driver.h 2012-03-28 10:01:37.000000000 +0200
@@ -0,0 +1,1031 @@
+
+/*
@@ -31755,9 +31755,9 @@ Index: linux-2.6.38.8/include/linux/mxc_scc_driver.h
+#endif /* __ASM_ARCH_MXC_SCC_DRIVER_H__ */
Index: linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/clock-mx51-mx53.c 2011-10-20 19:16:38.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c 2011-10-20 19:22:51.000000000 +0200
-@@ -1255,6 +1255,10 @@
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/clock-mx51-mx53.c 2012-03-28 10:01:12.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c 2012-03-28 10:01:37.000000000 +0200
+@@ -1259,6 +1259,10 @@
DEFINE_CLOCK(sdma_clk, 1, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG15_OFFSET,
NULL, NULL, &ahb_clk, NULL);
@@ -31768,18 +31768,18 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c
/* eSDHC */
DEFINE_CLOCK_FULL(esdhc1_ipg_clk, 0, MXC_CCM_CCGR3, MXC_CCM_CCGRx_CG0_OFFSET,
NULL, NULL, _clk_max_enable, _clk_max_disable, &ipg_clk, NULL);
-@@ -1315,6 +1319,7 @@
- _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
+@@ -1320,6 +1324,7 @@
_REGISTER_CLOCK("imx-ssi.2", NULL, ssi3_clk)
_REGISTER_CLOCK("imx-sdma", NULL, sdma_clk)
+ _REGISTER_CLOCK("mxc_vpu.0", NULL, vpu_clk)
+ _REGISTER_CLOCK("imx-scc", NULL, scc_clk)
_REGISTER_CLOCK(NULL, "ckih", ckih_clk)
_REGISTER_CLOCK(NULL, "ckih2", ckih2_clk)
_REGISTER_CLOCK(NULL, "gpt_32k", gpt_32k_clk)
Index: linux-2.6.38.8/arch/arm/mach-mx5/devices.c
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/devices.c 2011-10-20 19:16:38.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/mach-mx5/devices.c 2011-10-20 19:22:51.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/devices.c 2012-03-28 10:01:12.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/devices.c 2012-03-28 10:01:37.000000000 +0200
@@ -120,6 +120,27 @@
},
};
@@ -31810,10 +31810,10 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/devices.c
.chip.label = "gpio-0",
Index: linux-2.6.38.8/arch/arm/mach-mx5/devices.h
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/devices.h 2011-10-20 19:16:38.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/mach-mx5/devices.h 2011-10-20 19:22:51.000000000 +0200
-@@ -3,3 +3,4 @@
- extern struct platform_device mxc_usbh2_device;
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/devices.h 2012-03-28 10:01:12.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/devices.h 2012-03-28 10:01:37.000000000 +0200
+@@ -4,3 +4,4 @@
extern struct platform_device mxc_usbdr_udc_device;
extern struct platform_device mxc_hsi2c_device;
+ extern struct platform_device mxc_vpu_device;
+extern struct platform_device mxc_scc_device;
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 15af09b..499b2f3 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -52,10 +52,10 @@ make shell_env
. armadeus_env.sh
if [ "$1" != "export" ]; then
- ask_user_choice "What do you want to quiltify today ? ;-)" "Linux_(default) Buildroot U-Boot"
+ ask_user_choice "What do you want to quiltify today ? ;-)" "Linux Buildroot U-Boot"
fi
if [ "$1" == "export" ]; then
- ask_user_choice "What kind of quilt patches do you want to export ?" "Linux_(default) Buildroot U-Boot"
+ ask_user_choice "What kind of quilt patches do you want to export ?" "Linux Buildroot U-Boot"
fi
if [ "$answer" == "Buildroot" ]; then
hooks/post-receive
--
armadeus
|
