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 1899f51872572fd57bc7bf65fd2307f2403c15e0..dcd346002cab9ce63dff390260190015480ba96c 100644 (file)
--- a/arch/mips/config.mk
+++ b/arch/mips/config.mk
@@ -5,27 +5,37 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-ifeq ($(CROSS_COMPILE),)
-CROSS_COMPILE := mips_4KC-
-endif
-
-# Handle special prefix in ELDK 4.0 toolchain
-ifneq (,$(findstring 4KCle,$(CROSS_COMPILE)))
-ENDIANNESS := -EL
+ifdef CONFIG_SYS_BIG_ENDIAN
+32bit-emul             := elf32btsmip
+64bit-emul             := elf64btsmip
+32bit-bfd              := elf32-tradbigmips
+64bit-bfd              := elf64-tradbigmips
+PLATFORM_CPPFLAGS      += -EB
+PLATFORM_LDFLAGS       += -EB
 endif
 
 ifdef CONFIG_SYS_LITTLE_ENDIAN
-ENDIANNESS := -EL
+32bit-emul             := elf32ltsmip
+64bit-emul             := elf64ltsmip
+32bit-bfd              := elf32-tradlittlemips
+64bit-bfd              := elf64-tradlittlemips
+PLATFORM_CPPFLAGS      += -EL
+PLATFORM_LDFLAGS       += -EL
 endif
 
-ifdef CONFIG_SYS_BIG_ENDIAN
-ENDIANNESS := -EB
+ifdef CONFIG_32BIT
+PLATFORM_CPPFLAGS      += -mabi=32
+PLATFORM_LDFLAGS       += -m $(32bit-emul)
+OBJCOPYFLAGS           += -O $(32bit-bfd)
 endif
 
-# Default to EB if no endianess is configured
-ENDIANNESS ?= -EB
+ifdef CONFIG_64BIT
+PLATFORM_CPPFLAGS      += -mabi=64
+PLATFORM_LDFLAGS       += -m$(64bit-emul)
+OBJCOPYFLAGS           += -O $(64bit-bfd)
+endif
 
-PLATFORM_CPPFLAGS += -DCONFIG_MIPS -D__MIPS__
+PLATFORM_CPPFLAGS += -D__MIPS__
 
 #
 # From Linux arch/mips/Makefile
@@ -47,9 +57,22 @@ PLATFORM_CPPFLAGS += -DCONFIG_MIPS -D__MIPS__
 # 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 $(ENDIANNESS)
+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 $(ENDIANNESS)
+PLATFORM_LDFLAGS               += -G 0 -static -n -nostdlib
 PLATFORM_RELFLAGS              += -ffunction-sections -fdata-sections
-LDFLAGS_FINAL                  += --gc-sections -pie
-OBJCOPYFLAGS                   += --remove-section=.dynsym
+LDFLAGS_FINAL                  += --gc-sections $(PF_PIE)
+OBJCOPYFLAGS                   += -j .text -j .rodata -j .data -j .u_boot_list
+OBJCOPYFLAGS                   += $(PF_OBJCOPY)