summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2012-04-01 15:15:05 +0200
committerOtavio Salvador <otavio@ossystems.com.br>2012-04-01 17:40:10 +0000
commit9fc87a4b81a98ef18cae3349813bf8369863027c (patch)
treef527ff45231bc431130c93b129a899387f95e2fd
parentea694a8ed8804612f9df16261aca74eca8506a77 (diff)
downloadmeta-fsl-arm-9fc87a4b81a98ef18cae3349813bf8369863027c.tar.gz
linux-imx: fix no-unaligned patch
in 551bb42 linux-imx: fix no-unaligned-access.patch I made a typo which leads to a non working patch. This one should be fine (tested with angstrom-bleeding) Signed-off-by: Eric Bénard <eric@eukrea.com>
-rw-r--r--recipes-kernel/linux/linux-imx-2.6.35.3/no-unaligned-access.patch9
-rw-r--r--recipes-kernel/linux/linux-imx_2.6.35.3.bb2
2 files changed, 6 insertions, 5 deletions
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
index 442d273..23fe71e 100644
--- 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
@@ -23,16 +23,17 @@ index 554683d..087e0c0 100644
23 # But warn user when we do so 23 # But warn user when we do so
24 warn-assign = \ 24 warn-assign = \
25diff --git a/arch/arm/Makefile b/arch/arm/Makefile 25diff --git a/arch/arm/Makefile b/arch/arm/Makefile
26index 767874d..cdf3529 100644 26index 767874d..89afaea 100644
27--- a/arch/arm/Makefile 27--- a/arch/arm/Makefile
28+++ b/arch/arm/Makefile 28+++ b/arch/arm/Makefile
29@@ -93,6 +93,10 @@ ifeq ($(CONFIG_ARM_UNWIND),y) 29@@ -93,6 +93,11 @@ ifeq ($(CONFIG_ARM_UNWIND),y)
30 CFLAGS_ABI +=-funwind-tables 30 CFLAGS_ABI +=-funwind-tables
31 endif 31 endif
32 32
33+ifeq ($(CONFIG_ALIGMENT_TRAP),y) 33+ifeq ($(CONFIG_ALIGNMENT_TRAP),y)
34+CFLAGS_ABI +=$(call cc-option,-mno-unaligned-access,) 34+CFLAGS_ABI +=$(call cc-option,-mno-unaligned-access,)
35+endif 35+endif
36+KBUILD_CFLAGS += $(call cc-option,-fno-conserve-stack,)
36+ 37+
37 ifeq ($(CONFIG_THUMB2_KERNEL),y) 38 ifeq ($(CONFIG_THUMB2_KERNEL),y)
38 AFLAGS_AUTOIT :=$(call as-option,-Wa$(comma)-mimplicit-it=always,-Wa$(comma)-mauto-it) 39 AFLAGS_AUTOIT :=$(call as-option,-Wa$(comma)-mimplicit-it=always,-Wa$(comma)-mauto-it)
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 96daddb..00c3a8f 100644
--- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -4,7 +4,7 @@
4DESCRIPTION = "Linux kernel for imx platforms" 4DESCRIPTION = "Linux kernel for imx platforms"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" 6LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
7PR = "r15" 7PR = "r16"
8 8
9inherit kernel 9inherit kernel
10COMPATIBLE_MACHINE = "(imx53qsb|imx53ard|imx51evk)" 10COMPATIBLE_MACHINE = "(imx53qsb|imx53ard|imx51evk)"