Return-Path: Received: from vms173001pub.verizon.net (vms173001pub.verizon.net [206.46.173.1]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id C4596E00312 for ; Mon, 25 Feb 2013 19:43:58 -0800 (PST) Received: from gandalf.denix.org ([unknown] [108.45.150.102]) by vms173001.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MIT00F056D2FDL3@vms173001.mailsrvcs.net> for meta-ti@yoctoproject.org; Mon, 25 Feb 2013 21:43:51 -0600 (CST) Received: from localhost.localdomain (elrond [192.168.0.7]) by gandalf.denix.org (Postfix) with ESMTP id 9D16F200BD; Mon, 25 Feb 2013 22:43:50 -0500 (EST) From: Denys Dmytriyenko To: meta-ti@yoctoproject.org Date: Mon, 25 Feb 2013 22:43:47 -0500 Message-id: <1361850227-13641-1-git-send-email-denis@denix.org> X-Mailer: git-send-email 1.8.1.2 Subject: [PATCH] linux-omap-psp: fix alignment issue of 2.6.37 kernel with gcc-4.7 X-BeenThere: meta-ti@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-ti layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2013 03:43:58 -0000 From: Denys Dmytriyenko Patch by Steve Sakoman Signed-off-by: Denys Dmytriyenko --- recipes-kernel/linux/linux-omap-psp_2.6.37.bb | 9 ++++++++ .../linux/0001-arm-fix-builds-with-gcc-4.7.patch | 26 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 recipes-kernel/linux/linux/0001-arm-fix-builds-with-gcc-4.7.patch diff --git a/recipes-kernel/linux/linux-omap-psp_2.6.37.bb b/recipes-kernel/linux/linux-omap-psp_2.6.37.bb index bafeba5..9eacfc9 100644 --- a/recipes-kernel/linux/linux-omap-psp_2.6.37.bb +++ b/recipes-kernel/linux/linux-omap-psp_2.6.37.bb @@ -6,6 +6,10 @@ COMPATIBLE_MACHINE = "omap3" SRCREV= "20c003f2f024d9f50f59edf9f1b8f5f035fb15b8" +# The main PR is now using MACHINE_KERNEL_PR, for omap3 devices +# see conf/machine/include/omap3.inc +MACHINE_KERNEL_PR_append = "a" + SRC_URI = "git://arago-project.org/git/projects/linux-omap3.git;protocol=git \ file://defconfig" @@ -83,6 +87,11 @@ SRC_URI += " \ file://0002-usb-musb-am35x-fix-role-switching-issue.patch \ " +# Fix alignment issue with gcc-4.7 +SRC_URI += " \ + file://0001-arm-fix-builds-with-gcc-4.7.patch \ +" + # Updated PIO mode for MUSB help description SRC_URI_append_am3517-evm = " file://0001-musb-update-PIO-mode-help-information-in-Kconfig.patch" diff --git a/recipes-kernel/linux/linux/0001-arm-fix-builds-with-gcc-4.7.patch b/recipes-kernel/linux/linux/0001-arm-fix-builds-with-gcc-4.7.patch new file mode 100644 index 0000000..db701e2 --- /dev/null +++ b/recipes-kernel/linux/linux/0001-arm-fix-builds-with-gcc-4.7.patch @@ -0,0 +1,26 @@ +From 0d12debe917269a013f8eddd42da8d3de5e3174e Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Thu, 24 Jan 2013 15:42:01 -0800 +Subject: [PATCH] arm: fix builds with gcc 4.7 + +new unaligned access support in GCC was triggering an alignment fault at boot +--- + arch/arm/kernel/head.S | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S +index 6bd82d2..56b02cd 100644 +--- a/arch/arm/kernel/head.S ++++ b/arch/arm/kernel/head.S +@@ -336,7 +336,7 @@ __secondary_data: + * r13 = *virtual* address to jump to upon completion + */ + __enable_mmu: +-#ifdef CONFIG_ALIGNMENT_TRAP ++#if defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 6 + orr r0, r0, #CR_A + #else + bic r0, r0, #CR_A +-- +1.8.1.2 + -- 1.8.1.2