1 files changed, 4 insertions, 20 deletions

diff --git a/arch/xtensa/boot/boot-elf/Makefile b/arch/xtensa/boot/boot-elf/Makefile
index 08e8814f8c71..f10992b89027 100644
--- a/arch/xtensa/boot/boot-elf/Makefile
+++ b/arch/xtensa/boot/boot-elf/Makefile
@@ -20,34 +20,18 @@ boot-y		:= bootstrap.o
 
 OBJS            := $(addprefix $(obj)/,$(boot-y))
 
-Image:  vmlinux $(OBJS) arch/$(ARCH)/boot/boot-elf/boot.lds
+vmlinux.tmp: vmlinux
         $(OBJCOPY) --strip-all -R .comment -R .note.gnu.build-id -O binary \
-                vmlinux vmlinux.tmp
-        $(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
-                --add-section image=vmlinux.tmp \
-                --set-section-flags image=contents,alloc,load,load,data \
-                $(OBJS) $@.tmp
-        $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) \
-                -T arch/$(ARCH)/boot/boot-elf/boot.lds \
-                -o arch/$(ARCH)/boot/$@.elf $@.tmp
-        rm -f $@.tmp vmlinux.tmp
+                $^ $@
 
-Image.initrd:   vmlinux $(OBJS)
-        $(OBJCOPY) --strip-all -R .comment -R .note.gnu.build-id -O binary \
-                --add-section .initrd=arch/$(ARCH)/boot/ramdisk \
-                --set-section-flags .initrd=contents,alloc,load,load,data \
-                vmlinux vmlinux.tmp
+Image:  vmlinux.tmp $(OBJS) arch/$(ARCH)/boot/boot-elf/boot.lds
         $(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
                 --add-section image=vmlinux.tmp \
                 --set-section-flags image=contents,alloc,load,load,data \
                 $(OBJS) $@.tmp
         $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) \
-                -T $(srctree)/arch/$(ARCH)/boot/boot-elf/boot.ld \
+                -T arch/$(ARCH)/boot/boot-elf/boot.lds \
                 -o arch/$(ARCH)/boot/$@.elf $@.tmp
-        rm -f $@.tmp vmlinux.tmp
-
 
 zImage: Image
 
-zImage.initrd:  Image.initrd
-