From aa63387a399bdf9e06e4918322b23a112a5b8f97 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 27 Mar 2015 17:01:13 +0900 Subject: [PATCH] m68k: merge per-CPU config.mk into arch/m68k/Makefile Collect CPU specific flags into the single place. Signed-off-by: Masahiro Yamada Cc: Alison Wang Cc: Angelo Dureghello --- arch/m68k/Makefile | 29 +++++++++++++++++++++++++++++ arch/m68k/cpu/mcf5227x/config.mk | 12 ------------ arch/m68k/cpu/mcf523x/config.mk | 12 ------------ arch/m68k/cpu/mcf52x2/config.mk | 18 ------------------ arch/m68k/cpu/mcf530x/config.mk | 9 --------- arch/m68k/cpu/mcf532x/config.mk | 13 ------------- arch/m68k/cpu/mcf5445x/config.mk | 19 ------------------- arch/m68k/cpu/mcf547x_8x/config.mk | 18 ------------------ 8 files changed, 29 insertions(+), 101 deletions(-) delete mode 100644 arch/m68k/cpu/mcf5227x/config.mk delete mode 100644 arch/m68k/cpu/mcf523x/config.mk delete mode 100644 arch/m68k/cpu/mcf52x2/config.mk delete mode 100644 arch/m68k/cpu/mcf530x/config.mk delete mode 100644 arch/m68k/cpu/mcf532x/config.mk delete mode 100644 arch/m68k/cpu/mcf5445x/config.mk delete mode 100644 arch/m68k/cpu/mcf547x_8x/config.mk diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index aa3d2fae63..e6f3b482c3 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile @@ -6,3 +6,32 @@ head-y := arch/m68k/cpu/$(CPU)/start.o libs-y += arch/m68k/cpu/$(CPU)/ libs-y += arch/m68k/lib/ + +cpuflags-$(CONFIG_M5208) := -mcpu=5208 +cpuflags-$(CONFIG_M5235) := -mcpu=5235 -fPIC +cpuflags-$(CONFIG_M52277) := -mcpu=52277 -fPIC +cpuflags-$(CONFIG_M5249) := -mcpu=5249 +cpuflags-$(CONFIG_M5253) := -mcpu=5253 +cpuflags-$(CONFIG_M5271) := -mcpu=5271 +cpuflags-$(CONFIG_M5272) := -mcpu=5272 +cpuflags-$(CONFIG_M5275) := -mcpu=5275 +cpuflags-$(CONFIG_M5282) := -mcpu=5282 +cpuflags-$(CONFIG_M5307) := -mcpu=5307 +cpuflags-$(CONFIG_MCF5301x) := -mcpu=53015 -fPIC +cpuflags-$(CONFIG_MCF532x) := -mcpu=5329 -fPIC +cpuflags-$(CONFIG_MCF5441x) := -mcpu=54418 -fPIC +cpuflags-$(CONFIG_MCF5445x) := -mcpu=54455 -fPIC +cpuflags-$(CONFIG_MCF547x_8x) := -mcpu=5485 -fPIC + +PLATFORM_CPPFLAGS += $(cpuflags-y) + + +ldflags-$(CONFIG_MCF5441x) := --got=single +ldflags-$(CONFIG_MCF5445x) := --got=single +ldflags-$(CONFIG_MCF547x_8x) := --got=single + +ifneq (,$(findstring -linux-,$(shell $(CC) --version))) +ifneq (,$(findstring GOT,$(shell $(LD) --help))) +PLATFORM_LDFLAGS += $(ldflags-y) +endif +endif diff --git a/arch/m68k/cpu/mcf5227x/config.mk b/arch/m68k/cpu/mcf5227x/config.mk deleted file mode 100644 index a6814d8895..0000000000 --- a/arch/m68k/cpu/mcf5227x/config.mk +++ /dev/null @@ -1,12 +0,0 @@ -# -# (C) Copyright 2003 Josef Baumgartner -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -cpuflags-$(CONFIG_M52277) := -mcpu=52277 -fPIC - -PLATFORM_CPPFLAGS += $(cpuflags-y) diff --git a/arch/m68k/cpu/mcf523x/config.mk b/arch/m68k/cpu/mcf523x/config.mk deleted file mode 100644 index 4795f6ab8a..0000000000 --- a/arch/m68k/cpu/mcf523x/config.mk +++ /dev/null @@ -1,12 +0,0 @@ -# -# (C) Copyright 2003 Josef Baumgartner -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -cpuflags-$(CONFIG_M5235) := -mcpu=5235 -fPIC - -PLATFORM_CPPFLAGS += $(cpuflags-y) diff --git a/arch/m68k/cpu/mcf52x2/config.mk b/arch/m68k/cpu/mcf52x2/config.mk deleted file mode 100644 index f8fdefd21b..0000000000 --- a/arch/m68k/cpu/mcf52x2/config.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -# (C) Copyright 2003 Josef Baumgartner -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -cpuflags-$(CONFIG_M5208) := -mcpu=5208 -cpuflags-$(CONFIG_M5249) := -mcpu=5249 -cpuflags-$(CONFIG_M5253) := -mcpu=5253 -cpuflags-$(CONFIG_M5271) := -mcpu=5271 -cpuflags-$(CONFIG_M5272) := -mcpu=5272 -cpuflags-$(CONFIG_M5275) := -mcpu=5275 -cpuflags-$(CONFIG_M5282) := -mcpu=5282 - -PLATFORM_CPPFLAGS += $(cpuflags-y) diff --git a/arch/m68k/cpu/mcf530x/config.mk b/arch/m68k/cpu/mcf530x/config.mk deleted file mode 100644 index 25845aa323..0000000000 --- a/arch/m68k/cpu/mcf530x/config.mk +++ /dev/null @@ -1,9 +0,0 @@ -# -# (C) Copyright 2014 Angelo Dureghello -# -# SPDX-License-Identifier: GPL-2.0+ -# - -cpuflags-$(CONFIG_M5307) := -mcpu=5307 - -PLATFORM_CPPFLAGS += $(cpuflags-y) diff --git a/arch/m68k/cpu/mcf532x/config.mk b/arch/m68k/cpu/mcf532x/config.mk deleted file mode 100644 index 470d22f165..0000000000 --- a/arch/m68k/cpu/mcf532x/config.mk +++ /dev/null @@ -1,13 +0,0 @@ -# -# (C) Copyright 2003 Josef Baumgartner -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -cpuflags-$(CONFIG_MCF5301x) := -mcpu=53015 -fPIC -cpuflags-$(CONFIG_MCF532x) := -mcpu=5329 -fPIC - -PLATFORM_CPPFLAGS += $(cpuflags-y) diff --git a/arch/m68k/cpu/mcf5445x/config.mk b/arch/m68k/cpu/mcf5445x/config.mk deleted file mode 100644 index c3923c63ea..0000000000 --- a/arch/m68k/cpu/mcf5445x/config.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# (C) Copyright 2003 Josef Baumgartner -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# Copyright 2011-2012 Freescale Semiconductor, Inc. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -cpuflags-$(CONFIG_MCF5441x) := -mcpu=54418 -fPIC -cpuflags-$(CONFIG_MCF5445x) := -mcpu=54455 -fPIC - -ifneq (,$(findstring -linux-,$(shell $(CC) --version))) -ifneq (,$(findstring GOT,$(shell $(LD) --help))) -PLATFORM_LDFLAGS += --got=single -endif -endif diff --git a/arch/m68k/cpu/mcf547x_8x/config.mk b/arch/m68k/cpu/mcf547x_8x/config.mk deleted file mode 100644 index 240dd27b93..0000000000 --- a/arch/m68k/cpu/mcf547x_8x/config.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -# (C) Copyright 2003 Josef Baumgartner -# -# (C) Copyright 2000-2004 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -cpuflags-$(CONFIG_MCF547x_8x) := -mcpu=5485 -fPIC - -PLATFORM_CPPFLAGS += $(cpuflags-y) - -ifneq (,$(findstring -linux-,$(shell $(CC) --version))) -ifneq (,$(findstring GOT,$(shell $(LD) --help))) -PLATFORM_LDFLAGS += --got=single -endif -endif