[U-Boot] [RFC][PATCH 03/36] x86 - Move config.mk options to arch/i386/config.mk

[Graeme Russ]

---
 arch/i386/config.mk     |   10 ++++++----
 arch/i386/cpu/config.mk |    3 ++-
 board/eNET/config.mk    |    3 ---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/i386/config.mk b/arch/i386/config.mk
index 8743f1a..21d1a27 100644
--- a/arch/i386/config.mk
+++ b/arch/i386/config.mk
@@ -21,8 +21,6 @@
 # MA 02111-1307 USA
 #

-CROSS_COMPILE ?= i386-linux-
-
 STANDALONE_LOAD_ADDR = 0x40000

 PLATFORM_CPPFLAGS += -fno-strict-aliasing
@@ -33,7 +31,11 @@ PLATFORM_CPPFLAGS += $(call cc-option, -ffreestanding)
 PLATFORM_CPPFLAGS += $(call cc-option, -fno-toplevel-reorder,  $(call cc-option, -fno-unit-at-a-time))
 PLATFORM_CPPFLAGS += $(call cc-option, -fno-stack-protector)
 PLATFORM_CPPFLAGS += $(call cc-option, -mpreferred-stack-boundary=2)
-PLATFORM_CPPFLAGS += -DCONFIG_I386 -D__I386__
+PLATFORM_CPPFLAGS += -fno-dwarf2-cfi-asm

-LDFLAGS += --cref --gc-sections
 PLATFORM_RELFLAGS += -ffunction-sections
+PLATFORM_RELFLAGS += -fvisibility=hidden
+
+PLATFORM_LDFLAGS += -pic --emit-relocs -Bsymbolic -Bsymbolic-functions
+
+LDFLAGS += --cref --gc-sections
diff --git a/arch/i386/cpu/config.mk b/arch/i386/cpu/config.mk
index 16a160d..99edacf 100644
--- a/arch/i386/cpu/config.mk
+++ b/arch/i386/cpu/config.mk
@@ -21,6 +21,7 @@
 # MA 02111-1307 USA
 #

-PLATFORM_RELFLAGS +=
+CROSS_COMPILE ?= i386-linux-

+PLATFORM_CPPFLAGS += -DCONFIG_I386 -D__I386__
 PLATFORM_CPPFLAGS += -march=i386 -Werror
diff --git a/board/eNET/config.mk b/board/eNET/config.mk
index c4242ad..02e4147 100644
--- a/board/eNET/config.mk
+++ b/board/eNET/config.mk
@@ -23,6 +23,3 @@

 CONFIG_SYS_TEXT_BASE = 0x06000000
 CFLAGS_common/dlmalloc.o += -Wa,--no-warn -fno-strict-aliasing
-PLATFORM_RELFLAGS += -fvisibility=hidden
-PLATFORM_CPPFLAGS += -fno-dwarf2-cfi-asm
-PLATFORM_LDFLAGS += -pic --emit-relocs -Bsymbolic -Bsymbolic-functions
--
1.7.1.422.g049e9