Skip to content

Commit

Permalink
linux-ixp4xx: Fix build with binutils 2.21.1
Browse files Browse the repository at this point in the history
The patch is backport from mainline

Signed-off-by: Khem Raj <raj.khem@gmail.com>
  • Loading branch information
kraj committed Jul 26, 2011
1 parent f0b71c3 commit a83a355
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 2 deletions.
@@ -0,0 +1,31 @@
From 83a5d2d1b4cc06ce17b44873e004fc0b55552183 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sat, 12 Mar 2011 03:27:22 +0000
Subject: [PATCH] ARM: Fix .size directive for xscale_dma_a0_map_area

gas used to accept (and ignore?) .size directives which referred to
undefined symbols, as this does. In binutils 2.21 these are treated
as fatal errors.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
---
arch/arm/mm/proc-xscale.S | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
index ce233bc..42af976 100644
--- a/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
@@ -395,7 +395,7 @@ ENTRY(xscale_dma_a0_map_area)
teq r2, #DMA_TO_DEVICE
beq xscale_dma_clean_range
b xscale_dma_flush_range
-ENDPROC(xscsale_dma_a0_map_area)
+ENDPROC(xscale_dma_a0_map_area)

/*
* dma_unmap_area(start, size, dir)
--
1.7.0.4

6 changes: 4 additions & 2 deletions recipes-kernel/linux/linux-ixp4xx_2.6.37.bb
Expand Up @@ -10,12 +10,14 @@ KERNEL_RELEASE = "2.6.37"
#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCPV}"

PV = "${KERNEL_RELEASE}+svnr${SRCPV}"
PR = "r0"
PR = "r1"

SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${VANILLA_VERSION};proto=http \
file://defconfig-${KERNEL_RELEASE} \
file://perf-gcc460-build-fixes.patch"
file://perf-gcc460-build-fixes.patch \
file://0001-ARM-Fix-.size-directive-for-xscale_dma_a0_map_area.patch \
"

S = "${WORKDIR}/linux-${VANILLA_VERSION}"

Expand Down

0 comments on commit a83a355

Please sign in to comment.