From 181e796c9beb08534f9e3f50c881bb8feaf78c5c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 26 Feb 2014 18:34:51 +0100
Subject: rework arm support, add qemu arm model vexpress for cortex-a9
 emulation (hard float)

---
 toolchain/gcc/Makefile | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'toolchain/gcc')

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 32710c9bd..5c81f9fd2 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -81,24 +81,21 @@ else
 GCC_CONFOPTS+=		--enable-target-optspace
 endif
 
-ifeq ($(ARCH),mips)
-ifeq ($(ADK_TARGET_NO_FPU),y)
-GCC_CONFOPTS+=		--with-float=soft
-else
-GCC_CONFOPTS+=          --with-float=hard
-endif
+ifeq ($(ARCH),arm)
+GCC_CONFOPTS+=		--with-float=$(ADK_TARGET_FLOAT)
+GCC_CONFOPTS+=		--with-mode=$(ADK_TARGET_ARM_MODE)
 endif
 
-ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
-GCC_CONFOPTS+=          --with-arch=armv6 --with-tune=arm1176jzf-s --with-fpu=vfp --with-float=hard
+ifeq ($(ADK_CPU_ARM926EJ_S),y)
+GCC_CONFOPTS+=          --with-arch=armv5te --with-tune=arm1176jzf-s
 endif
 
-ifeq ($(ADK_TARGET_SYSTEM_CUBOX_I),y)
-ifeq ($(ADK_LINUX_ARM_WITH_THUMB),y)
-GCC_CONFOPTS+=          --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon --with-float=hard  --with-mode=thumb
-else
-GCC_CONFOPTS+=          --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon --with-float=hard  --with-mode=arm
+ifeq ($(ADK_CPU_ARM1176JZF_S),y)
+GCC_CONFOPTS+=          --with-arch=armv6 --with-tune=arm1176jzf-s --with-fpu=vfp
 endif
+
+ifeq ($(ADK_CPU_CORTEX_A9),y)
+GCC_CONFOPTS+=          --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon
 endif
 
 ifneq ($(ADK_TARGET_ABI),)
-- 
cgit v1.2.3