Merge branch 'master' of git://git.denx.de/u-boot-mmc

[u-boot] / arch / mips / config.mk

diff --git a/arch/mips/config.mk b/arch/mips/config.mk
index 4dc88f4d51f1903cab3658f5a16386be137df6ca..dcd346002cab9ce63dff390260190015480ba96c 100644 (file)
--- a/arch/mips/config.mk
+++ b/arch/mips/config.mk
@@ -35,16 +35,8 @@ PLATFORM_LDFLAGS     += -m$(64bit-emul)
 OBJCOPYFLAGS           += -O $(64bit-bfd)
 endif
 
-cpuflags-$(CONFIG_CPU_MIPS32_R1) += -march=mips32 -Wa,-mips32
-cpuflags-$(CONFIG_CPU_MIPS32_R2) += -march=mips32r2 -Wa,-mips32r2
-cpuflags-$(CONFIG_CPU_MIPS64_R1) += -march=mips64 -Wa,-mips64
-cpuflags-$(CONFIG_CPU_MIPS64_R2) += -march=mips64r2 -Wa,-mips64r2
-PLATFORM_CPPFLAGS += $(cpuflags-y)
-
 PLATFORM_CPPFLAGS += -D__MIPS__
 
-__HAVE_ARCH_GENERIC_BOARD := y
-
 #
 # From Linux arch/mips/Makefile
 #
@@ -65,10 +57,22 @@ __HAVE_ARCH_GENERIC_BOARD := y
 # On the other hand, we want PIC in the U-Boot code to relocate it from ROM
 # to RAM. $28 is always used as gp.
 #
-PLATFORM_CPPFLAGS              += -G 0 -mabicalls -fpic
+ifdef CONFIG_SPL_BUILD
+PF_ABICALLS                    := -mno-abicalls
+PF_PIC                         := -fno-pic
+PF_PIE                         :=
+else
+PF_ABICALLS                    := -mabicalls
+PF_PIC                         := -fpic
+PF_PIE                         := -pie
+PF_OBJCOPY                     := -j .got -j .rel.dyn -j .padding
+PF_OBJCOPY                     += -j .dtb.init.rodata
+endif
+
+PLATFORM_CPPFLAGS              += -G 0 $(PF_ABICALLS) $(PF_PIC)
 PLATFORM_CPPFLAGS              += -msoft-float
 PLATFORM_LDFLAGS               += -G 0 -static -n -nostdlib
 PLATFORM_RELFLAGS              += -ffunction-sections -fdata-sections
-LDFLAGS_FINAL                  += --gc-sections -pie
-OBJCOPYFLAGS                   += -j .text -j .rodata -j .data -j .got
-OBJCOPYFLAGS                   += -j .u_boot_list -j .rel.dyn -j .padding
+LDFLAGS_FINAL                  += --gc-sections $(PF_PIE)
+OBJCOPYFLAGS                   += -j .text -j .rodata -j .data -j .u_boot_list
+OBJCOPYFLAGS                   += $(PF_OBJCOPY)