From 7ee18e97601dea0d227ef2a576f83a558c50f5d7 Mon Sep 17 00:00:00 2001
From: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
Date: Sun, 6 Sep 2009 16:52:47 +0200
Subject: Toolchain: include architecture's Makefile only if selected

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
---
 mk/arm-arch.mk   | 3 ---
 mk/mips-arch.mk  | 3 ---
 mk/target-mcu.mk | 5 ++++-
 3 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'mk')

diff --git a/mk/arm-arch.mk b/mk/arm-arch.mk
index 1694e36..16483db 100644
--- a/mk/arm-arch.mk
+++ b/mk/arm-arch.mk
@@ -22,7 +22,6 @@
 # \date         June 2009
 ################################################################################
 
-ifeq ($(CONFIG_EMBTK_ARCH_ARM),y)
 LINUX_ARCH := arm
 GNU_TARGET_ARCH := arm
 EMBTK_MCU_FLAG := $(subst ",,$(strip $(CONFIG_EMBTK_ARM_MCU_STRING)))
@@ -50,5 +49,3 @@ else
 EMBTK_TARGET_FLOAT_CFLAGS := -mfloat-abi=hard
 endif
 
-endif
-
diff --git a/mk/mips-arch.mk b/mk/mips-arch.mk
index a810fdc..5cc1ccc 100644
--- a/mk/mips-arch.mk
+++ b/mk/mips-arch.mk
@@ -22,7 +22,6 @@
 # \date         May 2009
 ################################################################################
 
-ifeq ($(CONFIG_EMBTK_ARCH_MIPS),y)
 LINUX_ARCH := mips
 
 ifeq ($(CONFIG_EMBTK_ARCH_MIPS_MIPS1_LITTLE),y)
@@ -145,5 +144,3 @@ EMBTK_TARGET_ABI := -mabi=64
 export GCC_WITH_ABI EMBTK_TARGET_ABI
 endif
 
-endif
-
diff --git a/mk/target-mcu.mk b/mk/target-mcu.mk
index 6861021..18f747f 100644
--- a/mk/target-mcu.mk
+++ b/mk/target-mcu.mk
@@ -24,12 +24,15 @@
 ################################################################################
 
 #ARM
+ifeq ($(CONFIG_EMBTK_ARCH_ARM),y)
 include $(EMBTK_ROOT)/mk/arm-arch.mk
+endif
 
 #M68K
 
 #MIPS
+ifeq ($(CONFIG_EMBTK_ARCH_MIPS),y)
 include $(EMBTK_ROOT)/mk/mips-arch.mk
-
+endif
 
 
-- 
cgit v1.2.3