From c2a1d5d30687e04692b1bbe386591b5efd7ad57f Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 30 Oct 2014 15:30:56 +0900 Subject: [PATCH] sparc: merge arch/sparc/cpu/*/config.mk to arch/sparc/config.mk Remove arch/sparc/cpu/{leon2,leon3}/config.mk and move duplicated defines of -fPIC to arch/sparc/config.mk. Signed-off-by: Masahiro Yamada Cc: Daniel Hellstrom --- arch/sparc/config.mk | 2 ++ arch/sparc/cpu/leon2/config.mk | 8 -------- arch/sparc/cpu/leon3/config.mk | 8 -------- 3 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 arch/sparc/cpu/leon2/config.mk delete mode 100644 arch/sparc/cpu/leon3/config.mk diff --git a/arch/sparc/config.mk b/arch/sparc/config.mk index 196d28af84..d615f294fe 100644 --- a/arch/sparc/config.mk +++ b/arch/sparc/config.mk @@ -15,3 +15,5 @@ CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000 -L $(gcclibdir) \ -T $(srctree)/examples/standalone/sparc.lds PLATFORM_CPPFLAGS += -D__sparc__ + +PLATFORM_RELFLAGS += -fPIC diff --git a/arch/sparc/cpu/leon2/config.mk b/arch/sparc/cpu/leon2/config.mk deleted file mode 100644 index 15ba1be048..0000000000 --- a/arch/sparc/cpu/leon2/config.mk +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -PLATFORM_RELFLAGS += -fPIC diff --git a/arch/sparc/cpu/leon3/config.mk b/arch/sparc/cpu/leon3/config.mk deleted file mode 100644 index 15ba1be048..0000000000 --- a/arch/sparc/cpu/leon3/config.mk +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -PLATFORM_RELFLAGS += -fPIC -- 2.30.2