Patchwork [U-Boot,v2] arm: rmobile: Support build with gcc-4.6 or later

login
register
mail settings
Submitter Nobuhiro Iwamatsu
Date July 19, 2012, 11:51 p.m.
Message ID <1342741863-15200-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com>
Download mbox | patch
Permalink /patch/172101/
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Comments

Nobuhiro Iwamatsu - July 19, 2012, 11:51 p.m.
Latest rmobile code was tested by using old gcc (gcc-4.4).
When we use gcc-4.6 (or later), the build is made, but does not work.
This solves a problem not to work by add -march=armv5 to compiple option
when we built in gcc-4.6 (or later).
I tested by linaro's compiler version 2012.04-20120426.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---

 v2: does not remove wfi orderi, use an instruction code instead.

 arch/arm/cpu/armv7/rmobile/config.mk       |   26 ++++++++++++++++++++++++++
 arch/arm/cpu/armv7/rmobile/lowlevel_init.S |    2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/cpu/armv7/rmobile/config.mk

Patch

diff --git a/arch/arm/cpu/armv7/rmobile/config.mk b/arch/arm/cpu/armv7/rmobile/config.mk
new file mode 100644
index 0000000..1da0227
--- /dev/null
+++ b/arch/arm/cpu/armv7/rmobile/config.mk
@@ -0,0 +1,26 @@ 
+#
+# (C) Copyright 2002
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+PLATFORM_RELFLAGS += -fno-common -ffixed-r8 -msoft-float
+
+# Make ARMv5 to allow more compilers to work, even though its v7a.
+PLATFORM_CPPFLAGS += -march=armv5
diff --git a/arch/arm/cpu/armv7/rmobile/lowlevel_init.S b/arch/arm/cpu/armv7/rmobile/lowlevel_init.S
index 4f2ed02..30bbef0 100644
--- a/arch/arm/cpu/armv7/rmobile/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/rmobile/lowlevel_init.S
@@ -49,7 +49,7 @@  wait_interrupt:
 	str     r2, [r1]
 
 wait_loop:
-	wfi
+	.long	0xE320F003 /* wfi */
 
 	ldr		r2, [r1, #0xC]
 	str		r2, [r1, #0x10]