Merge tag 'mips_4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[uclinux-h8/linux.git] / arch / mips / Makefile

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index d43eeaa..15a84cf 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -13,6 +13,7 @@
 #
 
 archscripts: scripts_basic
+       $(Q)$(MAKE) $(build)=arch/mips/tools elf-entry
        $(Q)$(MAKE) $(build)=arch/mips/boot/tools relocs
 
 KBUILD_DEFCONFIG := 32r2el_defconfig
@@ -230,6 +231,8 @@ toolchain-xpa                               := $(call cc-option-yn,$(xpa-cflags-y) -mxpa)
 cflags-$(toolchain-xpa)                        += -DTOOLCHAIN_SUPPORTS_XPA
 toolchain-crc                          := $(call cc-option-yn,$(mips-cflags) -Wa$(comma)-mcrc)
 cflags-$(toolchain-crc)                        += -DTOOLCHAIN_SUPPORTS_CRC
+toolchain-dsp                          := $(call cc-option-yn,$(mips-cflags) -Wa$(comma)-mdsp)
+cflags-$(toolchain-dsp)                        += -DTOOLCHAIN_SUPPORTS_DSP
 
 #
 # Firmware support
@@ -257,13 +260,7 @@ ifdef CONFIG_PHYSICAL_START
 load-y                                 = $(CONFIG_PHYSICAL_START)
 endif
 
-# Sign-extend the entry point to 64 bits if retrieved as a 32-bit number.
-entry-y                = $(shell $(OBJDUMP) -f vmlinux 2>/dev/null \
-                       | sed -n '/^start address / { \
-                               s/^.* //; \
-                               s/0x\([0-7].......\)$$/0x00000000\1/; \
-                               s/0x\(........\)$$/0xffffffff\1/; p }')
-
+entry-y                                = $(shell $(objtree)/arch/mips/tools/elf-entry vmlinux)
 cflags-y                       += -I$(srctree)/arch/mips/include/asm/mach-generic
 drivers-$(CONFIG_PCI)          += arch/mips/pci/