summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-09-13 12:30:11 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2012-09-13 17:27:45 -0300
commit3d65ea60fc88a442abee15a7272e974cc04aea3f (patch)
treecf5b31c985abb98470c13e394a095b7a0e0818f8
parent749e8333698cae764ccc13a969f24c0942a868c9 (diff)
downloadmeta-fsl-arm-3d65ea60fc88a442abee15a7272e974cc04aea3f.tar.gz
linux-imx (2.6.35.3): Update to newer GIT versions
This remove 8 patches that were merged (or had equivalent fix implemented) on Freescale kernel. The kernel has been updated to mxs and mx5 SoCs. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Rogerio Pimentel <rogerio.pimentel@freescale.com>
Diffstat
-rw-r--r--recipes-kernel/linux/linux-imx-2.6.35.3/002_Return_ERESTARTSYS_from_IPU_GET_EVENT.patch23
-rw-r--r--recipes-kernel/linux/linux-imx-2.6.35.3/003_Sanitise_ipu_interrupt_return_value.patch50
-rw-r--r--recipes-kernel/linux/linux-imx-2.6.35.3/dm9601-support-for-usb-ethernet-0x0fe6-0x9700.patch32
-rw-r--r--recipes-kernel/linux/linux-imx-2.6.35.3/mx23-do-not-use-safe-write.patch31
-rw-r--r--recipes-kernel/linux/linux-imx-2.6.35.3/mx23-dont-mange-IRQ_VDDA_BRNOUT.patch51
-rw-r--r--recipes-kernel/linux/linux-imx-2.6.35.3/no-unaligned-access.patch40
-rw-r--r--recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Do-not-treat-warnings-as-errors.patch30
-rw-r--r--recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Fix-build-against-newer-glibc.patch40
-rw-r--r--recipes-kernel/linux/linux-imx_2.6.35.3.bb14
9 files changed, 3 insertions, 308 deletions
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/002_Return_ERESTARTSYS_from_IPU_GET_EVENT.patch b/recipes-kernel/linux/linux-imx-2.6.35.3/002_Return_ERESTARTSYS_from_IPU_GET_EVENT.patch
deleted file mode 100644
index 08cf608..0000000
--- a/recipes-kernel/linux/linux-imx-2.6.35.3/002_Return_ERESTARTSYS_from_IPU_GET_EVENT.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1commit 0ffabfea6c190d28e25587c95e282eb777b3feb2
2Author: Phil Endecott <git@chezphil.org>
3Date: Mon Oct 31 21:21:41 2011 +0000
4
5 Return ERESTARTSYS from IPU_GET_EVENT
6
7Index: git/drivers/mxc/ipu/ipu_device.c
8===================================================================
9--- git.orig/drivers/mxc/ipu/ipu_device.c 2012-01-24 15:34:37.000000000 +0100
10+++ git/drivers/mxc/ipu/ipu_device.c 2012-01-31 16:21:19.599303457 +0100
11@@ -411,8 +411,10 @@
12
13 r = get_events(&info);
14 if (r == -1) {
15- wait_event_interruptible_timeout(waitq,
16- (pending_events != 0), 2 * HZ);
17+ if (wait_event_interruptible_timeout(waitq,
18+ (pending_events != 0), 2 * HZ)) < 0) {
19+ return -ERESTARTSYS;
20+ }
21 r = get_events(&info);
22 }
23 ret = -1;
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/003_Sanitise_ipu_interrupt_return_value.patch b/recipes-kernel/linux/linux-imx-2.6.35.3/003_Sanitise_ipu_interrupt_return_value.patch
deleted file mode 100644
index c199959..0000000
--- a/recipes-kernel/linux/linux-imx-2.6.35.3/003_Sanitise_ipu_interrupt_return_value.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1commit 7237ebd59bf1cd8bcc9508ec4bc5674dc7cc6c58
2Author: Phil Endecott <git@chezphil.org>
3Date: Tue Nov 1 18:16:56 2011 +0000
4
5 Sanitise ipu interrupt return value, and loop waiting for interrupt
6
7diff --git a/drivers/mxc/ipu3/ipu_device.c b/drivers/mxc/ipu3/ipu_device.c
8index 1955f09..d66b8f8 100644
9--- a/drivers/mxc/ipu3/ipu_device.c
10+++ b/drivers/mxc/ipu3/ipu_device.c
11@@ -311,7 +311,7 @@ static int mxc_ipu_ioctl(struct inode *inode, struct file *file,
12 structure and pass the pointer in arg */
13 {
14 ipu_event_info info;
15- int r = -1;
16+ int r;
17
18 if (copy_from_user
19 (&info, (ipu_event_info *) arg,
20@@ -319,7 +319,7 @@ static int mxc_ipu_ioctl(struct inode *inode, struct file *file,
21 return -EFAULT;
22
23 r = get_events(&info);
24- if (r == -1) {
25+ while (r == -1) {
26 if ((file->f_flags & O_NONBLOCK) &&
27 (irq_info[info.irq].irq_pending == 0))
28 return -EAGAIN;
29@@ -328,13 +328,15 @@ static int mxc_ipu_ioctl(struct inode *inode, struct file *file,
30 return -ERESTARTSYS;
31 }
32 r = get_events(&info);
33+ if (r == -1) {
34+ /* Shouldn't happen? */
35+ printk(KERN_ERR "no events after waiting\n");
36+ }
37 }
38- ret = -1;
39- if (r == 0) {
40- if (!copy_to_user((ipu_event_info *) arg,
41- &info, sizeof(ipu_event_info)))
42- ret = 0;
43- }
44+ if (copy_to_user((ipu_event_info *) arg,
45+ &info, sizeof(ipu_event_info)))
46+ return -EFAULT;
47+ ret = 0;
48 }
49 break;
50 case IPU_ALOC_MEM:
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/dm9601-support-for-usb-ethernet-0x0fe6-0x9700.patch b/recipes-kernel/linux/linux-imx-2.6.35.3/dm9601-support-for-usb-ethernet-0x0fe6-0x9700.patch
deleted file mode 100644
index 6a2a940..0000000
--- a/recipes-kernel/linux/linux-imx-2.6.35.3/dm9601-support-for-usb-ethernet-0x0fe6-0x9700.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1dm9601: Added support for usb ethernet (0x0fe6, 0x9700)
2
3The device is very similar to (0x0fe6, 0x8101),
4And works well with dm9601 driver.
5
6Upstream-Status: Backport [2.6.38]
7
8Signed-off-by: Shahar Havivi <shaharh@redhat.com>
9Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
10Signed-off-by: David S. Miller <davem@davemloft.net>
11---
12 drivers/net/usb/dm9601.c | 4 ++++
13 1 file changed, 4 insertions(+)
14
15diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
16index 02b622e..5002f5b 100644
17--- a/drivers/net/usb/dm9601.c
18+++ b/drivers/net/usb/dm9601.c
19@@ -651,6 +651,10 @@ static const struct usb_device_id products[] = {
20 .driver_info = (unsigned long)&dm9601_info,
21 },
22 {
23+ USB_DEVICE(0x0fe6, 0x9700), /* DM9601 USB to Fast Ethernet Adapter */
24+ .driver_info = (unsigned long)&dm9601_info,
25+ },
26+ {
27 USB_DEVICE(0x0a46, 0x9000), /* DM9000E */
28 .driver_info = (unsigned long)&dm9601_info,
29 },
30--
311.7.10
32
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/mx23-do-not-use-safe-write.patch b/recipes-kernel/linux/linux-imx-2.6.35.3/mx23-do-not-use-safe-write.patch
deleted file mode 100644
index d25a3ec..0000000
--- a/recipes-kernel/linux/linux-imx-2.6.35.3/mx23-do-not-use-safe-write.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From: Otavio Salvador <otavio@ossystems.com.br>
2Subject: [PATCH 2/2] [MX23] Do not use safe write when building for MX23 arch
3
4The change 105ae4a60 include a safe write support for use with MX23
5but does not include a dummy implementation for other architecture
6making build to fail. This add a dummy version to allow the use with
7MX23 arch.
8
9Upstream-Status: Pending
10
11Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
12---
13 arch/arm/plat-mxs/usb_common.c | 2 ++
14 1 file changed, 2 insertions(+)
15
16diff --git a/arch/arm/plat-mxs/usb_common.c b/arch/arm/plat-mxs/usb_common.c
17index 700d168..c3bc9a9 100644
18--- a/arch/arm/plat-mxs/usb_common.c
19+++ b/arch/arm/plat-mxs/usb_common.c
20@@ -53,6 +53,8 @@ static void fsl_safe_writel(u32 val32, volatile u32 *addr)
21 {
22 __asm__ ("swp %0, %0, [%1]" : : "r"(val32), "r"(addr));
23 }
24+#else
25+static void fsl_safe_writel(u32 val32, volatile u32 *addr) { }
26 #endif
27
28 void fsl_usb_xcvr_register(struct fsl_xcvr_ops *xcvr_ops)
29--
301.7.10.4
31
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/mx23-dont-mange-IRQ_VDDA_BRNOUT.patch b/recipes-kernel/linux/linux-imx-2.6.35.3/mx23-dont-mange-IRQ_VDDA_BRNOUT.patch
deleted file mode 100644
index a98878a..0000000
--- a/recipes-kernel/linux/linux-imx-2.6.35.3/mx23-dont-mange-IRQ_VDDA_BRNOUT.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From: Otavio Salvador <otavio@ossystems.com.br>
2Subject: [PATCH 1/2] [MX23] Don't mangle IRQ_VDDA_BRNOUT for MX23 arch
3
4This has been introduced on commit e93820b3 and makes the kernel to
5fail to build for MX23 arch so we avoid the IRQ_VDDA_BRNOUT
6manipulation for MX23 arch as this IRQ is not available on MX23.
7
8Upstream-Status: Pending
9
10Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
11---
12 drivers/power/mxs/linux.c | 6 ++++++
13 1 file changed, 6 insertions(+)
14
15diff --git a/drivers/power/mxs/linux.c b/drivers/power/mxs/linux.c
16index d5185fa..0d6c729 100644
17--- a/drivers/power/mxs/linux.c
18+++ b/drivers/power/mxs/linux.c
19@@ -1171,7 +1171,9 @@ static int __init mxs_bat_init(void)
20 disable_irq(IRQ_DCDC4P2_BRNOUT);
21 disable_irq(IRQ_BATT_BRNOUT);
22 disable_irq(IRQ_VDDD_BRNOUT);
23+#ifndef CONFIG_ARCH_MX23
24 disable_irq(IRQ_VDDA_BRNOUT);
25+#endif
26 if (no_battery)
27 disable_irq(IRQ_VDDIO_BRNOUT);
28 #ifndef CONFIG_ARCH_MX28
29@@ -1184,7 +1186,9 @@ static int __init mxs_bat_init(void)
30 mxs_set_irq_fiq(IRQ_DCDC4P2_BRNOUT, 1);
31 mxs_set_irq_fiq(IRQ_BATT_BRNOUT, 1);
32 mxs_set_irq_fiq(IRQ_VDDD_BRNOUT, 1);
33+#ifndef CONFIG_ARCH_MX23
34 mxs_set_irq_fiq(IRQ_VDDA_BRNOUT, 1);
35+#endif
36 if (no_battery)
37 mxs_set_irq_fiq(IRQ_VDDIO_BRNOUT, 1);
38 #ifndef CONFIG_ARCH_MX28
39@@ -1199,7 +1203,9 @@ static int __init mxs_bat_init(void)
40 enable_irq(IRQ_DCDC4P2_BRNOUT);
41 enable_irq(IRQ_BATT_BRNOUT);
42 enable_irq(IRQ_VDDD_BRNOUT);
43+#ifndef CONFIG_ARCH_MX23
44 enable_irq(IRQ_VDDA_BRNOUT);
45+#endif
46 if (no_battery)
47 enable_irq(IRQ_VDDIO_BRNOUT);
48 #ifndef CONFIG_ARCH_MX28
49--
501.7.10.4
51
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/no-unaligned-access.patch b/recipes-kernel/linux/linux-imx-2.6.35.3/no-unaligned-access.patch
deleted file mode 100644
index 23fe71e..0000000
--- a/recipes-kernel/linux/linux-imx-2.6.35.3/no-unaligned-access.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1diff --git a/Makefile b/Makefile
2index 554683d..087e0c0 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -535,6 +535,9 @@ else
6 KBUILD_CFLAGS += -O2
7 endif
8
9+# conserve stack if available
10+KBUILD_CFLAGS += $(call cc-option,-fconserve-stack)
11+
12 include $(srctree)/arch/$(SRCARCH)/Makefile
13
14 ifneq ($(CONFIG_FRAME_WARN),0)
15@@ -579,9 +582,6 @@ KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,)
16 # disable invalid "can't wrap" optimizations for signed / pointers
17 KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow)
18
19-# conserve stack if available
20-KBUILD_CFLAGS += $(call cc-option,-fconserve-stack)
21-
22 # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
23 # But warn user when we do so
24 warn-assign = \
25diff --git a/arch/arm/Makefile b/arch/arm/Makefile
26index 767874d..89afaea 100644
27--- a/arch/arm/Makefile
28+++ b/arch/arm/Makefile
29@@ -93,6 +93,11 @@ ifeq ($(CONFIG_ARM_UNWIND),y)
30 CFLAGS_ABI +=-funwind-tables
31 endif
32
33+ifeq ($(CONFIG_ALIGNMENT_TRAP),y)
34+CFLAGS_ABI +=$(call cc-option,-mno-unaligned-access,)
35+endif
36+KBUILD_CFLAGS += $(call cc-option,-fno-conserve-stack,)
37+
38 ifeq ($(CONFIG_THUMB2_KERNEL),y)
39 AFLAGS_AUTOIT :=$(call as-option,-Wa$(comma)-mimplicit-it=always,-Wa$(comma)-mauto-it)
40 AFLAGS_NOWARN :=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W)
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Do-not-treat-warnings-as-errors.patch b/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Do-not-treat-warnings-as-errors.patch
deleted file mode 100644
index a22e45b..0000000
--- a/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Do-not-treat-warnings-as-errors.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From b4084d9ae7d8ac3d7fe01cc745836313ae73afb6 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Fri, 7 Sep 2012 20:22:47 -0300
4Subject: [PATCH] perf tools: Do not treat warnings as errors
5
6Newer GCC detect more warnings and this makes building of perf not
7possible in the upcoming release of Yocto (1.3). We deal with that
8making the warnings not fatal instead of changing perf code.
9
10Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
11---
12 tools/perf/Makefile | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/tools/perf/Makefile b/tools/perf/Makefile
16index d75c28a..854652a 100644
17--- a/tools/perf/Makefile
18+++ b/tools/perf/Makefile
19@@ -225,7 +225,7 @@ ifndef PERF_DEBUG
20 CFLAGS_OPTIMIZE = -O6
21 endif
22
23-CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
24+CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
25 EXTLIBS = -lpthread -lrt -lelf -lm
26 ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
27 ALL_LDFLAGS = $(LDFLAGS)
28--
291.7.10.4
30
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Fix-build-against-newer-glibc.patch b/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Fix-build-against-newer-glibc.patch
deleted file mode 100644
index b90dfda..0000000
--- a/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Fix-build-against-newer-glibc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From ee7517dc33cd8c1d10bc504faef8a085694eebe2 Mon Sep 17 00:00:00 2001
2From: Josh Boyer <jwboyer@redhat.com>
3Date: Thu, 18 Aug 2011 07:37:21 -0400
4Subject: [PATCH 2/2] perf tools: Fix build against newer glibc
5
6Upstream glibc commit 295e904 added a definition for __attribute_const__
7to cdefs.h. This causes the following error when building perf:
8
9util/include/linux/compiler.h:8:0: error: "__attribute_const__"
10redefined [-Werror] /usr/include/sys/cdefs.h:226:0: note: this is the
11location of the previous definition
12
13Wrap __attribute_const__ in #ifndef as we do for __always_inline.
14
15Cc: Ingo Molnar <mingo@elte.hu>
16Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
17Link: http://lkml.kernel.org/r/20110818113720.GL2227@zod.bos.redhat.com
18Signed-off-by: Josh Boyer <jwboyer@redhat.com>
19Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
20---
21 tools/perf/util/include/linux/compiler.h | 2 ++
22 1 file changed, 2 insertions(+)
23
24diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h
25index 791f9dd..547628e 100644
26--- a/tools/perf/util/include/linux/compiler.h
27+++ b/tools/perf/util/include/linux/compiler.h
28@@ -5,7 +5,9 @@
29 #define __always_inline inline
30 #endif
31 #define __user
32+#ifndef __attribute_const__
33 #define __attribute_const__
34+#endif
35
36 #define __used __attribute__((__unused__))
37
38--
391.7.10.4
40
diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
index 4878259..083231e 100644
--- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -1,31 +1,25 @@
1# Copyright (C) 2011-2012 Freescale Semiconductor 1# Copyright (C) 2011-2012 Freescale Semiconductor
2# Released under the MIT license (see COPYING.MIT for the terms) 2# Released under the MIT license (see COPYING.MIT for the terms)
3 3
4PR = "${INC_PR}.7" 4PR = "${INC_PR}.8"
5 5
6include linux-imx.inc 6include linux-imx.inc
7 7
8COMPATIBLE_MACHINE = "(mxs|mx5)" 8COMPATIBLE_MACHINE = "(mxs|mx5)"
9 9
10# Revision of imx_2.6.35_10.12.01 branch 10# Revision of imx_2.6.35_10.12.01 branch
11SRCREV_mxs = "6a31a551bc302e74a17e9051bba356903e98273f" 11SRCREV_mxs = "38bf41cc376e24c384934fbeb10770d6712e9143"
12LOCALVERSION = "-10.12.01+yocto-${DATE}" 12LOCALVERSION = "-10.12.01+yocto-${DATE}"
13 13
14# Revision of imx_2.6.35_11.09.01 branch 14# Revision of imx_2.6.35_11.09.01 branch
15SRCREV_mx5 = "cb0c4573ddf2eb4ee6942929f265560740f5dad2" 15SRCREV_mx5 = "406cab2e8b3c030c0f86263282f846bb55a2faf6"
16LOCALVERSION = "-11.09.01+yocto-${DATE}" 16LOCALVERSION = "-11.09.01+yocto-${DATE}"
17 17
18SRC_URI += "file://NFS-Fix-nfsroot-support.patch \ 18SRC_URI += "file://NFS-Fix-nfsroot-support.patch \
19 file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \ 19 file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \
20 file://perf-tools-Fix-build-against-newer-glibc.patch \
21 file://perf-tools-Do-not-treat-warnings-as-errors.patch \
22 file://no-unaligned-access.patch \
23 file://dm9601-support-for-usb-ethernet-0x0fe6-0x9700.patch \
24" 20"
25 21
26SRC_URI_append_mxs = " \ 22SRC_URI_append_mxs = " \
27 file://mx23-do-not-use-safe-write.patch \
28 file://mx23-dont-mange-IRQ_VDDA_BRNOUT.patch \
29 file://mx28-removecpufreq.patch \ 23 file://mx28-removecpufreq.patch \
30 file://mxs-duart-use-ttyAMA-for-device-name.patch \ 24 file://mxs-duart-use-ttyAMA-for-device-name.patch \
31" 25"
@@ -34,6 +28,4 @@ SRC_URI_append_mx5 = " \
34 file://mx5-fix-hang-with-framebuffer.patch \ 28 file://mx5-fix-hang-with-framebuffer.patch \
35 file://egalax_ts-enable-single-event-support.patch \ 29 file://egalax_ts-enable-single-event-support.patch \
36 file://0001-mx53_loco-add-USR-led-support.patch \ 30 file://0001-mx53_loco-add-USR-led-support.patch \
37 file://002_Return_ERESTARTSYS_from_IPU_GET_EVENT.patch \
38 file://003_Sanitise_ipu_interrupt_return_value.patch \
39" 31"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-25 22:46:12 +0000