[ARM PATCH] 1685/1: Fix bootpImage build target

Patch from George G. Davis

The boopImage build target rule is currently broken. This is the quick fix.

diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index 980d7f2d7a6dff4be167ca10243eb3c56a2146c8..011f788a701cd46c1ffc9034b8c1dbfef4038e55 100644 (file)
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -98,7 +98,7 @@ $(obj)/compressed/vmlinux: vmlinux FORCE
        $(Q)$(MAKE) $(build)=$(obj)/compressed $@
 
 $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
-       $(Q)$(MAKE) $(build)=$(obj)/compressed $@
+       $(Q)$(MAKE) $(build)=$(obj)/bootp $@
 
 .PHONY: initrd
 initrd:

diff --git a/arch/arm/boot/bootp/bootp.lds b/arch/arm/boot/bootp/bootp.lds
index 6fbd9ce0bbeb70f55f09a81eb2234040a7201c43..52e375e7e7fbcec0d8400f24e686e4d76d79d7be 100644 (file)
--- a/arch/arm/boot/bootp/bootp.lds
+++ b/arch/arm/boot/bootp/bootp.lds
@@ -16,10 +16,10 @@ SECTIONS
   .text : {
    _stext = .;
    *(.start)
-   kernel.o
+   arch/arm/boot/bootp/kernel.o
    . = ALIGN(32);
    initrd_start = .;
-   initrd.o
+   arch/arm/boot/bootp/initrd.o
    initrd_len = . - initrd_start;
    . = ALIGN(32);
    _etext = .;