From: Eric Bénard <eric@eukrea.com>
Date: Sun, 1 Apr 2012 13:15:05 +0000 (+0200)
Subject: linux-imx: fix no-unaligned patch
X-Git-Tag: 2.1~1875
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f6e79e8814f4dd18629e7dd6b5a893c177351feb;p=meta-freescale.git

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>
---

diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/no-unaligned-access.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/no-unaligned-access.patch
index 442d2731..23fe71ea 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/no-unaligned-access.patch
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/no-unaligned-access.patch
@@ -23,16 +23,17 @@ index 554683d..087e0c0 100644
  # But warn user when we do so
  warn-assign = \
 diff --git a/arch/arm/Makefile b/arch/arm/Makefile
-index 767874d..cdf3529 100644
+index 767874d..89afaea 100644
 --- a/arch/arm/Makefile
 +++ b/arch/arm/Makefile
-@@ -93,6 +93,10 @@ ifeq ($(CONFIG_ARM_UNWIND),y)
+@@ -93,6 +93,11 @@ ifeq ($(CONFIG_ARM_UNWIND),y)
  CFLAGS_ABI	+=-funwind-tables
  endif
  
-+ifeq ($(CONFIG_ALIGMENT_TRAP),y)
-+CFLAGS_ABI	+=$(call cc-option,-mno-unaligned-access,)
++ifeq ($(CONFIG_ALIGNMENT_TRAP),y)
++CFLAGS_ABI    +=$(call cc-option,-mno-unaligned-access,)
 +endif
++KBUILD_CFLAGS += $(call cc-option,-fno-conserve-stack,)
 +
  ifeq ($(CONFIG_THUMB2_KERNEL),y)
  AFLAGS_AUTOIT	:=$(call as-option,-Wa$(comma)-mimplicit-it=always,-Wa$(comma)-mauto-it)
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb
index 96daddb9..00c3a8f8 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -4,7 +4,7 @@
 DESCRIPTION = "Linux kernel for imx platforms"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-PR = "r15"
+PR = "r16"
 
 inherit kernel
 COMPATIBLE_MACHINE = "(imx53qsb|imx53ard|imx51evk)"