From dff2d49e4342587e3d4c2f578eacfdc0e4089cca Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Fri, 15 May 2015 21:40:37 +0200
Subject: add more coldfire toolchain targets

---
 target/config/Config.in.cpu | 29 +++++++++++++++++++++++++++++
 target/config/Config.in.tc  | 31 +++++++++++++++++++++++++++++++
 toolchain/binutils/Makefile |  2 +-
 toolchain/gcc/Makefile      |  5 ++---
 4 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index 522f0e3ed..4fbbbe4b3 100644
--- a/target/config/Config.in.cpu
+++ b/target/config/Config.in.cpu
@@ -96,11 +96,31 @@ config ADK_CPU_C6X
 config ADK_CPU_CF
 	bool
 
+config ADK_CPU_CF_5206
+	bool
+	select ADK_CPU_CF
+	select ADK_TARGET_WITH_LT
+
 config ADK_CPU_CF_5208
 	bool
 	select ADK_CPU_CF
 	select ADK_TARGET_WITH_LT
 
+config ADK_CPU_CF_5213
+	bool
+	select ADK_CPU_CF
+	select ADK_TARGET_WITH_LT
+
+config ADK_CPU_CF_5216
+	bool
+	select ADK_CPU_CF
+	select ADK_TARGET_WITH_LT
+
+config ADK_CPU_CF_5225
+	bool
+	select ADK_CPU_CF
+	select ADK_TARGET_WITH_LT
+
 config ADK_CPU_CORTEX_M3
 	bool
 	select ADK_TARGET_WITH_LT
@@ -365,7 +385,11 @@ config ADK_TARGET_CPU_WITH_3DNOWEXT
 config ADK_TARGET_GCC_CPU
 	string
 	default "440" if ADK_CPU_PPC_440
+	default "5206" if ADK_CPU_CF_5206
 	default "5208" if ADK_CPU_CF_5208
+	default "5213" if ADK_CPU_CF_5213
+	default "5216" if ADK_CPU_CF_5216
+	default "5225" if ADK_CPU_CF_5225
 	default "arc700" if ADK_CPU_ARC700
 	default "archs" if ADK_CPU_ARC_HS
 	default "arm1176jzf-s" if ADK_CPU_ARM1176JZF_S
@@ -429,6 +453,11 @@ config ADK_TARGET_CPU_TYPE
 	default "bf522" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF522
 	default "bf523" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF523
 	default "bf524" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF524
+	default "5206" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5206
+	default "5208" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5208
+	default "5213" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5213
+	default "5216" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5216
+	default "5225" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5225
 	default "cortex_a5" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A5
 	default "cortex_a7" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A7
 	default "cortex_a8" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A8
diff --git a/target/config/Config.in.tc b/target/config/Config.in.tc
index 22240d8d8..d18533dcd 100644
--- a/target/config/Config.in.tc
+++ b/target/config/Config.in.tc
@@ -9,6 +9,7 @@ depends on ADK_TARGET_TOOLCHAIN && \
 	|| ADK_TARGET_ARCH_ARC \
 	|| ADK_TARGET_ARCH_ARM \
 	|| ADK_TARGET_ARCH_BFIN \
+	|| ADK_TARGET_ARCH_M68K \
 	|| ADK_TARGET_ARCH_X86 )
 
 config ADK_TARGET_CPU_ARC_ARC700
@@ -135,6 +136,36 @@ config ADK_TARGET_CPU_CRIS_V32
         select ADK_CPU_CRIS_V32
 	depends on ADK_TARGET_ARCH_CRIS
 
+config ADK_TARGET_CPU_CF_5206
+	bool "coldfire 5206"
+	select ADK_CPU_CF_5206
+	select ADK_TARGET_UCLINUX
+	depends on ADK_TARGET_ARCH_M68K
+
+config ADK_TARGET_CPU_CF_5208
+	bool "coldfire 5208"
+	select ADK_CPU_CF_5208
+	select ADK_TARGET_UCLINUX
+	depends on ADK_TARGET_ARCH_M68K
+
+config ADK_TARGET_CPU_CF_5213
+	bool "coldfire 5213"
+	select ADK_CPU_CF_5213
+	select ADK_TARGET_UCLINUX
+	depends on ADK_TARGET_ARCH_M68K
+
+config ADK_TARGET_CPU_CF_5216
+	bool "coldfire 5216"
+	select ADK_CPU_CF_5216
+	select ADK_TARGET_UCLINUX
+	depends on ADK_TARGET_ARCH_M68K
+
+config ADK_TARGET_CPU_CF_5225
+	bool "coldfire 5225"
+	select ADK_CPU_CF_5225
+	select ADK_TARGET_UCLINUX
+	depends on ADK_TARGET_ARCH_M68K
+
 config ADK_TARGET_CPU_X86_I486
 	bool "i486"
 	select ADK_CPU_I486
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 833f0ca97..f4f72587c 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -28,7 +28,7 @@ ifneq ($(ADK_LINUX_64)$(ADK_TARGET_KERNEL_64),)
 CONFOPTS+=		--enable-64-bit-bfd
 endif
 
-ifeq ($(ADK_TARGET_ARCH_X86_64),)
+ifeq ($(ADK_TARGET_ARCH_X86_64)$(ADK_CPU_CF),)
 CONFOPTS+=		--disable-multilib
 else
 CONFOPTS+=		--enable-multilib
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index caa4b2437..0ed8f077c 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -17,14 +17,13 @@ TARGET_CFLAGS:=		$(filter-out -mtext-section-literals,$(TARGET_CFLAGS))
 TARGET_CXXFLAGS:=	$(filter-out -mtext-section-literals,$(TARGET_CXXFLAGS))
 endif
 
-# for multilib m68k uClinux, we need to filter out some flags
+# for uClinux, we need to filter out some flags
 ifeq ($(ADK_TARGET_UCLINUX),y)
-TARGET_CFLAGS:=		$(filter-out -mcpu=5208,$(TARGET_CFLAGS))
 TARGET_CFLAGS:=		$(filter-out -msep-data,$(TARGET_CFLAGS))
-TARGET_CXXFLAGS:=	$(filter-out -mcpu=5208,$(TARGET_CXXFLAGS))
 TARGET_CXXFLAGS:=	$(filter-out -msep-data,$(TARGET_CXXFLAGS))
 endif
 
+
 GCC_CONFOPTS:=		--prefix=$(TOOLCHAIN_DIR)/usr \
 			--with-bugurl="http://www.openadk.org/" \
 			--build=$(GNU_HOST_NAME) \
-- 
cgit v1.2.3