diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2010-02-26 13:57:12 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2010-02-27 12:52:49 +0100 |
| commit | ebc89718a4b3fa0e440151fb4484541700828a5d (patch) | |
| tree | 290f15b11f72298907a0b84b23d6685ceed06569 | |
| parent | 06a79b82b2a3e4bebb9a20638ca208c780e9e507 (diff) | |
| download | linux-ebc89718a4b3fa0e440151fb4484541700828a5d.tar.bz2 | |
MIPS: Fix build error for uncompressed non-plain vmlinux kernels
Seen on rm200_defconfig for example:
CC arch/mips/boot/compressed/decompress.o
/home/ralf/src/linux/upstream-linus/arch/mips/boot/compressed/decompress.c: In function ‘decompress_kernel’:
/home/ralf/src/linux/upstream-linus/arch/mips/boot/compressed/decompress.c:116: error: implicit declaration of function ‘decompress’
make[3]: *** [arch/mips/boot/compressed/decompress.o] Error 1
make[2]: *** [vmlinuz.ecoff] Error 2
make[1]: *** [sub-make] Error 2
make: *** [all] Error 2
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 1893efd43fca..2dcb7a22582a 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -185,6 +185,15 @@ libs-$(CONFIG_SNIPROM) += arch/mips/fw/sni/ libs-y += arch/mips/fw/lib/ # +# Kernel compression +# +ifdef SYS_SUPPORTS_ZBOOT +COMPRESSION_FNAME = vmlinuz +else +COMPRESSION_FNAME = vmlinux +endif + +# # Board-dependent options and extra files # @@ -344,7 +353,7 @@ load-$(CONFIG_LEMOTE_MACH2F) +=0xffffffff80200000 core-$(CONFIG_MIPS_MALTA) += arch/mips/mti-malta/ cflags-$(CONFIG_MIPS_MALTA) += -I$(srctree)/arch/mips/include/asm/mach-malta load-$(CONFIG_MIPS_MALTA) += 0xffffffff80100000 -all-$(CONFIG_MIPS_MALTA) := vmlinuz.bin +all-$(CONFIG_MIPS_MALTA) := $(COMPRESSION_FNAME).bin # # MIPS SIM @@ -594,7 +603,7 @@ load-$(CONFIG_SNI_RM) += 0xffffffff80600000 else load-$(CONFIG_SNI_RM) += 0xffffffff80030000 endif -all-$(CONFIG_SNI_RM) := vmlinuz.ecoff +all-$(CONFIG_SNI_RM) := $(COMPRESSION_FNAME).ecoff # # Common TXx9 |