tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[MIPS] Cleanup default bootfile format rule mess.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Ralf Baechle 8496b401 e001e528

+8 -27
+8 -27
arch/mips/Makefile
··· 67 67 endif 68 68 endif 69 69 70 + all-$(CONFIG_BOOT_ELF32) := $(vmlinux-32) 71 + all-$(CONFIG_BOOT_ELF64) := $(vmlinux-64) 70 72 71 73 # 72 74 # GCC uses -G 0 -mabicalls -fpic as default. We don't want PIC in the kernel ··· 311 309 cflags-$(CONFIG_MIPS_ATLAS) += -Iinclude/asm-mips/mach-atlas 312 310 cflags-$(CONFIG_MIPS_ATLAS) += -Iinclude/asm-mips/mach-mips 313 311 load-$(CONFIG_MIPS_ATLAS) += 0xffffffff80100000 312 + all-$(CONFIG_MIPS_ATLAS) := vmlinux.srec 314 313 315 314 # 316 315 # MIPS Malta board ··· 319 316 core-$(CONFIG_MIPS_MALTA) += arch/mips/mips-boards/malta/ 320 317 cflags-$(CONFIG_MIPS_MALTA) += -Iinclude/asm-mips/mach-mips 321 318 load-$(CONFIG_MIPS_MALTA) += 0xffffffff80100000 319 + all-$(CONFIG_MIPS_MALTA) := vmlinux.srec 322 320 323 321 # 324 322 # MIPS SEAD board ··· 327 323 core-$(CONFIG_MIPS_SEAD) += arch/mips/mips-boards/sead/ 328 324 cflags-$(CONFIG_MIPS_SEAD) += -Iinclude/asm-mips/mach-mips 329 325 load-$(CONFIG_MIPS_SEAD) += 0xffffffff80100000 326 + all-$(CONFIG_MIPS_SEAD) := vmlinux.srec 330 327 331 328 # 332 329 # MIPS SIM ··· 368 363 core-$(CONFIG_QEMU) += arch/mips/qemu/ 369 364 cflags-$(CONFIG_QEMU) += -Iinclude/asm-mips/mach-qemu 370 365 load-$(CONFIG_QEMU) += 0xffffffff80010000 366 + all-$(CONFIG_QEMU) := vmlinux.bin 371 367 372 368 # 373 369 # Basler eXcite ··· 560 554 core-$(CONFIG_SNI_RM) += arch/mips/sni/ 561 555 cflags-$(CONFIG_SNI_RM) += -Iinclude/asm-mips/mach-rm 562 556 load-$(CONFIG_SNI_RM) += 0xffffffff80600000 557 + all-$(CONFIG_SNI_RM) := vmlinux.ecoff 563 558 564 559 # 565 560 # Toshiba JMR-TX3927 board ··· 654 647 655 648 makeboot =$(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) $(1) 656 649 657 - ifdef CONFIG_BOOT_ELF32 658 - all: $(vmlinux-32) 659 - endif 660 - 661 - ifdef CONFIG_BOOT_ELF64 662 - all: $(vmlinux-64) 663 - endif 664 - 665 - ifdef CONFIG_MIPS_ATLAS 666 - all: vmlinux.srec 667 - endif 668 - 669 - ifdef CONFIG_MIPS_MALTA 670 - all: vmlinux.srec 671 - endif 672 - 673 - ifdef CONFIG_MIPS_SEAD 674 - all: vmlinux.srec 675 - endif 676 - 677 - ifdef CONFIG_QEMU 678 - all: vmlinux.bin 679 - endif 680 - 681 - ifdef CONFIG_SNI_RM 682 - all: vmlinux.ecoff 683 - endif 650 + all: $(all-y) 684 651 685 652 vmlinux.bin: $(vmlinux-32) 686 653 +@$(call makeboot,$@)