git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
[pandora-kernel.git]
/
arch
/
mips
/
boot
/
compressed
/
Makefile
diff --git
a/arch/mips/boot/compressed/Makefile
b/arch/mips/boot/compressed/Makefile
index
ed9bb70
..
5042d51
100644
(file)
--- a/
arch/mips/boot/compressed/Makefile
+++ b/
arch/mips/boot/compressed/Makefile
@@
-59,7
+59,7
@@
$(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE
hostprogs-y := calc_vmlinuz_load_addr
VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \
hostprogs-y := calc_vmlinuz_load_addr
VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \
- $(obj
tree)/$(KBUILD_IMAGE)
$(VMLINUX_LOAD_ADDRESS))
+ $(obj
)/vmlinux.bin
$(VMLINUX_LOAD_ADDRESS))
vmlinuzobjs-y += $(obj)/piggy.o
vmlinuzobjs-y += $(obj)/piggy.o
@@
-105,4
+105,4
@@
OBJCOPYFLAGS_vmlinuz.srec := $(OBJCOPYFLAGS) -S -O srec
vmlinuz.srec: vmlinuz
$(call cmd,objcopy)
vmlinuz.srec: vmlinuz
$(call cmd,objcopy)
-clean-files := $(objtree)/vmlinuz
.*
+clean-files := $(objtree)/vmlinuz
$(objtree)/vmlinuz.{32,ecoff,bin,srec}